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

Merge pull request #251 from fndax/issue-210

Browse source 
Make !words work in PM (fixes #210)
This commit is contained in:
jesopo 2020-03-08 22:16:55 +00:00 committed by GitHub
commit d4ce93cf84
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
modules/words.py
View file

@ -105,15 +105,17 @@ class Module(ModuleManager.BaseModule):
self._channel_message(event["server"].get_user( self._channel_message(event["server"].get_user(
event["server"].nickname), event) event["server"].nickname), event)
@utils.hook("received.command.words", channel_only=True) @utils.hook("received.command.words")
@utils.kwarg("help", @utils.kwarg("help",
"See how many words you or the given nickname have used") "See how many words you or the given nickname have used")
@utils.spec("!-channelonly ?<nickname>ouser") @utils.spec("?<nickname>ouser")
def words(self, event): def words(self, event):
target_user = event["spec"][0] or event["user"] if event["spec"][0] and event["is_channel"]:
target_user = event["spec"][0]
else:
target_user = event["user"]
words = dict(self._user_all(target_user)) words = dict(self._user_all(target_user))
this_channel = words.get(event["target"].id, 0)
total = 0 total = 0
for channel_id in words: for channel_id in words:
@ -125,9 +127,14 @@ class Module(ModuleManager.BaseModule):
since = " since %s" % utils.datetime.format.date_human( since = " since %s" % utils.datetime.format.date_human(
utils.datetime.timestamp(first_words)) utils.datetime.timestamp(first_words))
if event["is_channel"]:
this_channel = words.get(event["target"].id, 0)
event["stdout"].write("%s has used %d words (%d in %s)%s" % ( event["stdout"].write("%s has used %d words (%d in %s)%s" % (
target_user.nickname, total, this_channel, event["target"].name, target_user.nickname, total, this_channel, event["target"].name,
since)) since))
else:
event["stdout"].write("%s has used %d words%s" % (
target_user.nickname, total, since))
@utils.hook("received.command.trackword") @utils.hook("received.command.trackword")
@utils.kwarg("help", "Start tracking a word") @utils.kwarg("help", "Start tracking a word")