Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

Move out logic to case-insensitively find a badge (badges.py)

Browse source
This commit is contained in:
jesopo 2018-12-22 09:33:23 +00:00
parent bd8ca2083b
commit 43361961bb
1 changed files with 12 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
modules/badges.py
View file

@ -22,6 +22,12 @@ class Module(ModuleManager.BaseModule):
def _days_since(self, now: datetime.date, dt: datetime.datetime): def _days_since(self, now: datetime.date, dt: datetime.datetime):
return (now-dt.date()).days return (now-dt.date()).days
def _find_badge(self, badges, badge):
badge_lower = badge.lower()
for badge_name in badges.keys():
if badge_name.lower() == badge_lower:
return badge_name
def _get_badges(self, user): def _get_badges(self, user):
return user.get_setting("badges", {}) return user.get_setting("badges", {})
def _set_badges(self, user, badges): def _set_badges(self, user, badges):
@ -39,11 +45,7 @@ class Module(ModuleManager.BaseModule):
now = self._round_up_day(self._now()) now = self._round_up_day(self._now())
found_badge = None found_badge = self._find_badge(badges, badge)
for badge_name in badges.keys():
if badge_name.lower() == badge_lower:
found_badge = badge_name
break
if found_badge: if found_badge:
dt = self._parse_datetime(badges[found_badge]) dt = self._parse_datetime(badges[found_badge])
@ -86,6 +88,7 @@ class Module(ModuleManager.BaseModule):
for badge_name in badges.keys(): for badge_name in badges.keys():
if badge_name.lower() == badge_lower: if badge_name.lower() == badge_lower:
raise utils.EventError("You already have a '%s' badge" % badge) raise utils.EventError("You already have a '%s' badge" % badge)
badges[badge] = self._format_datetime(self._now()) badges[badge] = self._format_datetime(self._now())
self._set_badges(event["user"], badges) self._set_badges(event["user"], badges)
event["stdout"].write("Added '%s' badge" % badge) event["stdout"].write("Added '%s' badge" % badge)
@ -100,11 +103,8 @@ class Module(ModuleManager.BaseModule):
badge_lower = badge.lower() badge_lower = badge.lower()
badges = self._get_badges(event["user"]) badges = self._get_badges(event["user"])
found_badge = None found_badge = self._find_badge(badges, badge)
for badge_name in badges.keys():
if badge_name.lower() == badge_lower:
found_badge = badge_name
break
if found_badge: if found_badge:
del badges[found_badge] del badges[found_badge]
self._set_badges(event["user"], badges) self._set_badges(event["user"], badges)
@ -122,11 +122,7 @@ class Module(ModuleManager.BaseModule):
badge_lower = badge.lower() badge_lower = badge.lower()
badges = self._get_badges(event["user"]) badges = self._get_badges(event["user"])
found_badge = None found_badge = self._find_badge(badges, badge)
for badge_name in badges.keys():
if badge_name.lower() == badge_lower:
found_badge = badge_name
break
if found_badge: if found_badge:
badges[found_badge] = self._format_datetime(self._now()) badges[found_badge] = self._format_datetime(self._now())
@ -145,11 +141,7 @@ class Module(ModuleManager.BaseModule):
badge_lower = badge.lower() badge_lower = badge.lower()
badges = self._get_badges(event["user"]) badges = self._get_badges(event["user"])
found_badge = None found_badge = self._find_badge(badges, badge)
for badge_name in badges.keys():
if badge_name.lower() == badge_lower:
found_badge = badge_name
break
if not found_badge: if not found_badge:
raise utils.EventError("You have no '%s' badge" % badge) raise utils.EventError("You have no '%s' badge" % badge)