PsychoticNinja/JLU5-SupyPlugins
1
0
Fork 0
mirror of https://github.com/jlu5/SupyPlugins.git synced 2025-05-05 09:50:54 -05:00
Code Issues Projects Releases Wiki Activity

RelayNext: purge -'s in nonprivmsg formatting

Browse Source 
This is inherently useless and only makes the post-formatting code more complicated than it should be.
This commit is contained in:
James Lu 2016-03-17 10:52:03 -07:00
parent f5d28c2aa1
commit e07d8c9bb3
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
RelayNext/plugin.py
View File

@ -147,7 +147,7 @@ class RelayNext(callbacks.Plugin):
newnick = msg.args[0] newnick = msg.args[0]
if color: if color:
newnick = self.simpleHash(newnick) newnick = self.simpleHash(newnick)
s = '- %s is now known as %s' % (nick, newnick) s = '%s is now known as %s' % (nick, newnick)
elif msg.command == 'PRIVMSG': elif msg.command == 'PRIVMSG':
text = msg.args[1] text = msg.args[1]
@ -174,25 +174,26 @@ class RelayNext(callbacks.Plugin):
s = '<%s> %s' % (nick, msg.args[1]) s = '<%s> %s' % (nick, msg.args[1])
elif msg.command == 'JOIN': elif msg.command == 'JOIN':
s = '- %s%s has joined %s' % (nick, userhost, channel) s = '%s%s has joined %s' % (nick, userhost, channel)
elif msg.command == 'PART': elif msg.command == 'PART':
# Part message isn't a required field and can be empty # Part message isn't a required field and can be empty
try: try:
partmsg = ' (%s)' % msg.args[1] partmsg = ' (%s)' % msg.args[1]
except: except IndexError:
partmsg = '' partmsg = ''
s = '- %s%s has left %s%s' % (nick, userhost, channel, partmsg)
s = '%s%s has left %s%s' % (nick, userhost, channel, partmsg)
elif msg.command == 'QUIT': elif msg.command == 'QUIT':
s = '- %s has quit (%s)' % (nick, msg.args[0]) s = '%s has quit (%s)' % (nick, msg.args[0])
elif msg.command == 'MODE': elif msg.command == 'MODE':
modes = ' '.join(msg.args[1:]) modes = ' '.join(msg.args[1:])
s = '- %s%s set mode %s on %s' % (nick, userhost, modes, channel) s = '%s%s set mode %s on %s' % (nick, userhost, modes, channel)
elif msg.command == 'TOPIC': elif msg.command == 'TOPIC':
s = '- %s set topic on %s to: %s' % (nick, channel, msg.args[1]) s = '%s set topic on %s to: %s' % (nick, channel, msg.args[1])
elif msg.command == 'KICK': elif msg.command == 'KICK':
kicked = msg.args[1] kicked = msg.args[1]
@ -202,12 +203,11 @@ class RelayNext(callbacks.Plugin):
kicked = self.simpleHash(kicked) kicked = self.simpleHash(kicked)
if noHighlight: if noHighlight:
kicked = '-' + kicked kicked = '-' + kicked
s = '- %s (%s) has been kicked from %s by %s (%s)' % (kicked, s = '%s (%s) has been kicked from %s by %s (%s)' % (kicked,
userhost, channel, nick, msg.args[2]) userhost, channel, nick, msg.args[2])
if s: # Add the network name and some final touch-ups if s: # Then, prepend the source network name in bold.
s = "\x02[%s]\x02 %s" % (netname, s) s = "\x02[%s]\x02 %s" % (netname, s)
s = s.replace("- -", "-", 1)
return s return s
def relay(self, irc, msg, channel=None): def relay(self, irc, msg, channel=None):