Merge branch 'master' into auto-close-thread

Author: vivekjoshy

.github/FUNDING.yml

@@ -0,0 +1 @@
+patreon: kyber

.travis.yml

@@ -6,7 +6,7 @@ matrix:
     dist: xenial
 
 install:
-  - pip install -r requirements.txt
-  - pip install pylint
+  - pipenv install
+  - pipenv install pylint
 
-script: python .lint.py
+script: python .lint.py

CHANGELOG.md

@@ -9,9 +9,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added 
 
 - Sponsors command that will list sponsors.
+- An alert will now be sent to the log channel if a thread channel fails to create. This could be due to a variety of problems such as insufficient permissions or the category channel limit is met. 
 - Threads will close automatically after some time when `thread_auto_close` is set.
-- Custom closing message can be set with `thread_auto_close_response`. 
-
+- Custom closing message can be set with `thread_auto_close_response`.
 
 ### Changed
 - Channel names now can contain unicode characters.

cogs/utility.py

@@ -683,7 +683,7 @@ async def loop_presence(self):
         await self.bot.wait_until_ready()
         while not self.bot.is_closed():
             self.presence = await self.set_presence()
-            await asyncio.sleep(3600)
+            await asyncio.sleep(600)
 
     @commands.command()
     @checks.has_permissions(PermissionLevel.ADMINISTRATOR)

core/thread.py

@@ -103,12 +103,25 @@ async def setup(self, *, creator=None, category=None):
         if category is not None:
             overwrites = None
 
-        channel = await self.bot.modmail_guild.create_text_channel(
-            name=self.manager.format_channel_name(recipient),
-            category=category,
-            overwrites=overwrites,
-            reason="Creating a thread channel",
-        )
+        try:
+            channel = await self.bot.modmail_guild.create_text_channel(
+                name=self.manager.format_channel_name(recipient),
+                category=category,
+                overwrites=overwrites,
+                reason="Creating a thread channel",
+            )
+        except discord.HTTPException as e: # Failed to create due to 50 channel limit.
+            del self.manager.cache[self.id]
+            log_channel = self.bot.log_channel
+
+            em = discord.Embed(color=discord.Color.red())
+            em.title = 'Error while trying to create a thread'
+            em.description = e.message
+            em.add_field(name='Recipient', value=recipient.mention)
+
+            if log_channel is not None:
+                return await log_channel.send(embed=em)
+                
 
         self._channel = channel
 

core/utils.py

@@ -79,7 +79,7 @@ def format_preview(messages: typing.List[typing.Dict[str, typing.Any]]):
         if message.get("type") in ("note", "internal"):
             continue
         author = message["author"]
-        content = message["content"].replace("\n", " ")
+        content = str(message["content"]).replace("\n", " ")
         name = author["name"] + "#" + str(author["discriminator"])
         prefix = "[M]" if author["mod"] else "[R]"
         out += truncate(f"`{prefix} {name}:` {content}", max=75) + "\n"

plugins/registry.json

@@ -160,5 +160,23 @@
         "title": "Colors!!",
         "icon_url": "https://cdn1.iconfinder.com/data/icons/weather-19/32/rainbow-512.png",
         "thumbnail_url": "https://i.imgur.com/fSxnc9W.jpg"
+    },
+     "fun": {
+        "repository": "TheKinG2149/modmail-plugins",
+        "branch": "master",
+        "description": "Some fun commands like 8ball,dadjokes",
+        "bot_version": "2.24.1",
+        "title": "Fun",
+        "icon_url": "https://cdn.discordapp.com/attachments/584692239893135362/591588754142265354/43880032.png",
+        "thumbnail_url": "https://cdn.discordapp.com/attachments/584692239893135362/591588754142265354/43880032.png"
+   },
+    "stats": {
+        "repository": "MiTonder/modmail-plugins",
+        "branch": "master",
+        "description": "Get useful stats directly in an embed about either the ModMail bot, a user or the server.",
+        "bot_version": "2.24.1",
+        "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"
     }
 }