aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar jesopo2019-03-08 17:20:57 +0000
committerGravatar jesopo2019-03-08 17:20:57 +0000
commit5165e532644b7d108b62fa47329b687f9cd3392b (patch)
tree102e3a8a9645c6a3f04a4bd80bbfe2a76eff7513
parentOnly log exception message, not full stacktrace, when a connect fails (diff)
signature
Fix local variable overwrite for `reason` in formatted.quit logic
-rw-r--r--modules/format_activity.py9
1 files changed, 3 insertions, 6 deletions
diff --git a/modules/format_activity.py b/modules/format_activity.py
index 07c6e4d7..a3f0e2cd 100644
--- a/modules/format_activity.py
+++ b/modules/format_activity.py
@@ -77,9 +77,8 @@ class Module(ModuleManager.BaseModule):
self._on_join(event, event["server"].get_user(event["server"].nickname))
def _on_part(self, event, user):
- reason = ""
- if event["reason"]:
- reason = " (%s)" % event["reason"]
+ reason = event["reason"]
+ reason = reason if not reason else " (%s)" % reason
line = "- %s left %s%s" % (user.nickname, event["channel"].name, reason)
self._event("part", event["server"], line, event["channel"].name,
channel=event["channel"], user=user)
@@ -159,9 +158,7 @@ class Module(ModuleManager.BaseModule):
self._on_kick(event, event["server"].nickname)
def _quit(self, event, user, reason):
- reason = ""
- if reason:
- reason = " (%s)" % reason
+ reason = reason if not reason else " (%s)" % reason
line = "- %s quit%s" % (user.nickname, reason)
self._event("quit", event["server"], line, None, user=user)
@utils.hook("received.quit")