Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-11-26 12:49:24 +01:00
Code Issues Projects Releases Wiki Activity

irclib: use a dedicated tag to detect emulated echo-messages, instead of receivedAt.

Browse Source 
Plugins implementing inFilter do not set receivedAt, so incoming messages
rewritten by inFilter would be detected as echo messages, and ignored
by most plugins.
This commit is contained in:
Valentin Lorentz 2020-11-04 11:32:09 +01:00
parent 903eceebda
commit c062787436
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/irclib.py
View File

@ -186,11 +186,11 @@ class IrcCallback(IrcCommandDispatcher, log.Firewalled):
if not self.echoMessage and not self.echo_message \ if not self.echoMessage and not self.echo_message \
and msg.command in ('PRIVMSG', 'NOTICE', 'TAGMSG') \ and msg.command in ('PRIVMSG', 'NOTICE', 'TAGMSG') \
and ('label' in msg.server_tags and ('label' in msg.server_tags
or not msg.tagged('receivedAt')): or msg.tagged('emulatedEcho')):
# This is an echo of a message we sent; and the plugin didn't # This is an echo of a message we sent; and the plugin didn't
# opt-in to receiving echos; ignoring it. # opt-in to receiving echos; ignoring it.
# `'label' in msg.server_tags` detects echos when labeled-response # `'label' in msg.server_tags` detects echos when labeled-response
# is enabled; and `not msg.tag('receivedAt')` detects simulated # is enabled; and `msg.tag('emulatedEcho')` detects simulated
# echos. As we don't enable real echo-message unless # echos. As we don't enable real echo-message unless
# labeled-response is enabled; this is an exhaustive check of echos # labeled-response is enabled; this is an exhaustive check of echos
# in all cases. # in all cases.
@ -1305,6 +1305,8 @@ class Irc(IrcCommandDispatcher, log.Firewalled):
# echo-message is not implemented by server; let's emulate it # echo-message is not implemented by server; let's emulate it
# here, just before sending it to the driver. # here, just before sending it to the driver.
assert not msg.tagged('receivedAt') assert not msg.tagged('receivedAt')
assert not msg.tagged('emulatedEcho')
msg.tag('emulatedEcho', True)
self.feedMsg(msg, tag=False) self.feedMsg(msg, tag=False)
else: else:
# I don't think we should do this. Why should it matter? If it's # I don't think we should do this. Why should it matter? If it's