From 18bc35c390f074d221451470949070d0171bd889 Mon Sep 17 00:00:00 2001 From: Bartosz Zbik Date: Tue, 15 Nov 2022 12:35:17 +0100 Subject: [PATCH 1/4] more comments --- Tarkin.py | 1 + 1 file changed, 1 insertion(+) diff --git a/Tarkin.py b/Tarkin.py index d130ab4..25f6337 100644 --- a/Tarkin.py +++ b/Tarkin.py @@ -7,6 +7,7 @@ class Tarkin(discord.Client, PermissionsManager, CommandFunctionManager, BotActions): """ Final class for the discord bot. + Second comment. """ bot_greeting: str From 2b0b071f2378263deab504b925f5460c86e438f1 Mon Sep 17 00:00:00 2001 From: Bartosz Zbik Date: Tue, 15 Nov 2022 12:36:08 +0100 Subject: [PATCH 2/4] empty line --- Tarkin.py | 1 + 1 file changed, 1 insertion(+) diff --git a/Tarkin.py b/Tarkin.py index 25f6337..ee891c7 100644 --- a/Tarkin.py +++ b/Tarkin.py @@ -38,6 +38,7 @@ async def on_message(self, message: discord.Message) -> None: else: await self.wrong_permissins(message) return + else: continue # if no command found From d21277be3db9991bd1f2413c5c2b0c3a4d97f793 Mon Sep 17 00:00:00 2001 From: Bartosz Zbik Date: Tue, 15 Nov 2022 15:11:59 +0100 Subject: [PATCH 3/4] use new config file --- Tarkin.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tarkin.py b/Tarkin.py index 52119bd..f38d441 100644 --- a/Tarkin.py +++ b/Tarkin.py @@ -68,8 +68,8 @@ async def wrong_permissins(self, message: discord.Message) -> None: if __name__ == '__main__': - perm_path = "example_permissions.json" + config_path = "example_config.json" bot_intents = discord.Intents.default() bot_intents.message_content = True - client = Tarkin(perm_path, intents=bot_intents) + client = Tarkin(config_path, intents=bot_intents) From 1713052e899fd5100e41cb3f1ffde2e6803db1ef Mon Sep 17 00:00:00 2001 From: Bartosz Zbik Date: Tue, 15 Nov 2022 15:12:10 +0100 Subject: [PATCH 4/4] remove useless files --- bot_actions/all.py | 7 ------- example_permissions.json | 10 ---------- 2 files changed, 17 deletions(-) delete mode 100644 bot_actions/all.py delete mode 100644 example_permissions.json diff --git a/bot_actions/all.py b/bot_actions/all.py deleted file mode 100644 index d85a381..0000000 --- a/bot_actions/all.py +++ /dev/null @@ -1,7 +0,0 @@ -from bot_actions.my_id import MyId -from bot_actions.my_name import MyName -from bot_actions.speak import Speak - -class BotActions(MyId, MyName, Speak): - """Inherits all functionalities the bot has implemented""" - pass diff --git a/example_permissions.json b/example_permissions.json deleted file mode 100644 index 8e0ae0a..0000000 --- a/example_permissions.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "myid": { - "users": [], - "roles": [] - }, - "myname": { - "users": [], - "roles": [] - } -}