fix: black/pylint

Author: lorenzo132

core/thread.py

@@ -131,7 +131,7 @@ def ready(self, flag: bool) -> None:
                 self._ready_event.set()
                 try:
                     self.bot.dispatch("thread_create", self)
-                except Exception as e:
+                except (RuntimeError, TypeError) as e:
                     logger.warning("Error dispatching thread_create: %s", e)
         else:
             self._ready_event.clear()
@@ -167,7 +167,7 @@ async def snooze(self, moderator=None, command_used=None, snooze_for=None):
             if snoozed_cat_id:
                 try:
                     target_category = self.bot.modmail_guild.get_channel(int(snoozed_cat_id))
-                except Exception:
+                except (ValueError, AttributeError):
                     target_category = None
             if isinstance(target_category, discord.CategoryChannel):
                 try:
@@ -178,7 +178,7 @@ async def snooze(self, moderator=None, command_used=None, snooze_for=None):
                             self.id,
                         )
                         return False
-                except Exception:
+                except (AttributeError, TypeError):
                     # If we cannot determine channel count, proceed; downstream will handle errors
                     pass
         # Ensure self.log_key is set before snoozing
@@ -264,7 +264,7 @@ async def snooze(self, moderator=None, command_used=None, snooze_for=None):
             if snoozed_cat_id:
                 try:
                     target_category = guild.get_channel(int(snoozed_cat_id))
-                except Exception:
+                except (ValueError, AttributeError):
                     target_category = None
             # If no valid snooze category is configured, create one automatically
             if not isinstance(target_category, discord.CategoryChannel):
@@ -293,9 +293,9 @@ async def snooze(self, moderator=None, command_used=None, snooze_for=None):
                     try:
                         await self.bot.config.set("snoozed_category_id", target_category.id)
                         await self.bot.config.update()
-                    except Exception:
+                    except (AttributeError, RuntimeError):
                         logger.warning("Failed to persist snoozed_category_id after auto-creation.")
-                except Exception as e:
+                except (discord.Forbidden, discord.HTTPException) as e:
                     logger.warning(
                         "Failed to auto-create snoozed category (%s). Falling back to current category.",
                         e,
@@ -312,7 +312,7 @@ async def snooze(self, moderator=None, command_used=None, snooze_for=None):
                 self._channel = channel
                 # mark in snooze data that this was a move-based snooze
                 self.snooze_data["moved"] = True
-            except Exception as e:
+            except (discord.Forbidden, discord.HTTPException) as e:
                 logger.warning(
                     "Failed to move channel to snoozed category: %s. Falling back to delete.",
                     e,
@@ -387,11 +387,11 @@ async def restore_from_snooze(self):
                         ow_map[target] = discord.PermissionOverwrite(**perm_values)
                     if ow_map:
                         await self.channel.edit(overwrites=ow_map, reason="Restore original overwrites")
-                except Exception as e:
+                except (discord.Forbidden, discord.HTTPException, ValueError) as e:
                     logger.warning("Failed to restore original overwrites on unsnooze: %s", e)
 
                 channel = self.channel
-            except Exception as e:
+            except (discord.Forbidden, discord.HTTPException) as e:
                 logger.warning("Failed to move snoozed channel back, recreating: %s", e)
                 channel = None
 
@@ -417,7 +417,7 @@ async def restore_from_snooze(self):
                     reason="Thread unsnoozed/restored (recreated)",
                 )
                 self._channel = channel
-            except Exception:
+            except (discord.Forbidden, discord.HTTPException):
                 logger.error("Failed to recreate thread channel during unsnooze.", exc_info=True)
                 return False
 
@@ -452,7 +452,7 @@ async def _safe_send_to_channel(*, content=None, embeds=None, allowed_mentions=N
                         embeds=embeds,
                         allowed_mentions=allowed_mentions,
                     )
-                except Exception:
+                except (discord.Forbidden, discord.HTTPException):
                     logger.error(
                         "Failed to recreate channel during unsnooze send.",
                         exc_info=True,
@@ -466,7 +466,7 @@ async def _ensure_genesis(force: bool = False):
             nonlocal genesis_already_sent
             try:
                 existing = await self.get_genesis_message()
-            except Exception:
+            except (discord.NotFound, discord.Forbidden):
                 existing = None
             if existing is None or force:
                 # Build log_url and log_count best-effort
@@ -483,14 +483,14 @@ async def _ensure_genesis(force: bool = False):
                 try:
                     logs = await self.bot.api.get_user_logs(self.id)
                     log_count = sum(1 for log in logs if not log.get("open"))
-                except Exception:
+                except (RuntimeError, AttributeError):
                     log_count = None
                 # Resolve recipient object
                 user = self.recipient
                 if user is None:
                     try:
                         user = await self.bot.get_or_fetch_user(self.id)
-                    except Exception:
+                    except discord.NotFound:
                         user = SimpleNamespace(
                             id=self.id,
                             mention=f"<@{self.id}>",
@@ -501,11 +501,11 @@ async def _ensure_genesis(force: bool = False):
                     msg = await channel.send(embed=info_embed)
                     try:
                         await msg.pin()
-                    except Exception as e:
+                    except (discord.Forbidden, discord.HTTPException) as e:
                         logger.warning("Failed to pin genesis message during unsnooze: %s", e)
                     self._genesis_message = msg
                     genesis_already_sent = True
-                except Exception:
+                except (discord.Forbidden, discord.HTTPException):
                     logger.warning("Failed to send genesis message during unsnooze.", exc_info=True)
 
         # If we recreated the channel, force-send genesis; if moved back, ensure it's present
@@ -514,7 +514,7 @@ async def _ensure_genesis(force: bool = False):
                 await _ensure_genesis(force=False)
             else:
                 await _ensure_genesis(force=True)
-        except Exception:
+        except (discord.Forbidden, discord.HTTPException):
             logger.debug("Genesis ensure step encountered an error.")
 
         # Strictly restore the log_key from snooze_data (never create a new one)
@@ -823,7 +823,7 @@ async def setup(self, *, creator=None, category=None, initial_message=None):
             )
 
             log_count = sum(1 for log in log_data if not log["open"])
-        except Exception:
+        except (RuntimeError, AttributeError):
             logger.error("An error occurred while posting logs to the database.", exc_info=True)
             log_url = log_count = None
             # ensure core functionality still works
@@ -851,12 +851,12 @@ async def send_genesis_message():
                         if opt.get("type") == "command":
                             log_txt += f" -> {opt.get('callback')}"
                         await channel.send(embed=discord.Embed(description=log_txt, color=self.bot.mod_color))
-                    except Exception:
+                    except (discord.Forbidden, discord.HTTPException):
                         logger.warning(
                             "Failed logging thread-creation menu selection",
                             exc_info=True,
                         )
-            except Exception:
+            except (discord.Forbidden, discord.HTTPException):
                 logger.error("Failed unexpectedly:", exc_info=True)
 
         async def send_recipient_genesis_message():
@@ -871,7 +871,7 @@ async def send_recipient_genesis_message():
                         close_emoji = self.bot.config["close_emoji"]
                         close_emoji = await self.bot.convert_emoji(close_emoji)
                         await self.bot.add_reaction(initial_message, close_emoji)
-                except Exception as e:
+                except (discord.Forbidden, discord.HTTPException) as e:
                     logger.info("Failed to add self-close reaction to initial message: %s", e)
                 return
 
@@ -1078,7 +1078,7 @@ async def _close(self, closer, silent=False, delete_channel=True, message=None,
         # with the menu after the thread is closed.
         try:
             await self._disable_dm_creation_menu()
-        except Exception:
+        except (discord.Forbidden, discord.HTTPException):
             # Non-fatal; continue closing even if we can't edit the DM menu
             pass
         if self.channel:
@@ -1249,18 +1249,16 @@ async def _disable_dm_creation_menu(self) -> None:
             msg = await dm.fetch_message(self._dm_menu_msg_id)
         except (discord.NotFound, discord.Forbidden):
             return
-        except Exception:
-            return
         try:
             closed_text = "This thread has been closed. Send a new message to start a new thread."  # Grammar-friendly guidance
             closed_embed = discord.Embed(description=closed_text)
             await msg.edit(content=None, embed=closed_embed, view=None)
-        except Exception as e:
+        except (discord.Forbidden, discord.HTTPException) as e:
             # Fallback: at least remove interaction so menu cannot be used
             logger.warning("Failed editing DM menu message on close: %s", e)
             try:
                 await msg.edit(view=None)
-            except Exception as inner_e:
+            except (discord.Forbidden, discord.HTTPException) as inner_e:
                 logger.debug("Failed removing view from DM menu message: %s", inner_e)
 
     async def cancel_closure(self, auto_close: bool = False, all: bool = False) -> None:
@@ -2120,7 +2118,7 @@ def lottie_to_png(data):
             ):
                 try:
                     await message.delete()
-                except Exception as e:
+                except (discord.Forbidden, discord.HTTPException) as e:
                     logger.warning("Cannot delete message: %s.", e)
 
         if (
@@ -2149,7 +2147,7 @@ def lottie_to_png(data):
             else:
                 logger.warning("Channel not found.")
                 raise
-        except (discord.Forbidden, discord.HTTPException, Exception) as e:
+        except (discord.Forbidden, discord.HTTPException) as e:
             logger.warning(
                 "Unable to send typing to %s: %s. Continuing without typing.",
                 destination,
@@ -2176,7 +2174,7 @@ def lottie_to_png(data):
                 for att in message.attachments:
                     try:
                         files.append(await att.to_file())
-                    except Exception:
+                    except (discord.Forbidden, discord.HTTPException):
                         logger.warning("Failed to attach file in plain DM.", exc_info=True)
 
                 msg = await destination.send(plain_message, files=files or None)
@@ -2431,7 +2429,7 @@ async def find(
                             )
                             self.cache.pop(thread.id, None)
                             thread = None
-                    except Exception:
+                    except (AttributeError, KeyError):
                         # If any attribute access fails, be safe and drop it.
                         self.cache.pop(getattr(thread, "id", None), None)
                         thread = None

core/utils.py

@@ -161,7 +161,7 @@ def is_image_url(url: str, **kwargs) -> str:
                 r"\1i.\2.png",
                 url,
             )
-    except ValueError:
+    except (ValueError, AttributeError):
         pass
 
     return parse_image_url(url, **kwargs)
@@ -725,10 +725,10 @@ def extract_forwarded_content(message) -> typing.Optional[str]:
                             if len(ref_msg.attachments) > 3:
                                 attachment_info += f" (+{len(ref_msg.attachments) - 3} more)"
                             return f"**{ref_author_name}:** [Attachments: {attachment_info}]"
-                except Exception as e:
+                except (AttributeError, KeyError) as e:
                     # Log and continue; failing to extract a reference preview shouldn't break flow
                     logger.debug("Failed to extract reference preview: %s", e)
-    except Exception:
+    except (AttributeError, KeyError, TypeError):
         # Silently handle any unexpected errors
         pass