merge from master into dev

modmail-dev · Dec 9, 2019 · acf6aa9 · acf6aa9
2 parents 72f8962 + a26cd4e
commit acf6aa9
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -48,6 +48,12 @@ however, insignificant breaking changes does not guarantee a major version bump,
 - Alias parser is rewritten without shlex.
 - New checks with thread create / find.
 
+# v3.3.2
+
+### Fixed
+
+- An oversight with the permission system.
+
 # v3.3.1
 
 ### Emergency Patch

diff --git a/core/checks.py b/core/checks.py
@@ -50,8 +50,9 @@ async def check_permissions(ctx, command_name) -> bool:
     if (
         permission_level is not PermissionLevel.OWNER
         and ctx.channel.permissions_for(ctx.author).administrator
+        and ctx.guild == ctx.bot.modmail_guild
     ):
-        # Administrators have permission to all non-owner commands
+        # Administrators have permission to all non-owner commands in the Modmail Guild
         logger.debug("Allowed due to administrator.")
         return True
 

diff --git a/plugins/registry.json b/plugins/registry.json
@@ -26,6 +26,14 @@
         "icon_url": "https://i.imgur.com/67bEi82.png",
         "thumbnail_url": "https://i.imgur.com/67bEi82.png"
     },
+    "anti-steal-close": {
+      "repository": "officialpiyush/modmail-plugins",
+      "branch": "master",
+      "description": "Don't let anyone steal ya close.",
+      "title": "Anti Steal Close",
+      "icon_url": "https://i.imgur.com/LovxyV3.png",
+      "thumbnail_url": "https://i.imgur.com/LovxyV3.png"
+    },
     "embedder": {
         "repository": "papiersnipper/modmail-plugins",
         "branch": "master",
@@ -80,6 +88,15 @@
         "icon_url": "https://images.ionadev.ml/b/ZIDUUsl.png",
         "thumbnail_url": "https://images.ionadev.ml/b/ZIDUUsl.png"
     },
+    "giveaway": {
+        "repository": "officialpiyush/modmail-plugins",
+        "branch": "master",
+        "description": "Host giveaways on your server",
+        "bot_version": "2.20.1",
+        "title": "\uD83C\uDF89 Giveaway Plugin \uD83C\uDF89",
+        "icon_url": "https://i.imgur.com/qk85xdi.png",
+        "thumbnail_url": "https://i.imgur.com/gUHB91v.png"
+    },
     "hastebin": {
         "repository": "officialpiyush/modmail-plugins",
         "branch": "master",
@@ -177,6 +194,6 @@
         "bot_version": "2.20.1",
         "title": "Server Stats",
         "icon_url": "https://i.gyazo.com/fadb70740e83f2448b23ffe192a1f32d.png",
-        "thumbnail_url": "https://i.gyazo.com/fadb70740e83f2448b23ffe192a1f32d.png" 
-    } 
+        "thumbnail_url": "https://i.gyazo.com/fadb70740e83f2448b23ffe192a1f32d.png"
+    }
 }