MrDetonia/Maki
1
0
Fork 0
mirror of https://github.com/MrDetonia/Maki.git synced 2024-11-22 03:44:18 -05:00
Code Issues Releases Wiki Activity

v0.17.3 history is now per-server

Browse Source
This commit is contained in:
Zac Herd 2016-12-01 20:30:50 +00:00
parent 340a3822dd
commit 55e7b9e51b
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bot.py
View File

@ -32,7 +32,7 @@ from secret import token, lfmkey
# CONFIGURATION # CONFIGURATION
# bot version # bot version
version = "v0.17.2" version = "v0.17.3"
# text shown by .help command # text shown by .help command
helptext = """I am a Discord bot written in Python helptext = """I am a Discord bot written in Python
@ -200,14 +200,14 @@ def on_message(message):
elif message.content.startswith('.seen '): elif message.content.startswith('.seen '):
# print when user was last seen # print when user was last seen
try: try:
target = message.server.get_member_named(message.content[6:]).id target = message.server.id + message.server.get_member_named(message.content[6:]).id
except AttributeError: except AttributeError:
response = "user not seen yet" response = "I can't find that user!"
target = "" target = ""
if target in history: if target in history and history[target][0] == message.server.id:
# user logged, print last message and time # user logged, print last message and time
response = 'user ' + message.content[6:] + ' was last seen saying "' + history[target][0] + '" at ' + strfromdt(dtfromts(history[target][1])) response = 'user ' + message.content[6:] + ' was last seen saying "' + history[target][2] + '" at ' + strfromdt(dtfromts(history[target][1]))
elif message.content[6:] == 'Maki': elif message.content[6:] == 'Maki':
# Maki doesn't need to be .seen # Maki doesn't need to be .seen
response = 'I\'m right here!' response = 'I\'m right here!'
@ -285,6 +285,7 @@ def on_message(message):
response = 'you did it wrong!' response = 'you did it wrong!'
elif message.content.startswith('.np'): elif message.content.startswith('.np'):
# show now playing info from last.fm
tmp = message.content[4:] tmp = message.content[4:]
if tmp == '': if tmp == '':
@ -335,7 +336,7 @@ def on_message(message):
else: else:
# log each message against users # log each message against users
if message.content != "": if message.content != "":
history[message.author.id] = (message.content, time.time()) history[message.server.id + message.author.id] = (message.server.id, time.time(), message.content)
with open('hist.json', 'w') as fp: with open('hist.json', 'w') as fp:
json.dump(history, fp) json.dump(history, fp)