EZPPFarm/pep.py
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make the irc gateway not receive the last empty line on multiline messages.

Browse Source
This commit is contained in:
goeo_ 2017-08-20 18:01:18 +03:00
parent 60fe2bc56e
commit 36d701eac1
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
constants/fokabotCommands.py
View File

@ -1032,7 +1032,7 @@ def multiplayer(fro, chan, message):
def mpSettings(): def mpSettings():
_match = glob.matches.matches[getMatchIDFromChannel(chan)] _match = glob.matches.matches[getMatchIDFromChannel(chan)]
msg = "PLAYERS IN THIS MATCH:\n" msg = "PLAYERS IN THIS MATCH:\n"
empty = None empty = True
for slot in _match.slots: for slot in _match.slots:
if slot.user is None: if slot.user is None:
continue continue
@ -1054,7 +1054,7 @@ def multiplayer(fro, chan, message):
mods=" (+ {})".format(generalUtils.readableMods(slot.mods)) if slot.mods > 0 else "" mods=" (+ {})".format(generalUtils.readableMods(slot.mods)) if slot.mods > 0 else ""
) )
if empty: if empty:
msg += "\nNobody." msg += "Nobody.\n"
return msg return msg

2
helpers/chatHelper.py
View File

@ -256,6 +256,8 @@ def sendMessage(fro = "", to = "", message = "", token = None, toIRC = True):
if glob.irc == True and toIRC == True: if glob.irc == True and toIRC == True:
messageSplitInLines = message.encode("latin-1").decode("utf-8").split("\n") messageSplitInLines = message.encode("latin-1").decode("utf-8").split("\n")
for line in messageSplitInLines: for line in messageSplitInLines:
if line == messageSplitInLines[:1] and line == "":
continue
glob.ircServer.banchoMessage(fro, to, line) glob.ircServer.banchoMessage(fro, to, line)
# Spam protection (ignore FokaBot) # Spam protection (ignore FokaBot)