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

private notices shouldn't be sent out as formatted.notice.channel

Browse source
This commit is contained in:
jesopo 2019-03-05 09:52:38 +00:00
parent b4f3ff3344
commit 79930be7a3
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
modules/format_activity.py
View file

@ -42,21 +42,28 @@ class Module(ModuleManager.BaseModule):
event["channel"].name) event["channel"].name)
def _on_notice(self, event, sender, target): def _on_notice(self, event, sender, target):
line = "(notice->%s) <%s> %s" % ( return "(notice->%s) <%s> %s" % (target, sender, event["message"])
target, sender, event["message"]) def _channel_notice(self, event, sender, channel):
line = self._on_notice(event, sender, channel.name)
self._event("notice.channel", event["server"], line, None) self._event("notice.channel", event["server"], line, None)
def _private_notice(self, event, sender, target):
line = self._on_notice(event, sender, target)
self._event("notice.private", event["server"], line, None)
@utils.hook("received.notice.channel", priority=EventManager.PRIORITY_HIGH) @utils.hook("received.notice.channel", priority=EventManager.PRIORITY_HIGH)
def channel_notice(self, event): def channel_notice(self, event):
self._on_notice(event, event["user"].nickname, event["channel"].name) self._channel_notice(event, event["user"].nickname, event["channel"])
@utils.hook("send.notice.channel") @utils.hook("send.notice.channel")
def self_notice_channel(self, event): def self_notice_channel(self, event):
self._on_notice(event, event["server"].nickname, event["channel"].name) self._channel_notice(event, event["server"].nickname, event["channel"])
@utils.hook("received.notice.private", priority=EventManager.PRIORITY_HIGH) @utils.hook("received.notice.private", priority=EventManager.PRIORITY_HIGH)
def private_notice(self, event): def private_notice(self, event):
self._on_notice(event, event["user"].nickname, event["server"].nickname) self._private_notice(event, event["user"].nickname,
event["server"].nickname)
@utils.hook("send.notice.private") @utils.hook("send.notice.private")
def self_private_notice(self, event): def self_private_notice(self, event):
self._on_notice(event, event["server"].nickname, event["user"].nickname) self._private_notice(event, event["server"].nickname,
event["user"].nickname)
def _on_join(self, event, nickname): def _on_join(self, event, nickname):
line = "%s joined %s" % (nickname, event["channel"].name) line = "%s joined %s" % (nickname, event["channel"].name)