mirrors/roar
1
Fork 0
mirror of https://github.com/lalbornoz/roar.git synced 2024-11-22 15:26:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

pngbot.py:IrcMiRCARTBot.dispatch(): ignore `!pngbot' requests from unauthorised (non-opped) nicks.

Browse Source 
pngbot.py:IrcMiRCARTBot.dispatch(): add status (stdout) messages.
pngbot.py:IrcMiRCARTBot.dispatch(): always use lower-case channel name in status (stdout) messages.
This commit is contained in:
Lucio Andrés Illanes Albornoz 2018-01-02 23:23:30 +01:00
parent 993e986ec0
commit 28e5b9b958
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pngbot.py
View File

@ -112,8 +112,8 @@ class IrcMiRCARTBot(IrcBot):
for channelNickSpec in serverMessage[5].split(" "): for channelNickSpec in serverMessage[5].split(" "):
if channelNickSpec[0] == "@" \ if channelNickSpec[0] == "@" \
and len(channelNickSpec[1:]): and len(channelNickSpec[1:]):
self.clientChannelOps.append(channelNickSpec[1:]) self.clientChannelOps.append(channelNickSpec[1:].lower())
print("Authorising {} on {}".format(channelNickSpec[1:], serverMessage[2])) print("Authorising {} on {}".format(channelNickSpec[1:].lower(), serverMessage[2].lower()))
elif serverMessage[1] == "MODE" \ elif serverMessage[1] == "MODE" \
and serverMessage[2].lower() == self.clientChannel.lower(): and serverMessage[2].lower() == self.clientChannel.lower():
channelModeType = "+"; channelModeArg = 4; channelModeType = "+"; channelModeArg = 4;
@ -132,11 +132,13 @@ class IrcMiRCARTBot(IrcBot):
channelModeArg += 1 channelModeArg += 1
if len(channelAuthAdd) \ if len(channelAuthAdd) \
and channelAuthAdd not in self.clientChannelOps: and channelAuthAdd not in self.clientChannelOps:
print("Authorising {} on {}".format(channelAuthAdd, serverMessage[2])) channelAuthAdd = channelAuthAdd.lower()
print("Authorising {} on {}".format(channelAuthAdd, serverMessage[2].lower()))
self.clientChannelOps.append(channelAuthAdd) self.clientChannelOps.append(channelAuthAdd)
elif len(channelAuthDel) \ elif len(channelAuthDel) \
and channelAuthDel in self.clientChannelOps: and channelAuthDel in self.clientChannelOps:
print("Deauthorising {} on {}".format(channelAuthDel, serverMessage[2])) channelAuthDel = channelAuthDel.lower()
print("Deauthorising {} on {}".format(channelAuthDel, serverMessage[2].lower()))
self.clientChannelOps.remove(channelAuthDel) self.clientChannelOps.remove(channelAuthDel)
elif serverMessage[1] == "PING": elif serverMessage[1] == "PING":
self.sendline("PONG", serverMessage[2]) self.sendline("PONG", serverMessage[2])
@ -144,8 +146,13 @@ class IrcMiRCARTBot(IrcBot):
and serverMessage[2].lower() == self.clientChannel.lower() \ and serverMessage[2].lower() == self.clientChannel.lower() \
and serverMessage[3].startswith("!pngbot "): and serverMessage[3].startswith("!pngbot "):
if (int(time.time()) - self.clientLastMessage) < 45: if (int(time.time()) - self.clientLastMessage) < 45:
print("Ignoring request on {} from {} due to rate limit: {}".format(serverMessage[2].lower(), serverMessage[0], serverMessage[3]))
continue
elif serverMessage[0].split("!")[0].lower() not in self.clientChannelOps:
print("Ignoring request on {} from {} due to lack of authorisation: {}".format(serverMessage[2].lower(), serverMessage[0], serverMessage[3]))
continue continue
else: else:
print("Processing request on {} from {}: {}".format(serverMessage[2].lower(), serverMessage[0], serverMessage[3]))
self.clientLastMessage = int(time.time()) self.clientLastMessage = int(time.time())
asciiUrl = serverMessage[3].split(" ")[1] asciiUrl = serverMessage[3].split(" ")[1]
asciiTmpFilePath = "tmp.txt"; imgTmpFilePath = "tmp.png"; asciiTmpFilePath = "tmp.txt"; imgTmpFilePath = "tmp.png";
@ -157,8 +164,10 @@ class IrcMiRCARTBot(IrcBot):
_MiRCART = mirc2png.MiRCART(asciiTmpFilePath, imgTmpFilePath, "DejaVuSansMono.ttf", 11) _MiRCART = mirc2png.MiRCART(asciiTmpFilePath, imgTmpFilePath, "DejaVuSansMono.ttf", 11)
imgurResponse = self.uploadToImgur(imgTmpFilePath, "MiRCART image", "MiRCART image", "c9a6efb3d7932fd") imgurResponse = self.uploadToImgur(imgTmpFilePath, "MiRCART image", "MiRCART image", "c9a6efb3d7932fd")
if imgurResponse[0] == 200: if imgurResponse[0] == 200:
print("Uploaded as: {}".format(imgurResponse[1]))
self.sendline("PRIVMSG", serverMessage[2], "8/!\\ Uploaded as: {}".format(imgurResponse[1])) self.sendline("PRIVMSG", serverMessage[2], "8/!\\ Uploaded as: {}".format(imgurResponse[1]))
else: else:
print("Upload failed with HTTP status code {}".format(imgurResponse[0]))
self.sendline("PRIVMSG", serverMessage[2], "4/!\\ Uploaded failed with HTTP status code {}!".format(imgurResponse[0])) self.sendline("PRIVMSG", serverMessage[2], "4/!\\ Uploaded failed with HTTP status code {}!".format(imgurResponse[0]))
if os.path.isfile(asciiTmpFilePath): if os.path.isfile(asciiTmpFilePath):
os.remove(asciiTmpFilePath) os.remove(asciiTmpFilePath)