From 8502b9ea0baecf6046b83160ceb876ef2d8f9788 Mon Sep 17 00:00:00 2001
From: nexy7574 <me@nexy7574.co.uk>
Date: Mon, 24 Jul 2023 13:41:49 +0100
Subject: [PATCH 1/3] Fix suppressed embeds

---
 web/server.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/server.py b/web/server.py
index a1154f8..4defc4a 100644
--- a/web/server.py
+++ b/web/server.py
@@ -330,7 +330,7 @@ async def bridge(req: Request):
                 allowed_mentions=discord.AllowedMentions.none(),
                 reference=msg,
                 silent=True,
-                suppress=True
+                suppress=n != m
             )
             app.state.last_sender = body["sender"]
     else:
@@ -341,7 +341,7 @@ async def bridge(req: Request):
             content,
             allowed_mentions=discord.AllowedMentions.none(),
             silent=True,
-            suppress=True
+            suppress=False
         )
         app.state.last_sender = body["sender"]
     return {"status": "ok", "pages": len(paginator.pages)}

From 40afef4ad19a910b4a61d05402ee23a613095a64 Mon Sep 17 00:00:00 2001
From: nexy7574 <me@nexy7574.cyou>
Date: Mon, 24 Jul 2023 13:57:48 +0100
Subject: [PATCH 2/3] Add last sender timestamp

---
 web/server.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/web/server.py b/web/server.py
index 4defc4a..8b9ceaa 100644
--- a/web/server.py
+++ b/web/server.py
@@ -54,6 +54,7 @@ try:
 except ImportError:
     bot = None
 app.state.last_sender = None
+app.state.last_sender_ts = datetime.utcnow()
 
 
 @app.middleware("http")
@@ -291,6 +292,8 @@ async def verify(code: str):
 
 @app.post("/bridge", include_in_schema=False, status_code=201)
 async def bridge(req: Request):
+    now = datetime.utcnow()
+    ts_diff = (now - app.state.last_sender_ts).total_seconds()
     from discord.ext.commands import Paginator
     body = await req.json()
     if body["secret"] != app.state.bot.http.token:
@@ -319,7 +322,7 @@ async def bridge(req: Request):
             paginator.add_line(textwrap.shorten(line, width=1900, placeholder="<...>"))
     if len(paginator.pages) > 1:
         msg = None
-        if app.state.last_sender != body["sender"]:
+        if app.state.last_sender != body["sender"] or ts_diff >= 600:
             msg = await channel.send(
                 f"**{body['sender']}**:"
             )
@@ -335,7 +338,7 @@ async def bridge(req: Request):
             app.state.last_sender = body["sender"]
     else:
         content = f"**{body['sender']}**:\n>>> {body['message']}"
-        if app.state.last_sender == body["sender"]:
+        if app.state.last_sender == body["sender"] and ts_diff < 600:
             content = f">>> {body['message']}"
         await channel.send(
             content,
@@ -344,6 +347,7 @@ async def bridge(req: Request):
             suppress=False
         )
         app.state.last_sender = body["sender"]
+    app.state.last_sender_ts = now
     return {"status": "ok", "pages": len(paginator.pages)}
 
 

From 5c682786698d973094d65a84540c760c329b383a Mon Sep 17 00:00:00 2001
From: nexy7574 <me@nexy7574.co.uk>
Date: Tue, 1 Aug 2023 22:15:27 +0100
Subject: [PATCH 3/3] fix jimmy leaving before it can be unmuted

---
 cogs/events.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/cogs/events.py b/cogs/events.py
index 1841471..fb7b786 100644
--- a/cogs/events.py
+++ b/cogs/events.py
@@ -256,7 +256,6 @@ class Events(commands.Cog):
                         await voice.move_to(message.author.voice.channel)
                     
                     if message.guild.me.voice.self_mute or message.guild.me.voice.mute:
-                        await _dc(voice)
                         await message.channel.trigger_typing()
                         await message.reply("Unmute me >:(", file=discord.File(_file))
                     else: