diff options
| author | 2018-08-31 10:51:47 +0100 | |
|---|---|---|
| committer | 2018-08-31 10:51:47 +0100 | |
| commit | 90ce92dc39395444862edfc7946ef7a1195f2464 (patch) | |
| tree | 6832c146a15879df292d265083bfe5795cbdfa69 /modules/print_activity.py | |
| parent | Reformat (diff) | |
Revert "Reformat"
This reverts commit abed9cf
Diffstat (limited to 'modules/print_activity.py')
| -rw-r--r-- | modules/print_activity.py | 39 |
1 files changed, 9 insertions, 30 deletions
diff --git a/modules/print_activity.py b/modules/print_activity.py index 69ec5ab1..8ec55026 100644 --- a/modules/print_activity.py +++ b/modules/print_activity.py @@ -1,7 +1,6 @@ import datetime import EventManager - class Module(object): def __init__(self, bot): self.bot = bot @@ -47,54 +46,42 @@ class Module(object): if event["action"]: self.print_line(event, "* %s %s" % ( nickname, event["message"]), - channel=event["channel"].name) + channel=event["channel"].name) else: self.print_line(event, "<%s> %s" % ( nickname, event["message"]), - channel=event["channel"].name) - + channel=event["channel"].name) def channel_message(self, event): self._on_message(event, event["user"].nickname) - def self_channel_message(self, event): self._on_message(event, event["server"].nickname) def _on_notice(self, event, target): self.print_line(event, "(notice->%s) <%s> %s" % ( target, event["user"].nickname, event["message"])) - def channel_notice(self, event): self._on_notice(event, event["channel"].name) - def private_notice(self, event): self._on_notice(event, event["server"].nickname) - def server_notice(self, event): self.print_line(event, "(server notice) %s" % event["message"]) def _on_join(self, event, nickname): if not self.bot.args.verbose: self.print_line(event, "%s joined %s" % (nickname, - event["channel"].name)) - + event["channel"].name)) def join(self, event): self._on_join(event, event["user"].nickname) - def self_join(self, event): self._on_join(event, event["server"].nickname) def _on_part(self, event, nickname): if not self.bot.args.verbose: self.print_line(event, "%s left %s%s" % (nickname, - event["channel"].name, - "" if not event[ - "reason"] else " (%s)" % - event[ - "reason"])) - + event["channel"].name, "" if not event[ + "reason"] else " (%s)" % event["reason"])) def part(self, event): self._on_part(event, event["user"].nickname) - def self_part(self, event): self._on_part(event, event["server"].nickname) @@ -106,32 +93,24 @@ class Module(object): def on_quit(self, event): if not self.bot.args.verbose: self.print_line(event, "%s quit%s" % (event["user"].nickname, - "" if not event[ - "reason"] else " (%s)" % - event[ - "reason"])) + "" if not event["reason"] else " (%s)" % event["reason"])) def _on_kick(self, event, nickname): if not self.bot.args.verbose: self.print_line(event, "%s kicked %s from %s%s" % ( event["user"].nickname, nickname, event["channel"].name, "" if not event["reason"] else " (%s)" % event["reason"])) - def kick(self, event): self._on_kick(event, event["target_user"].nickname) - def self_kick(self, event): self._on_kick(event, event["server"].nickname) def _on_topic(self, event, setter, action, topic, channel): self.print_line(event, "topic %s by %s: %s" % (action, setter, - topic), - channel=channel.name) - + topic), channel=channel.name) def on_topic(self, event): self._on_topic(event, event["user"].nickname, "changed", - event["topic"], event["channel"]) - + event["topic"], event["channel"]) def on_333(self, event): self._on_topic(event, event["setter"], "set", - event["channel"].topic, event["channel"]) + event["channel"].topic, event["channel"]) |
