diff --git a/bin/storage.py b/bin/storage.py index e795c2e..6237bac 100644 --- a/bin/storage.py +++ b/bin/storage.py @@ -21,7 +21,7 @@ class storage: if key is None: return modules.get(module) - else: + if value is not None: modules[module][key] = value await self.collection.update_one( {"server_id": self.server_id}, diff --git a/bot.py b/bot.py index e84ff50..358494c 100644 --- a/bot.py +++ b/bot.py @@ -15,13 +15,14 @@ bot = bridge.Bot( ) # bot.load_extension("cogs.triggers") -bot.load_extension("cogs.counting") -bot.load_extension("cogs.settings") -bot.load_extension("cogs.misc") +#bot.load_extension("cogs.counting") +#bot.load_extension("cogs.settings") +#bot.load_extension("cogs.misc") +#bot.load_extension("cogs.voice") uri = f"mongodb://{env['DB_USERNAME']}:{env['DB_PASSWORD']}@{env['DB_HOST']}/?authSource=admin" bot.db = MongoClient(uri)["turdbot"] -bot.version = "4.5.0" +bot.version = "5.0.0ALPHA" bot.run(env["BOT_TOKEN"]) \ No newline at end of file diff --git a/cogs/misc.py b/cogs/misc.py index df0a6c3..7ae090a 100644 --- a/cogs/misc.py +++ b/cogs/misc.py @@ -1,6 +1,7 @@ from discord.ext import bridge, commands from bin.storage import storage + class Misc(commands.Cog): def __init__(self, bot): self.bot = bot diff --git a/cogs/voice.py b/cogs/voice.py new file mode 100644 index 0000000..28894c3 --- /dev/null +++ b/cogs/voice.py @@ -0,0 +1,26 @@ +from discord.ext import bridge, commands +from bin.storage import storage +from os import environ as env +import wavelink + + + +class Voice(commands.Cog): + def __init__(self, bot): + self.bot = bot + + + @commands.Cog.listener() + async def on_ready(self): + nodes = [ + wavelink.Node( + identifier="Node1", + uri="http://0.0.0.0:2333", + password=env["LAVALINK_SERVER_PASSWORD"] + ) + ] + + await wavelink.Pool.connect(nodes=nodes, client=bot) +def setup(bot): + bot.add_cog(Voice(bot)) + diff --git a/compose/compose-dev.yaml b/compose/compose-dev.yaml index 994d8e9..557d978 100644 --- a/compose/compose-dev.yaml +++ b/compose/compose-dev.yaml @@ -5,6 +5,7 @@ services: container_name: turdbot depends_on: - mongodb + - lavalink environment: - BOT_TOKEN=${BOT_TOKEN} - DB_HOST=mongodb @@ -37,3 +38,16 @@ services: - "27017:27017" volumes: - ${DB_LOCATION}:/data/db + + lavalink: + image: ghcr.io/lavalink-devs/lavalink:4 + restart: always + container_name: lavalink + environment: + - _JAVA_OPTIONS=-Xmx6G + - SERVER_PORT=2333 + - LAVALINK_SERVER_PASSWORD=${LAVALINK_SERVER_PASSWORD} + volumes: + - ${DB_LOCATION}:/opt/Lavalink/plugins/ + ports: + - "2333:2333"