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

duck-prevent-highlight by default, improve !friends/!enemies query

Browse source
This commit is contained in:
jesopo 2019-10-08 16:28:52 +01:00
parent 5035a5370c
commit a2ccf85abf
1 changed files with 29 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
modules/ducks.py
View file

@ -15,6 +15,8 @@ DEFAULT_MIN_MESSAGES = 100
"Minimum messages between ducks spawning")) "Minimum messages between ducks spawning"))
@utils.export("channelset", utils.BoolSetting("ducks-kick", @utils.export("channelset", utils.BoolSetting("ducks-kick",
"Whether or not to kick someone talking to non-existent ducks")) "Whether or not to kick someone talking to non-existent ducks"))
@utils.export("channelset", utils.BoolSetting("ducks-prevent-highlight",
"Whether or not to prevent highlighting users with !friends/!enemies"))
class Module(ModuleManager.BaseModule): class Module(ModuleManager.BaseModule):
@utils.hook("new.channel") @utils.hook("new.channel")
def new_channel(self, event): def new_channel(self, event):
@ -112,8 +114,15 @@ class Module(ModuleManager.BaseModule):
:help: Show top 10 duck friends :help: Show top 10 duck friends
:usage: [channel] :usage: [channel]
""" """
stats = self._top_duck_stats(event["server"], "ducks-befriended", query = None
"friends", event["target"].name if event["is_channel"] else None) if event["args"]:
if not event["args_split"][0] == "*":
query = event["args_split"][0]
elif event["is_channel"]:
query = event["target"].name
stats = self._top_duck_stats(event["server"], event["target"],
"ducks-befriended", "friends", query)
event["stdout"].write(stats) event["stdout"].write(stats)
@utils.hook("received.command.enemies") @utils.hook("received.command.enemies")
def enemies(self, event): def enemies(self, event):
@ -121,11 +130,19 @@ class Module(ModuleManager.BaseModule):
:help: Show top 10 duck enemies :help: Show top 10 duck enemies
:usage: [channel] :usage: [channel]
""" """
stats = self._top_duck_stats(event["server"], "ducks-shot", "enemies", query = None
event["target"].name if event["is_channel"] else None) if event["args"]:
if not event["args_split"][0] == "*":
query = event["args_split"][0]
elif event["is_channel"]:
query = event["target"].name
stats = self._top_duck_stats(event["server"], event["target"],
"ducks-shot", "enemies", query)
event["stdout"].write(stats) event["stdout"].write(stats)
def _top_duck_stats(self, server, setting, description, channel_query): def _top_duck_stats(self, server, target, setting, description,
channel_query):
channel_query_str = "" channel_query_str = ""
if not channel_query == None: if not channel_query == None:
channel_query = server.irc_lower(channel_query) channel_query = server.irc_lower(channel_query)
@ -141,10 +158,16 @@ class Module(ModuleManager.BaseModule):
user_stats[nickname] += value user_stats[nickname] += value
top_10 = utils.top_10(user_stats, top_10 = utils.top_10(user_stats,
convert_key=lambda nickname: server.get_user(nickname).nickname) convert_key=lambda n: self._get_nickname(server, target, n))
return "Top duck %s%s: %s" % (description, channel_query_str, return "Top duck %s%s: %s" % (description, channel_query_str,
", ".join(top_10)) ", ".join(top_10))
def _get_nickname(self, server, target, nickname):
nickname = server.get_user(nickname).nickname
if target.get_setting("ducks-prevent-highlight", True):
nickname = utils.prevent_highlight(nickname)
return nickname
@utils.hook("received.command.duckstats") @utils.hook("received.command.duckstats")
def duckstats(self, event): def duckstats(self, event):
""" """