From d913954d496da7c138a49336e0174e8b1c7d5461 Mon Sep 17 00:00:00 2001 From: Nicholas Foster Date: Tue, 12 Sep 2023 01:09:35 -0700 Subject: [PATCH 1/5] Added bot.env file to describe bot token. --- bot.env | 1 + 1 file changed, 1 insertion(+) create mode 100644 bot.env diff --git a/bot.env b/bot.env new file mode 100644 index 000000000..1c6283bf1 --- /dev/null +++ b/bot.env @@ -0,0 +1 @@ +TOKEN={MTE1MTAyMDAyNTE0NzMxMDIzMA.GFfU4f.vsQHuZevcYyCx252KEvwCJYFXHAomlqh654bVo} \ No newline at end of file From 1626d565e0fcb9d02b901784415ee4320fbfa8fe Mon Sep 17 00:00:00 2001 From: Nicholas Foster Date: Tue, 12 Sep 2023 01:43:40 -0700 Subject: [PATCH 2/5] Commiting changes to cog code --- bot.env | 3 ++- cogs/deadline.py | 4 ++-- cogs/groups.py | 4 ++-- cogs/newComer.py | 4 ++-- cogs/ping.py | 4 ++-- cogs/pinning.py | 4 ++-- cogs/polling.py | 4 ++-- cogs/qanda.py | 4 ++-- cogs/reviewQs.py | 4 ++-- cogs/voting.py | 4 ++-- cogs/wordfilter.py | 4 ++-- 11 files changed, 22 insertions(+), 21 deletions(-) diff --git a/bot.env b/bot.env index 1c6283bf1..a420a5b5c 100644 --- a/bot.env +++ b/bot.env @@ -1 +1,2 @@ -TOKEN={MTE1MTAyMDAyNTE0NzMxMDIzMA.GFfU4f.vsQHuZevcYyCx252KEvwCJYFXHAomlqh654bVo} \ No newline at end of file +TOKEN={MTE1MTAyMDAyNTE0NzMxMDIzMA.GFfU4f.vsQHuZevcYyCx252KEvwCJYFXHAomlqh654bVo} +DATABASE_URL={postgres://ujpmzygrexqvfd:72b159ce6bcda77bb7c873f6a025c0f35dc7df94a9782e1ae602c8b9ec8e8803@ec2-107-21-67-46.compute-1.amazonaws.com:5432/df74ina2a9gq5d} \ No newline at end of file diff --git a/cogs/deadline.py b/cogs/deadline.py index 5b54d1bc2..8b45ebbdb 100644 --- a/cogs/deadline.py +++ b/cogs/deadline.py @@ -595,8 +595,8 @@ async def send_reminders_hour(self): # ------------------------------------- # add the file to the bot's cog system # ------------------------------------- -def setup(bot): +async def setup(bot): n = Deadline(bot) n.send_reminders_day.start() # pylint: disable=no-member n.send_reminders_hour.start() # pylint: disable=no-member - bot.add_cog(n) + await bot.add_cog(n) diff --git a/cogs/groups.py b/cogs/groups.py index ccd2f6000..190b821fa 100644 --- a/cogs/groups.py +++ b/cogs/groups.py @@ -435,5 +435,5 @@ async def group_error(self, ctx, error): # ----------------------------------------------------------- # add the file to the bot's cog system # ----------------------------------------------------------- -def setup(bot): - bot.add_cog(Groups(bot)) +async def setup(bot): + await bot.add_cog(Groups(bot)) diff --git a/cogs/newComer.py b/cogs/newComer.py index d6e2d5fe9..17ac05680 100644 --- a/cogs/newComer.py +++ b/cogs/newComer.py @@ -96,9 +96,9 @@ async def verify_error(self, ctx, error): # -------------------------------------- # add the file to the bot's cog system # -------------------------------------- -def setup(bot): +async def setup(bot): n = NewComer(bot) - bot.add_cog(n) + await bot.add_cog(n) # Copyright (c) 2021 War-Keeper diff --git a/cogs/ping.py b/cogs/ping.py index f7b47b75d..f3cf379eb 100644 --- a/cogs/ping.py +++ b/cogs/ping.py @@ -42,5 +42,5 @@ async def ping(self, ctx): # ------------------------------------- # add the file to the bot's cog system # ------------------------------------- -def setup(bot): - bot.add_cog(Helpful(bot)) +async def setup(bot): + await bot.add_cog(Helpful(bot)) diff --git a/cogs/pinning.py b/cogs/pinning.py index f9fdd3878..d51e1ba7f 100644 --- a/cogs/pinning.py +++ b/cogs/pinning.py @@ -202,6 +202,6 @@ async def updatePinnedMessage_error(self, ctx, error): # ------------------------------------- # add the file to the bot's cog system # ------------------------------------- -def setup(bot): +async def setup(bot): n = Pinning(bot) - bot.add_cog(n) + await bot.add_cog(n) diff --git a/cogs/polling.py b/cogs/polling.py index 20b83b9bc..b8606f072 100644 --- a/cogs/polling.py +++ b/cogs/polling.py @@ -232,6 +232,6 @@ async def poll_error(self, ctx, error): await ctx.author.send(error) await ctx.message.delete() -def setup(bot): +async def setup(bot): n = Poll(bot) - bot.add_cog(n) + await bot.add_cog(n) diff --git a/cogs/qanda.py b/cogs/qanda.py index b8582fb69..5a852f92a 100644 --- a/cogs/qanda.py +++ b/cogs/qanda.py @@ -1042,6 +1042,6 @@ async def countGhosts_error(self, ctx, error): await ctx.message.delete() -def setup(bot): +async def setup(bot): n = Qanda(bot) - bot.add_cog(n) + await bot.add_cog(n) diff --git a/cogs/reviewQs.py b/cogs/reviewQs.py index 15273e519..b10703e42 100644 --- a/cogs/reviewQs.py +++ b/cogs/reviewQs.py @@ -89,6 +89,6 @@ async def add_question_error(self, ctx, error): print(error) await ctx.message.delete() -def setup(bot): +async def setup(bot): n = ReviewQs(bot) - bot.add_cog(n) + await bot.add_cog(n) diff --git a/cogs/voting.py b/cogs/voting.py index 1ba631618..62b40b393 100644 --- a/cogs/voting.py +++ b/cogs/voting.py @@ -142,5 +142,5 @@ async def project_error(self, ctx, error): # ----------------------------------------------------------- # add the file to the bot's cog system # ----------------------------------------------------------- -def setup(bot): - bot.add_cog(Voting(bot)) +async def setup(bot): + await bot.add_cog(Voting(bot)) diff --git a/cogs/wordfilter.py b/cogs/wordfilter.py index c890fdbbe..8e7d7cf9f 100644 --- a/cogs/wordfilter.py +++ b/cogs/wordfilter.py @@ -150,6 +150,6 @@ async def loadWhitelist_error(self, ctx, error): print(error) await ctx.message.delete() -def setup(bot): +async def setup(bot): n = WordFilter(bot) - bot.add_cog(n) + await bot.add_cog(n) From 3278a7afb47320086da28e6ed0d04ba524b854ee Mon Sep 17 00:00:00 2001 From: Nicholas Foster Date: Tue, 12 Sep 2023 12:31:07 -0700 Subject: [PATCH 3/5] added bot.env to gitignore --- .gitignore | 1 + bot.env | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index b6e47617d..21d3b2e0d 100644 --- a/.gitignore +++ b/.gitignore @@ -127,3 +127,4 @@ dmypy.json # Pyre type checker .pyre/ +bot.env diff --git a/bot.env b/bot.env index a420a5b5c..1cb3e798e 100644 --- a/bot.env +++ b/bot.env @@ -1,2 +1,2 @@ -TOKEN={MTE1MTAyMDAyNTE0NzMxMDIzMA.GFfU4f.vsQHuZevcYyCx252KEvwCJYFXHAomlqh654bVo} +TOKEN={MTE1MTAyMDAyNTE0NzMxMDIzMA.GWysQg.Ea43XKla88oYTQvaoDq2kZgQs4d1TYQGclPaEo} DATABASE_URL={postgres://ujpmzygrexqvfd:72b159ce6bcda77bb7c873f6a025c0f35dc7df94a9782e1ae602c8b9ec8e8803@ec2-107-21-67-46.compute-1.amazonaws.com:5432/df74ina2a9gq5d} \ No newline at end of file From e1cbda717dc337d75ea96c033cb3328365483323 Mon Sep 17 00:00:00 2001 From: Nicholas Foster Date: Tue, 12 Sep 2023 12:34:11 -0700 Subject: [PATCH 4/5] updated .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 21d3b2e0d..a6167f528 100644 --- a/.gitignore +++ b/.gitignore @@ -128,3 +128,4 @@ dmypy.json # Pyre type checker .pyre/ bot.env +bot.env From 6c4c0406514c8356cd5b676645d6400d4ffd9e8a Mon Sep 17 00:00:00 2001 From: Nicholas Foster Date: Tue, 12 Sep 2023 12:56:55 -0700 Subject: [PATCH 5/5] removed bot.env --- .gitignore | 2 +- bot.env | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 bot.env diff --git a/.gitignore b/.gitignore index a6167f528..0c8c7efcc 100644 --- a/.gitignore +++ b/.gitignore @@ -128,4 +128,4 @@ dmypy.json # Pyre type checker .pyre/ bot.env -bot.env +bot.env \ No newline at end of file diff --git a/bot.env b/bot.env deleted file mode 100644 index 1cb3e798e..000000000 --- a/bot.env +++ /dev/null @@ -1,2 +0,0 @@ -TOKEN={MTE1MTAyMDAyNTE0NzMxMDIzMA.GWysQg.Ea43XKla88oYTQvaoDq2kZgQs4d1TYQGclPaEo} -DATABASE_URL={postgres://ujpmzygrexqvfd:72b159ce6bcda77bb7c873f6a025c0f35dc7df94a9782e1ae602c8b9ec8e8803@ec2-107-21-67-46.compute-1.amazonaws.com:5432/df74ina2a9gq5d} \ No newline at end of file