Merge branch 'master' into development

Author: Taaku18

CONTRIBUTING.md

@@ -13,20 +13,25 @@ If you are proposing new features, please discuss them with us in the [developme
 ## We Develop with Github
 We use github to host code, to track issues and feature requests, as well as accept pull requests.
 
-## We Use [Github Flow](https://guides.github.com/introduction/flow/index.html), So All Code Changes Happen Through Pull Requests
-Pull requests are the best way to propose changes to the codebase (we use [Github Flow](https://guides.github.com/introduction/flow/index.html)). We actively welcome your pull requests:
+## We Use [Git Flow](https://atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow)
+![Simple Image Of A Git Flow Workflow](https://nvie.com/img/[email protected])
+When contributing to this project please make sure you follow this and name your branches appropriately! 
 
-1. Fork the repo and create your branch from `master`.
+## All Code Changes Happen Through Pull Requests
+Make sure you know how Git Flow works before contributing! 
+Pull requests are the best way to propose changes to the codebase. We actively welcome your pull requests:
+
+1. Fork the repo and create your branch from `master` or `development` according to Git Flow.
 2. If you've added code that should be tested, add tests.
 3. If you've changed APIs, update the documentation.
 4. Ensure the test suite passes.
 5. Make sure your code lints.
 6. Issue that pull request!
 
-## Any contributions you make will be under the MIT Software License
-In short, when you submit code changes, your submissions are understood to be under the same [MIT License](http://choosealicense.com/licenses/mit/) that covers the project. Feel free to contact the maintainers if that's a concern.
+## Any contributions you make will be under the GNU Affero General Public License v3.0
+In short, when you submit code changes, your submissions are understood to be under the same [GNU Affero General Public License v3.0](https://www.gnu.org/licenses/agpl-3.0.en.html) that covers the project. Feel free to contact the maintainers if that's a concern.
 
-## Report bugs using Github's [issues](https://github.com/kyb3r/modmail/issues)
+## Report bugs using [Github Issues](https://github.com/kyb3r/modmail/issues)
 We use GitHub issues to track public bugs. Report a bug by [opening a new issue](https://github.com/kyb3r/modmail/issues/new); it's that easy!
 
 ## Write bug reports with detail, background, and sample code

SPONSORS.json

@@ -1,28 +1,67 @@
-[{
-  "embed": {
-    "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://i.imgur.com/fvNKUks.png",
-      "text": "I am a robot, son of Daniel (UK)"
-    },
-    "thumbnail": {
-      "url": "https://i.imgur.com/WyzaPKY.png"
-    },
-    "author": {
-      "name": "Sir Reddit",
-      "url": "https://www.youtube.com/channel/UCgSmBJD9imASmJRleycTCwQ?sub_confirmation=1",
-      "icon_url": "https://i.imgur.com/WyzaPKY.png"
-    },
-    "fields": [
-      {
-        "name": "Subscribe!", 
-        "value": "[**Click Here**](https://www.youtube.com/channel/UCgSmBJD9imASmJRleycTCwQ?sub_confirmation=1)"
-      },
-      {
-        "name": "Discord Server!", 
-        "value": "[**Click Here**](https://discord.gg/V8ErqHb)"
+[
+   {
+      "embed":{
+         "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://i.imgur.com/fvNKUks.png",
+            "text":"I am a robot, son of Daniel (UK)"
+         },
+         "thumbnail":{
+            "url":"https://i.imgur.com/WyzaPKY.png"
+         },
+         "author":{
+            "name":"Sir Reddit",
+            "url":"https://www.youtube.com/channel/UCgSmBJD9imASmJRleycTCwQ?sub_confirmation=1",
+            "icon_url":"https://i.imgur.com/WyzaPKY.png"
+         },
+         "fields":[
+            {
+               "name":"Subscribe!",
+               "value":"[**Click Here**](https://www.youtube.com/channel/UCgSmBJD9imASmJRleycTCwQ?sub_confirmation=1)"
+            },
+            {
+               "name":"Discord Server!",
+               "value":"[**Click Here**](https://discord.gg/V8ErqHb)"
+            }
+         ]
       }
-    ]
-  }
-}]
+   },
+   {
+      "embed":{
+         "title":"Hey there! ",
+         "description":"Nice to see you here! u can support us by subscribing on youtube -> [Youtube](https://www.youtube.com/user/RoomieOfficial) <-and also join our discord! [Discord](https://discord.gg/qdujXC8)",
+         "url":"https://discord.gg/qdujXC8",
+         "color":13003681,
+         "footer":{
+            "icon_url":"https://imgur.com/Mrc9pLd.gif",
+            "text":"footer text"
+         },
+         "thumbnail":{
+            "url":"https://imgur.com/Mrc9pLd.gif"
+         },
+         "image":{
+            "url":"https://imgur.com/ZUFiL6b.gif"
+         },
+         "author":{
+            "name":"Roomieofficial",
+            "url":"https://discord.gg/qdujXC8",
+            "icon_url":"https://imgur.com/6hBkt7Z.png"
+         },
+         "fields":[
+            {
+               "name":"What is all this about🤔 ",
+               "value":"We are mainly focused on everything that has anything to do with music or singing! "
+            },
+            {
+               "name":"Youtube🙄",
+               "value":"U will get great content if you follow our [Youtube](https://www.youtube.com/user/RoomieOfficial) with weekly uploads"
+            },
+            {
+               "name":"Discord😁",
+               "value":"Make sure to join our [Discord](https://discord.gg/qdujXC8) We have weekly events, 24/7 chats and more! "
+            }
+         ]
+      }
+   }
+]

app.json

@@ -12,7 +12,7 @@
       "required": true
     },
     "OWNERS": {
-      "description": "Comma separated user IDs of people that are allowed to use owner only commands. (eval and update).",
+      "description": "Comma separated user IDs of people that are allowed to use owner only commands. (eval).",
       "required": true
     },
     "MONGO_URI": {

cogs/modmail.py

@@ -1033,6 +1033,8 @@ async def block(
 
         mention = getattr(user, "mention", f"`{user.id}`")
 
+        moderator = ctx.author.name
+
         if str(user.id) in self.bot.blocked_whitelisted_users:
             embed = discord.Embed(
                 title="Error",
@@ -1042,18 +1044,18 @@ async def block(
             return await ctx.send(embed=embed)
 
         if after is not None:
-            reason = after.arg
+            reason = f"{after.arg} by {moderator}"
             if reason.startswith("System Message: "):
                 raise commands.BadArgument(
                     "The reason cannot start with `System Message:`."
                 )
             if "%" in reason:
                 raise commands.BadArgument('The reason contains illegal character "%".')
             if after.dt > after.now:
-                reason = f"{reason} %{after.dt.isoformat()}%"
+                reason = f"{reason} %{after.dt.isoformat()}% by {moderator}"
 
         if not reason:
-            reason = None
+            reason = f"Blocked by {moderator}"
 
         extend = f" for `{reason}`" if reason is not None else ""
         msg = self.bot.blocked_users.get(str(user.id))
@@ -1067,7 +1069,7 @@ async def block(
         ):
             if str(user.id) in self.bot.blocked_users:
 
-                old_reason = msg.strip().rstrip(".") or "no reason"
+                old_reason = msg.strip().rstrip(".") or f"Blocked by {moderator}"
                 embed = discord.Embed(
                     title="Success",
                     description=f"{mention} was previously blocked for "

runtime.txt

@@ -1 +1 @@
-python-3.7.3
+python-3.7.4