From 676a61e9de62e1fa9b232e4b95a744b0c33fee97 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Mon, 16 Nov 2015 23:13:56 +0100 Subject: [PATCH] asdfd --- bot.py | 14 +++++++------- osu.py | 3 ++- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/bot.py b/bot.py index 7218319f..431c7243 100644 --- a/bot.py +++ b/bot.py @@ -69,14 +69,14 @@ while True: r = osu.getuserrecent(cmd[1], cmd[2]) else: r = osu.getuserrecent(cmd[1]) - link = "https://osu.ppy.sh/s/" + r['beatmap_id'] - telegram.sendmessage("[Beatmap](" + link + ")\n*" + + link = "https://osu.ppy.sh/b/" + r['beatmap_id'] + telegram.sendmessage("[Beatmap " + r['beatmap_id'] + "](" + link + ")\n*" + r['rank'] + "*: " + r['score'] + "\n" + - "Combo x" + r['max_combo'] + "\n" + - "300: " + r['count300'] + "\n" + - "100: " + r['count100'] + "\n" + - "50: " + r['count50'] + "\n" + - "Miss: " + r['countmiss'], sby) + "*Combo* x" + r['maxcombo'] + "\n" + + "*300*: " + r['count300'] + "\n" + + "*100*: " + r['count100'] + "\n" + + "*50*: " + r['count50'] + "\n" + + "*Miss*: " + r['countmiss'], sby) else: # In futuro, il nome utente deve trovarlo da solo in base all'username di provenienza. telegram.sendmessage(chr(9888) + " Non hai specificato un nome utente!", sby) diff --git a/osu.py b/osu.py index 7624bfb1..8df39920 100644 --- a/osu.py +++ b/osu.py @@ -74,4 +74,5 @@ def getuserrecent(user, mode=0): 'm': mode, } r = requests.get("https://osu.ppy.sh/api/get_user_recent", params=parametri).json() - return r[0] + if len(r) >= 1: + return r[0]