1
Fork 0
mirror of https://github.com/RYGhub/royalnet.git synced 2024-11-27 13:34:28 +00:00
This commit is contained in:
Steffo 2017-02-20 11:58:30 +01:00
parent 95a85a9602
commit 935fed70c1
2 changed files with 13 additions and 5 deletions

16
bot.py
View file

@ -426,7 +426,13 @@ def diario():
def leggi(): def leggi():
# Leggi dal diario Royal Games # Leggi dal diario Royal Games
print("@" + username + ": /leggi") print("@" + username + ": /leggi")
telegram.sendmessage("[Apri il diario RYG](http://royal.steffo.me/diario.htm)!", sentin, source) if len(cmd) == 1:
telegram.sendmessage("[Apri il diario RYG](http://royal.steffo.me/diario.htm)!\n_(Puoi visualizzare un elemento casuale scrivendo /leggi random o leggere un elemento specifico con /leggi [numero])_", sentin, source)
else if cmd[1] == "random":
fdiario = filemanager.readfile("diario.txt").split("\n")
n = random.randrange(len(fdiario))
entry = fdiario[n].split("|")
telegram.sendmessage(entry[1], sentin, source)
def balurage(): def balurage():
@ -493,7 +499,7 @@ def getrygimage():
cairosvg.svg2png(bytestring=indata, write_to=outfile) cairosvg.svg2png(bytestring=indata, write_to=outfile)
outfile.close() outfile.close()
telegram.sendmessage("[Scarica](http://royal.steffo.me/rygimages/{}.png)" telegram.sendmessage("[Scarica](http://royal.steffo.me/rygimages/{}.png)"
" la tua immagine del profilo Royal Games!".format(cmd[1]), " la tua immagine del profilo Royal Games!\n_(Tanto non funziona.)_".format(cmd[1]),
sentin, source) sentin, source)
def ciaospaggia(): def ciaospaggia():
@ -531,7 +537,7 @@ def match():
if len(cmd) > 2: if len(cmd) > 2:
del cmd[0] del cmd[0]
for name in cmd: for name in cmd:
userdata = db.findbyname(name.lower()) userdata = db.findbyname(name)
if userdata is not None and 'steam' in userdata: if userdata is not None and 'steam' in userdata:
if userdata['steam'] not in tobematched: if userdata['steam'] not in tobematched:
tobematched.append(userdata['steam']) tobematched.append(userdata['steam'])
@ -559,7 +565,7 @@ def share():
if len(cmd) > 2: if len(cmd) > 2:
del cmd[0] del cmd[0]
for name in cmd: for name in cmd:
userdata = db.findbyname(name.lower()) userdata = db.findbyname(name)
if userdata is not None and 'steam' in userdata: if userdata is not None and 'steam' in userdata:
if userdata['steam'] not in tobematched: if userdata['steam'] not in tobematched:
tobematched.append(userdata['steam']) tobematched.append(userdata['steam'])
@ -676,3 +682,5 @@ while True:
"Secondo me, è colpa dello stagista.".format(repr(e)), -2141322) "Secondo me, è colpa dello stagista.".format(repr(e)), -2141322)
print("\033[1mERRORE CRITICO:\n" print("\033[1mERRORE CRITICO:\n"
"{0}\033[0m".format(repr(e))) "{0}\033[0m".format(repr(e)))
if __debug__:
raise

2
db.py
View file

@ -6,7 +6,7 @@ db = json.loads(filemanager.readfile("db.json"))
def findbyname(name: str): def findbyname(name: str):
for player in db: for player in db:
if player == name: if db[player]["telegram"]["username"] == name:
return db[player] return db[player]
else: else:
return None return None