Refactor bot.py

Author: Dorukyum

discord/bot.py

@@ -199,7 +199,7 @@ async def register_commands(self) -> None:
                 to_update = update_guild_commands[guild_id]
                 update_guild_commands[guild_id] = to_update + [as_dict]
 
-        for guild_id in update_guild_commands:
+        for guild_id, guild_data in update_guild_commands.items():
             try:
                 cmds = await self.http.bulk_upsert_guild_commands(
                     self.user.id, guild_id, update_guild_commands[guild_id]
@@ -208,11 +208,10 @@ async def register_commands(self) -> None:
                 # Permissions for this Guild
                 guild_permissions: List = []
             except Forbidden:
-                if not update_guild_commands[guild_id]:
+                if not guild_data:
                     continue
-                else:
-                    print(f"Failed to add command to guild {guild_id}", file=sys.stderr)
-                    raise
+                print(f"Failed to add command to guild {guild_id}", file=sys.stderr)
+                raise
             else:
                 for i in cmds:
                     cmd = get(
@@ -261,16 +260,14 @@ async def register_commands(self) -> None:
                     for permission in item["permissions"]:
                         if isinstance(permission["id"], str):
                             # Replace Role Names
-                            if permission["type"] == 1 and isinstance(
-                                permission["id"], str
-                            ):
+                            if permission["type"] == 1:
                                 role = get(
                                     self.get_guild(guild_id).roles,
                                     name=permission["id"],
                                 )
 
                                 # If not missing
-                                if not role is None:
+                                if role is not None:
                                     new_cmd_perm["permissions"].append(
                                         {
                                             "id": role.id,
@@ -284,7 +281,7 @@ async def register_commands(self) -> None:
                                             guild_id=guild_id, role=permission["id"]
                                         )
                                     )
-                            # Add Owner IDs
+                            # Add owner IDs
                             elif (
                                 permission["type"] == 2 and permission["id"] == "owner"
                             ):
@@ -306,7 +303,7 @@ async def register_commands(self) -> None:
                                             "permission": permission["permission"],
                                         }
                                     )
-                        # Add the Rest
+                        # Add the rest
                         else:
                             new_cmd_perm["permissions"].append(permission)
 
@@ -647,7 +644,7 @@ def remove_check(self, func, *, call_once: bool = False) -> None:
 
         try:
             l.remove(func)
-        except ValueError:
+        except guild_dataError:
             pass
 
     def check_once(self, func):