v3.3.2, fix perm bug

Author: Taaku18

.github/workflows/lints.yml

@@ -1,14 +1,21 @@
 name: Modmail Workflow
 
-on: [push, pull_request, pull_request_review]
+on: [push, pull_request]
 
 jobs:
   code-style:
-    runs-on: ${{ matrix.os }}
+
+#    runs-on: ${{ matrix.os }}
+#    strategy:
+#      fail-fast: false
+#      matrix:
+#        os: [ubuntu-latest, windows-latest, macOS-latest]
+#        python-version: [3.6, 3.7]
+
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macOS-latest]
         python-version: [3.6, 3.7]
 
     steps:
@@ -26,7 +33,8 @@ jobs:
       run: bandit ./bot.py cogs/*.py core/*.py -b .bandit_baseline.json
     - name: Pylint
       run: pylint ./bot.py cogs/*.py core/*.py --disable=import-error  --exit-zero -r y
-    - name: Flake8 and black lint
+      continue-on-error: true
+    - name: Black and flake8
       run: |
-        flake8 ./bot.py cogs/*.py core/*.py --ignore=E501,E203,W503
         black . --check
+        flake8 ./bot.py cogs/*.py core/*.py --ignore=E501,E203,W503

.gitignore

@@ -93,6 +93,7 @@ celerybeat-schedule
 .venv
 env/
 venv/
+venv2/
 ENV/
 env.bak/
 venv.bak/
@@ -134,4 +135,5 @@ plugins/
 !plugins/registry.json
 temp/
 test.py
-stack.yml
+stack.yml
+.github/workflows/build_docker.yml

CHANGELOG.md

@@ -7,6 +7,12 @@ This project mostly adheres to [Semantic Versioning](https://semver.org/spec/v2.
 however, insignificant breaking changes does not guarantee a major version bump, see the reasoning [here](https://github.com/kyb3r/modmail/issues/319).
 
 
+# v3.3.2
+
+### Fixed
+
+- An oversight with the permission system.
+
 # v3.3.1
 
 ### Emergency Patch

bot.py

@@ -1,4 +1,4 @@
-__version__ = "3.3.1"
+__version__ = "3.3.2"
 
 import asyncio
 import logging

core/checks.py

@@ -52,8 +52,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