From: CMDR furrycat <elite@furrycat.net>
Date: Mon, 6 Mar 2017 15:09:55 +0000 (+0000)
Subject: We were incorrectly checking that a user had the EXACT same role as the bot!
X-Git-Url: http://git.furryclan.net/?a=commitdiff_plain;h=a0ac081ff12c75e00bfcdd2b7b91cfb60f1c99a5;p=furrycat%2Fcatbot.git

We were incorrectly checking that a user had the EXACT same role as the bot!
---

diff --git a/plugin/announcements/announcements.py b/plugin/announcements/announcements.py
index 95c1018..37ee8fd 100644
--- a/plugin/announcements/announcements.py
+++ b/plugin/announcements/announcements.py
@@ -162,7 +162,7 @@ class Announcements(DBConnection):
             log.debug('Member {} with role {} on server {} can edit announcements from lower role.'.format(member.name, member.top_role.name, server.name))
             return announcement
           elif command == 'asap' or member.top_role == announcer.top_role:
-            if member.top_role == member.server.me.top_role:
+            if member.top_role >= member.server.me.top_role:
               log.debug('Member {} with role {} on server {} can edit announcements.'.format(member.name, member.top_role.name, server.name))
               return announcement
 
diff --git a/plugin/faction/faction.py b/plugin/faction/faction.py
index 7fdeebb..035a87c 100644
--- a/plugin/faction/faction.py
+++ b/plugin/faction/faction.py
@@ -372,7 +372,7 @@ class Faction(DBConnection):
             log.debug('Member {} on server {} can edit factions from lower role.'.format(member.name, server.name))
             return faction
           elif member.top_role == announcer.top_role:
-            if member.top_role == member.server.me.top_role:
+            if member.top_role >= member.server.me.top_role:
               log.debug('Member {} with role {} on server {} can edit factions.'.format(member.name, member.top_role.name, server.name))
               return faction