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

Cache ParsedLine IDs of relay messages so we can ignore them (avoid loop)

Browse source
This commit is contained in:
jesopo 2019-06-21 20:21:31 +01:00
parent 0a302dfd21
commit 8671cb3708
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
modules/relay.py
View file

@ -1,11 +1,17 @@
from src import ModuleManager, utils
class Module(ModuleManager.BaseModule):
@utils.hook("new.server")
def new_server(self, event):
event["server"]._relay_ignore = []
def _get_relays(self, channel):
return channel.get_setting("channel-relays", [])
def _relay(self, event, channel):
if "from_self" in event and event["from_self"]:
if ("parsed_line" in event and
event["parsed_line"].id in event["server"]._relay_ignore):
event["server"]._relay_ignore.remove(event["parsed_line"].id)
return
relays = self._get_relays(channel)
@ -28,7 +34,11 @@ class Module(ModuleManager.BaseModule):
relay_message = "[relay/%s%s] %s" % (str(event["server"]),
relay_prefix_channel, event["line"])
other_channel.send_message(relay_message)
message = utils.irc.protocol.privmsg(other_channel.name,
relay_message)
server._relay_ignore.append(message.id)
server.send(message)
def _has_relay_for(self, channel, server_id, channel_name):
relays = self._get_relays(channel)