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

refactor formatting privmsg/notice, show symbols on notice

Browse source
This commit is contained in:
jesopo 2019-11-15 15:00:46 +00:00
parent 5d55086847
commit 982f3b4912
1 changed files with 26 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
modules/format_activity.py
View file

@ -19,7 +19,7 @@ class Module(ModuleManager.BaseModule):
return server.prefix_modes[modes[0]] return server.prefix_modes[modes[0]]
return "" return ""
def _privmsg(self, event, channel, user, nickname): def _privmsg(self, event, channel, user):
symbols = "" symbols = ""
if channel: if channel:
symbols = self._mode_symbols(user, channel, event["server"]) symbols = self._mode_symbols(user, channel, event["server"])
@ -29,9 +29,9 @@ class Module(ModuleManager.BaseModule):
else: else:
format = "<%s%s> %s" format = "<%s%s> %s"
minimal = format % ("", nickname, event["message"]) minimal = format % ("", user.nickname, event["message"])
normal = format % (symbols, nickname, event["message"]) normal = format % (symbols, user.nickname, event["message"])
pretty = format % (symbols, self._color(nickname), pretty = format % (symbols, self._color(user.nickname),
event["message"]) event["message"])
return minimal, normal, pretty return minimal, normal, pretty
@ -39,55 +39,46 @@ class Module(ModuleManager.BaseModule):
@utils.hook("send.message.channel") @utils.hook("send.message.channel")
@utils.hook("received.message.channel") @utils.hook("received.message.channel")
def channel_message(self, event): def channel_message(self, event):
nickname = None minimal, normal, pretty = self._privmsg(event, event["channel"],
user = None event["user"])
if "user" in event and event["user"]:
user = event["user"]
nickname = event["user"].nickname
else:
nickname = event["server"].nickname
user = event["server"].get_user(nickname)
minimal, normal, pretty = self._privmsg(event, event["channel"], user,
nickname)
self._event("message.channel", event["server"], normal, self._event("message.channel", event["server"], normal,
event["channel"].name, channel=event["channel"], user=user, event["channel"].name, channel=event["channel"], user=event["user"],
parsed_line=event["line"], minimal=minimal, pretty=pretty) parsed_line=event["line"], minimal=minimal, pretty=pretty)
def _on_notice(self, event, nickname): def _on_notice(self, event, user, channel):
format = "-%s- %s" symbols = ""
minimal = format % (nickname, event["message"]) if channel:
normal = minimal symbols = self._mode_symbols(user, channel, event["server"])
pretty = format % (self._color(nickname), event["message"])
format = "-%s%s- %s"
minimal = format % ("", user.nickname, event["message"])
normal = format % (symbols, user.nickname, event["message"])
pretty = format % (symbols, self._color(user.nickname),
event["message"])
return minimal, normal, pretty return minimal, normal, pretty
def _channel_notice(self, event, nickname, channel): def _channel_notice(self, event, user, channel):
minimal, normal, pretty = self._on_notice(event, nickname) minimal, normal, pretty = self._on_notice(event, user, channel)
self._event("notice.channel", event["server"], normal, self._event("notice.channel", event["server"], normal,
event["channel"].name, parsed_line=event["line"], channel=channel, event["channel"].name, parsed_line=event["line"], channel=channel,
user=event["user"], minimal=minimal, pretty=pretty) user=event["user"], minimal=minimal, pretty=pretty)
def _private_notice(self, event, nickname, target): def _private_notice(self, event, user):
minimal, normal, pretty = self._on_notice(event, nickname) minimal, normal, pretty = self._on_notice(event, user, None)
self._event("notice.private", event["server"], normal, None, self._event("notice.private", event["server"], normal, None,
parsed_line=event["line"], user=event["user"], minimal=minimal, parsed_line=event["line"], user=event["user"], minimal=minimal,
pretty=pretty) pretty=pretty)
@utils.hook("received.notice.channel") @utils.hook("received.notice.channel")
def channel_notice(self, event):
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 channel_notice(self, event):
self._channel_notice(event, event["server"].nickname, event["channel"]) self._channel_notice(event, event["user"], event["channel"])
@utils.hook("received.notice.private") @utils.hook("received.notice.private")
def private_notice(self, event):
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 private_notice(self, event):
self._private_notice(event, event["server"].nickname, self._private_notice(event, event["user"])
event["user"].nickname)
def _on_join(self, event, user): def _on_join(self, event, user):
channel_name = event["channel"].name channel_name = event["channel"].name