Merge branch 'master' of https://github.com/verixx/modmail

Author: kyb3r

README.md

@@ -95,10 +95,16 @@ You can also set up autoupdates. To do this, [install the Pull app in your fork]
 
 Sepcial thanks to our sponsors for supporting the project.
 
+<a href='https://www.youtube.com/channel/UCgSmBJD9imASmJRleycTCwQ/featured'> 
+  <img height=150 src='https://i.imgur.com/WyzaPKY.png' style='margin:10'> 
+</a>
+
 <a href='https://flyaurora.xyz/'> 
   <img height=150 src='https://pbs.twimg.com/profile_images/1142307497115443200/whbHhb9B_400x400.jpg'> 
 </a>
 
+
+
 Become a [sponsor](https://patreon.com/kyber).
 
 

SPONSORS.json

@@ -1,25 +1,27 @@
 [{
   "embed": {
-    "title": "You can have a custom page for yourself here.",
-    "description": "Generate your own embed from [here](https://leovoel.github.io/embed-visualizer/) and make a pull request editing the `SPONSORS.json` file on [GitHub](https://github.com/kyb3r/modmail/blob/master/SPONSORS.json).",
-    "url": "https://patreon.com/kyber",
-    "color": 6071775,
+    "description": "This is a youtube channel that provides high quality reddit content. Videos are uploaded regularly so you are never out of funny, interesting or even creepy content!",
+    "color": 15114050,
     "footer": {
-      "icon_url": "https://vignette.wikia.nocookie.net/smashtopia/images/c/c9/Insert_Image_Here.jpg/revision/latest?cb=20170827054712",
-      "text": "footer text"
+      "icon_url": "https://i.imgur.com/fvNKUks.png",
+      "text": "I am a robot, son of Daniel (UK)"
     },
     "thumbnail": {
-      "url": "https://vignette.wikia.nocookie.net/smashtopia/images/c/c9/Insert_Image_Here.jpg/revision/latest?cb=20170827054712"
+      "url": "https://i.imgur.com/WyzaPKY.png"
     },
     "author": {
-      "name": "Nothing here yet!",
-      "url": "https://patreon.com/kyber",
-      "icon_url": "https://vignette.wikia.nocookie.net/smashtopia/images/c/c9/Insert_Image_Here.jpg/revision/latest?cb=20170827054712"
+      "name": "Sir Reddit",
+      "url": "https://www.youtube.com/channel/UCgSmBJD9imASmJRleycTCwQ?sub_confirmation=1",
+      "icon_url": "https://i.imgur.com/WyzaPKY.png"
     },
     "fields": [
       {
-        "name": "🤔",
-        "value": "This command lists the sponsors of this project on [**Patreon**](https://patreon.com/kyber)"
+        "name": "Subscribe!", 
+        "value": "[**Click Here**](https://www.youtube.com/channel/UCgSmBJD9imASmJRleycTCwQ?sub_confirmation=1)"
+      },
+      {
+        "name": "Discord Server!", 
+        "value": "[**Click Here**](https://discord.gg/s8Ddphx)"
       }
     ]
   }

core/thread.py

@@ -127,7 +127,6 @@ async def setup(self, *, creator=None, category=None):
             log_url = log_count = None
             # ensure core functionality still works
 
-        topic = f"User ID: {recipient.id}"
         if creator:
             mention = None
         else:
@@ -147,7 +146,7 @@ async def send_genesis_message():
                 self.ready = True
                 self.bot.dispatch("thread_ready", self)
 
-        await channel.edit(topic=topic)
+        await channel.edit(topic=f"User ID: {recipient.id}")
         self.bot.loop.create_task(send_genesis_message())
 
         # Once thread is ready, tell the recipient.
@@ -735,7 +734,13 @@ async def find(
     ) -> Thread:
         """Finds a thread from cache or from discord channel topics."""
         if recipient is None and channel is not None:
-            return self._find_from_channel(channel)
+            thread = self._find_from_channel(channel)
+            if thread is None:
+                id, thread = next(((k, v) for k, v in self.cache.items() if v.channel == channel), (-1, None))
+                if thread is not None:
+                    logger.debug('Found thread with tempered ID.')
+                    await channel.edit(topic=f"User ID: {id}")
+            return thread
 
         thread = None
 

core/utils.py

@@ -188,7 +188,7 @@ def match_user_id(text: str) -> int:
     int
         The user ID if found. Otherwise, -1.
     """
-    match = re.match(r"^User ID: (\d+)$", text)
+    match = re.search(r"\bUser ID: (\d+)\b", text)
     if match is not None:
         return int(match.group(1))
     return -1

plugins/registry.json

@@ -107,15 +107,6 @@
         "icon_url": "https://images.ionadev.ml/b/ZIDUUsl.png",
         "thumbnail_url": "https://images.ionadev.ml/b/ZIDUUsl.png"
     },
-    "moderation": {
-        "repository": "officialpiyush/modmail-plugins",
-        "branch": "master",
-        "description": "Rule offenders in your server? Lift the ban hammer or warn them! Moderation plugin to the rescue :tada:",
-        "bot_version": "2.20.1",
-        "title": "Moderation Plugin",
-        "icon_url": "https://images.ionadev.ml/b/ZIDUUsl.png",
-        "thumbnail_url": "https://images.ionadev.ml/b/ZIDUUsl.png"
-    },
     "translator": {
         "repository": "officialpiyush/modmail-plugins",
         "branch": "master",
@@ -187,5 +178,14 @@
         "title": "Get Stats",
         "icon_url": "https://image.flaticon.com/icons/png/512/117/117761.png",
         "thumbnail_url": "http://www.pngmart.com/files/7/Statistics-PNG-Clipart.png"
-    }
+    },
+    "moderation": {
+        "repository": "xPolar/modmail-plugins",
+        "branch": "master",
+        "description": "Moderate your server with Modmail, bring the Mod to Modmail!",
+        "bot_version": "3.0.3",
+        "title": "Moderate your server",
+        "icon_url": "https://cdn.discordapp.com/attachments/539943767562780704/601485194196680704/wGFmzZq.png",
+        "thumbnail_url": "https://cdn.discordapp.com/attachments/539943767562780704/601485194196680704/wGFmzZq.png"
+    } 
 }