From 38dd10b34a8fb7062ebe86f63ab2cebc781f92bc Mon Sep 17 00:00:00 2001
From: Yiays <yesiateyoursheep@gmail.com>
Date: Thu, 17 Oct 2024 12:14:22 +1300
Subject: [PATCH] Simplify some overcomplicated code

---
 extensions/confessions.py        |  4 ----
 extensions/confessions_common.py | 13 +++----------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/extensions/confessions.py b/extensions/confessions.py
index 842648f..5527fde 100755
--- a/extensions/confessions.py
+++ b/extensions/confessions.py
@@ -68,7 +68,6 @@ def __init__(self, bot:MerelyBot):
         print(" - WARN: Without `confessions_moderation` enabled, vetting channels won't work")
 
     self.crypto.key = self.config['secret']
-    self.ignore = set()
     self.confession_cooldown = dict()
 
     self.confess_reply = app_commands.ContextMenu(
@@ -251,9 +250,6 @@ async def on_confession_review(self, inter:discord.Interaction):
   async def confession_request(self, msg:discord.Message):
     """ Handle plain DM messages as confessions """
     if isinstance(msg.channel, discord.DMChannel) and msg.author != self.bot.user:
-      if msg.channel in self.ignore:
-        self.ignore.remove(msg.channel)
-        return
       if msg.author in self.confession_cooldown and\
          self.confession_cooldown[msg.author] > time.time():
         return
diff --git a/extensions/confessions_common.py b/extensions/confessions_common.py
index c178bc5..ea69e2f 100644
--- a/extensions/confessions_common.py
+++ b/extensions/confessions_common.py
@@ -203,6 +203,7 @@ def __init__(
     self.origin = origin
     self.parent = parent
     self.matches = matches
+    self.selection = matches[0][0]
     self.confession = confession
     self.soleguild = matches[0][0].guild if all((m.guild for m,_ in matches)) else None
     self.update_list()
@@ -250,15 +251,7 @@ async def channel_selector(self, inter:discord.Interaction, this:discord.ui.Sele
       await inter.response.send_message(self.parent.bot.babel(inter, 'error', 'wronguser'))
       return
     self.send_button.disabled = False
-    try:
-      self.selection = await self.parent.bot.fetch_channel(int(this.values[0]))
-    except discord.Forbidden:
-      self.send_button.disabled = True
-      await inter.response.edit_message(
-        content=self.parent.babel(inter, 'missingchannelerr')+' (select)',
-        view=self
-      )
-      return
+    self.selection = self.parent.bot.get_channel(int(this.values[0]))
     self.update_list()
     guildchannels = get_guildchannels(self.parent.config, self.selection.guild.id)
     vetting = findvettingchannel(guildchannels)
@@ -270,7 +263,7 @@ async def channel_selector(self, inter:discord.Interaction, this:discord.ui.Sele
       ),
       view=self)
 
-  @discord.ui.button(disabled=True, style=discord.ButtonStyle.primary)
+  @discord.ui.button(disabled=False, style=discord.ButtonStyle.primary, emoji='📨')
   async def send_button(self, inter:discord.Interaction, _:discord.Button):
     """ Send the confession """
     if self.selection is None or self.done: