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

pass from_self arg in formatted.* message events

Browse source
This commit is contained in:
jesopo 2019-06-21 10:32:07 +01:00
parent afa6b86c41
commit 66393bcdbc
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
modules/format_activity.py
View file

@ -3,10 +3,10 @@ from src import EventManager, ModuleManager, utils
class Module(ModuleManager.BaseModule): class Module(ModuleManager.BaseModule):
def _event(self, type, server, line, context, minimal=None, def _event(self, type, server, line, context, minimal=None,
channel=None, user=None): channel=None, user=None, **kwargs):
self.events.on("formatted").on(type).call(server=server, self.events.on("formatted").on(type).call(server=server,
context=context, line=line, channel=channel, user=user, context=context, line=line, channel=channel, user=user,
minimal=minimal) minimal=minimal, **kwargs)
def _mode_symbols(self, user, channel, server): def _mode_symbols(self, user, channel, server):
modes = channel.get_user_status(user) modes = channel.get_user_status(user)
@ -41,17 +41,20 @@ class Module(ModuleManager.BaseModule):
line = self._privmsg(event, event["channel"], user, nickname) line = self._privmsg(event, event["channel"], user, nickname)
self._event("message.channel", event["server"], line, self._event("message.channel", event["server"], line,
event["channel"].name, channel=event["channel"], user=user) event["channel"].name, channel=event["channel"], user=user,
from_self=event["from_self"])
def _on_notice(self, event, sender): def _on_notice(self, event, sender):
return "(notice) <%s> %s" % (sender, event["message"]) return "(notice) <%s> %s" % (sender, event["message"])
def _channel_notice(self, event, sender, channel): def _channel_notice(self, event, sender, channel):
line = self._on_notice(event, sender) line = self._on_notice(event, sender)
self._event("notice.channel", event["server"], line, self._event("notice.channel", event["server"], line,
event["channel"].name) event["channel"].name, from_self=event["from_self"])
def _private_notice(self, event, sender, target): def _private_notice(self, event, sender, target):
line = self._on_notice(event, sender) line = self._on_notice(event, sender)
self._event("notice.private", event["server"], line, None) self._event("notice.private", event["server"], line, None,
from_self=event["from_self"])
@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):

2
modules/relay.py
View file

@ -5,7 +5,7 @@ class Module(ModuleManager.BaseModule):
return channel.get_setting("channel-relays", []) return channel.get_setting("channel-relays", [])
def _relay(self, event, channel): def _relay(self, event, channel):
if event["from_self"]: if "from_self" in event and event["from_self"]:
return return
relays = self._get_relays(channel) relays = self._get_relays(channel)