Merge branch 'main' into dependabot/pip/charset-normalizer-3.4.0

Powers/supports.py

@@ -19,20 +19,25 @@ def get_support_staff(want="all"):
     dev, sudo, whitelist, dev_level, sudo_level, all
     """
     support = SUPPORTS()
-    devs = SUPPORT_USERS["Dev"] or support.get_particular_support("dev")
-    sudo = SUPPORT_USERS["Sudo"] or support.get_particular_support("sudo")
-    whitelist = SUPPORT_USERS["White"] or support.get_particular_support("whitelist")
     if want in ["dev", "dev_level"]:
+        devs = SUPPORT_USERS["Dev"] or support.get_particular_support("dev")
         wanted = list(devs) 
         if want == "dev_level":
             wanted.append(OWNER_ID)
     elif want == "sudo":
+        sudo = SUPPORT_USERS["Sudo"] or support.get_particular_support("sudo")
         wanted = list(sudo)
     elif want == "whitelist":
+        whitelist = SUPPORT_USERS["White"] or support.get_particular_support("whitelist")
         wanted = list(whitelist)
     elif want == "sudo_level":
+        devs = SUPPORT_USERS["Dev"] or support.get_particular_support("dev")
+        sudo = SUPPORT_USERS["Sudo"] or support.get_particular_support("sudo")
         wanted = list(sudo) + list(devs) + [OWNER_ID]
     else:
+        devs = SUPPORT_USERS["Dev"] or support.get_particular_support("dev")
+        sudo = SUPPORT_USERS["Sudo"] or support.get_particular_support("sudo")
+        whitelist = SUPPORT_USERS["White"] or support.get_particular_support("whitelist")
         wanted = list(set([int(OWNER_ID)] + list(devs) + list(sudo) + list(whitelist)))
 
     return wanted or []

requirements.txt

@@ -23,7 +23,7 @@ python-dateutil==2.8.2
 pytube==15.0.0
 pytz==2024.1
 pyyaml==6.0.1
-qrcode==7.4.2
+qrcode==8.0
 regex==2023.12.25
 requests==2.32.2
 rfc3986==1.5.0