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

dont say a vote has changed when it's been "changed" to the same option

Browse source
This commit is contained in:
jesopo 2019-10-10 17:15:03 +01:00
parent c2f075599d
commit 0960740aca
1 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
modules/vote.py
View file

@ -10,6 +10,7 @@ STR_NOVOTE = "Unknown vote '%s'"
class VoteCastResult(enum.Enum): class VoteCastResult(enum.Enum):
Cast = 1 Cast = 1
Changed = 2 Changed = 2
Unchanged = 3
@utils.export("channelset", utils.BoolSetting("votes-start-restricted", @utils.export("channelset", utils.BoolSetting("votes-start-restricted",
"Whether starting a vote should be restricted to ops")) "Whether starting a vote should be restricted to ops"))
@ -46,19 +47,22 @@ class Module(ModuleManager.BaseModule):
def _format_options(self, vote): def _format_options(self, vote):
return ", ".join("'%s'" % o for o in vote["options"]) return ", ".join("'%s'" % o for o in vote["options"])
def _cast_vote(self, channel, vote_id, user, option): def _cast_vote(self, channel, vote_id, user, chosen_option):
vote = self._get_vote(channel, vote_id) vote = self._get_vote(channel, vote_id)
option = vote["options"][option] option_nicks = vote["options"][chosen_option]
cast_type = VoteCastResult.Cast cast_type = VoteCastResult.Cast
for nicks in vote["options"].values(): for option, nicks in vote["options"].values():
if user.name in nicks: if user.name in nicks:
nicks.remove(user.name) if option == chosen_option:
cast_type = VoteCastResult.Changed return VoteCastResult.Unchanged
break else:
nicks.remove(user.name)
cast_type = VoteCastResult.Changed
break
option.append(user.name) option_nicks.append(user.name)
self._set_vote(channel, vote_id, vote) self._set_vote(channel, vote_id, vote)
return cast_type return cast_type
@ -132,11 +136,13 @@ class Module(ModuleManager.BaseModule):
cast_result = self._cast_vote(event["target"], vote_id, cast_result = self._cast_vote(event["target"], vote_id,
event["user"], choice) event["user"], choice)
cast_desc = "cast" cast_desc = "has been cast"
if cast_result == VoteCastResult.Changed: if cast_result == VoteCastResult.Changed:
cast_desc = "changed" cast_desc = "has been changed"
elif cast_result == VoteCastResult.Unchanged:
cast_desc = "is unchanged"
event["stdout"].write("%s: your vote has been %s." % event["stdout"].write("%s: your vote %s." %
(event["user"].nickname, cast_desc)) (event["user"].nickname, cast_desc))
@utils.hook("received.command.votes", channel_only=True) @utils.hook("received.command.votes", channel_only=True)