sigmasternchen/MinervaBot
1
0
Fork 0
mirror of https://github.com/sigmasternchen/MinervaBot synced 2025-03-15 07:59:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

some improvements

Browse source
This commit is contained in:
overflowerror 2015-03-25 11:43:03 +01:00
parent 0f0139d954
commit 0a6c25baad
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
main.py
View file

@ -87,8 +87,8 @@ if __name__ == "__main__":
lastChangeDM = dm.id lastChangeDM = dm.id
if len(COMMAND_SOURCE_ACCOUNTS) == 0: if len(COMMAND_SOURCE_ACCOUNTS) == 0:
commandsToExecute.append([ commandsToExecute.append([
dm.GetSenderScreenName(), dm.author.screen_name,
dm.GetText() dm.text
]) ])
else: else:
for user in COMMAND_SOURCE_ACCOUNTS: for user in COMMAND_SOURCE_ACCOUNTS:
@ -101,6 +101,7 @@ if __name__ == "__main__":
log("unprivileged user @" + dm.author.screen_name + " tried to execute command (dm) \"" + dm.text.replace("\n", "\\n") + "\"") log("unprivileged user @" + dm.author.screen_name + " tried to execute command (dm) \"" + dm.text.replace("\n", "\\n") + "\"")
if not ALLOW_ONLY_DM_COMMANDS: if not ALLOW_ONLY_DM_COMMANDS:
time.sleep(3)
if lastChangeT > 0: if lastChangeT > 0:
mentions = api.mentions_timeline(since_id = lastChangeT) mentions = api.mentions_timeline(since_id = lastChangeT)
else: else:
@ -127,10 +128,11 @@ if __name__ == "__main__":
log("executing command (@" + command[0] + ") \"" + command[1].replace("\n", "\\n") + "\"") log("executing command (@" + command[0] + ") \"" + command[1].replace("\n", "\\n") + "\"")
output = Popen(command[1], shell=True, stdout=PIPE, stderr=STDOUT).stdout.read().decode("utf-8") output = Popen(command[1], shell=True, stdout=PIPE, stderr=STDOUT).stdout.read().decode("utf-8")
log("result: " + output); log("result: " + output);
if len(output + command[0]) + 2 > 140: if len(output + command[0]) + 4 > 140:
api.update_status(status = (command[0] + "Output of command is too long. I'm sry. : /")) api.update_status(status = ("@" + command[0] + "Output of command is too long. I'm sry. : /"))
else: else:
api.update_status(status = (command[0] + " " + output)) api.update_status(status = ("@" + command[0] + " " + output))
time.sleep(3)
for command in UPDATE_COMMANDS: for command in UPDATE_COMMANDS:
@ -154,7 +156,7 @@ if __name__ == "__main__":
api.update_status(status = text[:130]) api.update_status(status = text[:130])
break break
except tweepy.error.TweepError as e: except tweepy.error.TweepError as e:
log("there is a twitter error: " + e.reason) log("there is a twitter error: " + e.reason)
text = text[130:] text = text[130:]
time.sleep(3) time.sleep(3)
@ -166,8 +168,10 @@ if __name__ == "__main__":
if len(WARNING_DESTINATION_ACCOUNTS): if len(WARNING_DESTINATION_ACCOUNTS):
for username in WARNING_DESTINATION_ACCOUNTS: for username in WARNING_DESTINATION_ACCOUNTS:
api.update_status(status = (username + " WARNING: " + command + COMMAND_NAME_SEPERATOR + WARNING_COMMANDS[command][2])) api.update_status(status = (username + " WARNING: " + command + COMMAND_NAME_SEPERATOR + WARNING_COMMANDS[command][2]))
time.sleep(3)
else: else:
api.update_status(status = ("WARNING: " + command + COMMAND_NAME_SEPERATOR + WARNING_COMMANDS[command][2])) api.update_status(status = ("WARNING: " + command + COMMAND_NAME_SEPERATOR + WARNING_COMMANDS[command][2]))
time.sleep(5 * 60) time.sleep(5 * 60)
time.sleep(3)
counter += 1 counter += 1