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

Remove code duplication for checking if a PRIVMSG/NOTICE was sent by us

Browse source
This commit is contained in:
jesopo 2019-02-22 10:13:49 +00:00
parent 46fc552972
commit fde0838fdc
1 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
modules/line_handler.py
View file

@ -439,23 +439,29 @@ class Module(ModuleManager.BaseModule):
self._event(event, "invite", user=user, target_channel=target_channel, self._event(event, "invite", user=user, target_channel=target_channel,
server=event["server"], target_user=target_user) server=event["server"], target_user=target_user)
def _from_self(self, server, direction, prefix):
if direction == Direction.SEND:
if "echo-message" in server.agreed_capabilities:
return None
else:
return True
else:
if prefix:
return server.is_own_nickname(prefix.nickname)
else:
return False
# we've received/sent a message # we've received/sent a message
@utils.hook("raw.received.privmsg") @utils.hook("raw.received.privmsg")
@utils.hook("raw.send.privmsg") @utils.hook("raw.send.privmsg")
def privmsg(self, event): def privmsg(self, event):
if event["direction"] == Direction.SEND: from_self = self._from_self(event["server"], event["direction"],
from_self = True event.get("prefix", None))
if "echo-message" in event["server"].agreed_capabilities: if from_self == None:
return return
else:
if event["prefix"]:
from_self = event["server"].is_own_nickname(
event["prefix"].nickname)
else:
from_self = False
user = None user = None
if "prefix" in event: if "prefix" in event and not from_self:
user = event["server"].get_user(event["prefix"].nickname) user = event["server"].get_user(event["prefix"].nickname)
message = event["args"][1] message = event["args"][1]
@ -510,7 +516,7 @@ class Module(ModuleManager.BaseModule):
hook.call(user=user, **kwargs) hook.call(user=user, **kwargs)
user.buffer.add_message(user_nickname, message, action, user.buffer.add_message(user_nickname, message, action,
event["tags"], False) event["tags"], False)
elif not "prefix" in event: elif from_self:
# a message we've sent to a user # a message we've sent to a user
user = event["server"].get_user(target) user = event["server"].get_user(target)
hook.call(user=user, **kwargs) hook.call(user=user, **kwargs)
@ -521,16 +527,10 @@ class Module(ModuleManager.BaseModule):
@utils.hook("raw.received.notice") @utils.hook("raw.received.notice")
@utils.hook("raw.send.notice") @utils.hook("raw.send.notice")
def notice(self, event): def notice(self, event):
if event["direction"] == Direction.SEND: from_self = self._from_self(event["server"], event["direction"],
from_self = True event.get("prefix", None))
if "echo-message" in event["server"].agreed_capabilities: if from_self == None:
return return
else:
if event["prefix"]:
from_self = event["server"].is_own_nickname(
event["prefix"].nickname)
else:
from_self = False
message = event["args"][1] message = event["args"][1]
message_split = message.split(" ") message_split = message.split(" ")
@ -548,7 +548,7 @@ class Module(ModuleManager.BaseModule):
message_split=message_split, server=event["server"]) message_split=message_split, server=event["server"])
else: else:
user = None user = None
if "prefix" in event: if "prefix" in event and not from_self:
user = event["server"].get_user(event["prefix"].nickname) user = event["server"].get_user(event["prefix"].nickname)
channel = None channel = None
@ -574,7 +574,7 @@ class Module(ModuleManager.BaseModule):
hook.call(user=user, **kwargs) hook.call(user=user, **kwargs)
user.buffer.add_notice(user_nickname, message, event["tags"], user.buffer.add_notice(user_nickname, message, event["tags"],
False) False)
elif not "prefix" in event: elif from_self:
# a notice we've sent to a user # a notice we've sent to a user
user = event["server"].get_user(target) user = event["server"].get_user(target)
hook.call(user=user, **kwargs) hook.call(user=user, **kwargs)