From c7314b45bf0425ec9995131175eea276a55d0c9b Mon Sep 17 00:00:00 2001 From: Zevaryx Date: Tue, 4 Oct 2022 12:51:06 -0600 Subject: [PATCH] Catch error if interaction_tree doesn't exist --- jarvis/client/events/__init__.py | 57 +++++++++++++++++--------------- 1 file changed, 30 insertions(+), 27 deletions(-) diff --git a/jarvis/client/events/__init__.py b/jarvis/client/events/__init__.py index d6d14c2..430419b 100644 --- a/jarvis/client/events/__init__.py +++ b/jarvis/client/events/__init__.py @@ -62,34 +62,37 @@ class EventMixin(MemberEventMixin, MessageEventMixin, ComponentEventMixin): guild_base_commands = 0 global_context_menus = 0 guild_context_menus = 0 - for cid in self.interaction_tree: - if cid == 0: - global_base_commands = sum( - 1 - for _ in self.interaction_tree[cid] - if not isinstance(self.interaction_tree[cid][_], ContextMenu) - ) - global_context_menus = sum( - 1 - for _ in self.interaction_tree[cid] - if isinstance(self.interaction_tree[cid][_], ContextMenu) - ) - else: - guild_base_commands += sum( - 1 - for _ in self.interaction_tree[cid] - if not isinstance(self.interaction_tree[cid][_], ContextMenu) - ) - guild_context_menus += sum( - 1 - for _ in self.interaction_tree[cid] - if isinstance(self.interaction_tree[cid][_], ContextMenu) - ) + try: + for cid in self.interaction_tree: + if cid == 0: + global_base_commands = sum( + 1 + for _ in self.interaction_tree[cid] + if not isinstance(self.interaction_tree[cid][_], ContextMenu) + ) + global_context_menus = sum( + 1 + for _ in self.interaction_tree[cid] + if isinstance(self.interaction_tree[cid][_], ContextMenu) + ) + else: + guild_base_commands += sum( + 1 + for _ in self.interaction_tree[cid] + if not isinstance(self.interaction_tree[cid][_], ContextMenu) + ) + guild_context_menus += sum( + 1 + for _ in self.interaction_tree[cid] + if isinstance(self.interaction_tree[cid][_], ContextMenu) + ) + self.logger.info("Loaded {:>3} global base slash commands".format(global_base_commands)) + self.logger.info("Loaded {:>3} global context menus".format(global_context_menus)) + self.logger.info("Loaded {:>3} guild base slash commands".format(guild_base_commands)) + self.logger.info("Loaded {:>3} guild context menus".format(guild_context_menus)) + except Exception: + self.logger.error("interaction_tree not found, try updating NAFF") - self.logger.info("Loaded {:>3} global base slash commands".format(global_base_commands)) - self.logger.info("Loaded {:>3} global context menus".format(global_context_menus)) - self.logger.info("Loaded {:>3} guild base slash commands".format(guild_base_commands)) - self.logger.info("Loaded {:>3} guild context menus".format(guild_context_menus)) self.logger.debug("Hitting Reminders for faster loads") _ = await Reminder.find().to_list(None)