From 49c1fcbbdf5a6b944326dcadd46abab6ba03f25a Mon Sep 17 00:00:00 2001
From: Stefano Pigozzi <ste.pigozzi@gmail.com>
Date: Mon, 19 Dec 2016 19:56:37 +0100
Subject: [PATCH] updated opendota module

---
 herolist.json | 562 ++++++++++++++++++++++++++++++++++++++++++++++++++
 main.py       |  50 +++--
 opendota.py   |   9 +
 strings.py    |   8 +-
 4 files changed, 613 insertions(+), 16 deletions(-)
 create mode 100644 herolist.json

diff --git a/herolist.json b/herolist.json
new file mode 100644
index 00000000..4ca0d2d3
--- /dev/null
+++ b/herolist.json
@@ -0,0 +1,562 @@
+[
+        {
+            "name": "antimage",
+            "id": 1,
+            "localized_name": "Anti-Mage"
+        },
+        {
+            "name": "axe",
+            "id": 2,
+            "localized_name": "Axe"
+        },
+        {
+            "name": "bane",
+            "id": 3,
+            "localized_name": "Bane"
+        },
+        {
+            "name": "bloodseeker",
+            "id": 4,
+            "localized_name": "Bloodseeker"
+        },
+        {
+            "name": "crystal_maiden",
+            "id": 5,
+            "localized_name": "Crystal Maiden"
+        },
+        {
+            "name": "drow_ranger",
+            "id": 6,
+            "localized_name": "Drow Ranger"
+        },
+        {
+            "name": "earthshaker",
+            "id": 7,
+            "localized_name": "Earthshaker"
+        },
+        {
+            "name": "juggernaut",
+            "id": 8,
+            "localized_name": "Juggernaut"
+        },
+        {
+            "name": "mirana",
+            "id": 9,
+            "localized_name": "Mirana"
+        },
+        {
+            "name": "nevermore",
+            "id": 11,
+            "localized_name": "Shadow Fiend"
+        },
+        {
+            "name": "morphling",
+            "id": 10,
+            "localized_name": "Morphling"
+        },
+        {
+            "name": "phantom_lancer",
+            "id": 12,
+            "localized_name": "Phantom Lancer"
+        },
+        {
+            "name": "puck",
+            "id": 13,
+            "localized_name": "Puck"
+        },
+        {
+            "name": "pudge",
+            "id": 14,
+            "localized_name": "Pudge"
+        },
+        {
+            "name": "razor",
+            "id": 15,
+            "localized_name": "Razor"
+        },
+        {
+            "name": "sand_king",
+            "id": 16,
+            "localized_name": "Sand King"
+        },
+        {
+            "name": "storm_spirit",
+            "id": 17,
+            "localized_name": "Storm Spirit"
+        },
+        {
+            "name": "sven",
+            "id": 18,
+            "localized_name": "Sven"
+        },
+        {
+            "name": "tiny",
+            "id": 19,
+            "localized_name": "Tiny"
+        },
+        {
+            "name": "vengefulspirit",
+            "id": 20,
+            "localized_name": "Vengeful Spirit"
+        },
+        {
+            "name": "windrunner",
+            "id": 21,
+            "localized_name": "Windranger"
+        },
+        {
+            "name": "zuus",
+            "id": 22,
+            "localized_name": "Zeus"
+        },
+        {
+            "name": "kunkka",
+            "id": 23,
+            "localized_name": "Kunkka"
+        },
+        {
+            "name": "lina",
+            "id": 25,
+            "localized_name": "Lina"
+        },
+        {
+            "name": "lich",
+            "id": 31,
+            "localized_name": "Lich"
+        },
+        {
+            "name": "lion",
+            "id": 26,
+            "localized_name": "Lion"
+        },
+        {
+            "name": "shadow_shaman",
+            "id": 27,
+            "localized_name": "Shadow Shaman"
+        },
+        {
+            "name": "slardar",
+            "id": 28,
+            "localized_name": "Slardar"
+        },
+        {
+            "name": "tidehunter",
+            "id": 29,
+            "localized_name": "Tidehunter"
+        },
+        {
+            "name": "witch_doctor",
+            "id": 30,
+            "localized_name": "Witch Doctor"
+        },
+        {
+            "name": "riki",
+            "id": 32,
+            "localized_name": "Riki"
+        },
+        {
+            "name": "enigma",
+            "id": 33,
+            "localized_name": "Enigma"
+        },
+        {
+            "name": "tinker",
+            "id": 34,
+            "localized_name": "Tinker"
+        },
+        {
+            "name": "sniper",
+            "id": 35,
+            "localized_name": "Sniper"
+        },
+        {
+            "name": "necrolyte",
+            "id": 36,
+            "localized_name": "Necrophos"
+        },
+        {
+            "name": "warlock",
+            "id": 37,
+            "localized_name": "Warlock"
+        },
+        {
+            "name": "beastmaster",
+            "id": 38,
+            "localized_name": "Beastmaster"
+        },
+        {
+            "name": "queenofpain",
+            "id": 39,
+            "localized_name": "Queen of Pain"
+        },
+        {
+            "name": "venomancer",
+            "id": 40,
+            "localized_name": "Venomancer"
+        },
+        {
+            "name": "faceless_void",
+            "id": 41,
+            "localized_name": "Faceless Void"
+        },
+        {
+            "name": "skeleton_king",
+            "id": 42,
+            "localized_name": "Skeleton King"
+        },
+        {
+            "name": "death_prophet",
+            "id": 43,
+            "localized_name": "Death Prophet"
+        },
+        {
+            "name": "phantom_assassin",
+            "id": 44,
+            "localized_name": "Phantom Assassin"
+        },
+        {
+            "name": "pugna",
+            "id": 45,
+            "localized_name": "Pugna"
+        },
+        {
+            "name": "templar_assassin",
+            "id": 46,
+            "localized_name": "Templar Assassin"
+        },
+        {
+            "name": "viper",
+            "id": 47,
+            "localized_name": "Viper"
+        },
+        {
+            "name": "luna",
+            "id": 48,
+            "localized_name": "Luna"
+        },
+        {
+            "name": "dragon_knight",
+            "id": 49,
+            "localized_name": "Dragon Knight"
+        },
+        {
+            "name": "dazzle",
+            "id": 50,
+            "localized_name": "Dazzle"
+        },
+        {
+            "name": "rattletrap",
+            "id": 51,
+            "localized_name": "Clockwerk"
+        },
+        {
+            "name": "leshrac",
+            "id": 52,
+            "localized_name": "Leshrac"
+        },
+        {
+            "name": "furion",
+            "id": 53,
+            "localized_name": "Nature's Prophet"
+        },
+        {
+            "name": "life_stealer",
+            "id": 54,
+            "localized_name": "Lifestealer"
+        },
+        {
+            "name": "dark_seer",
+            "id": 55,
+            "localized_name": "Dark Seer"
+        },
+        {
+            "name": "clinkz",
+            "id": 56,
+            "localized_name": "Clinkz"
+        },
+        {
+            "name": "omniknight",
+            "id": 57,
+            "localized_name": "Omniknight"
+        },
+        {
+            "name": "enchantress",
+            "id": 58,
+            "localized_name": "Enchantress"
+        },
+        {
+            "name": "huskar",
+            "id": 59,
+            "localized_name": "Huskar"
+        },
+        {
+            "name": "night_stalker",
+            "id": 60,
+            "localized_name": "Night Stalker"
+        },
+        {
+            "name": "broodmother",
+            "id": 61,
+            "localized_name": "Broodmother"
+        },
+        {
+            "name": "bounty_hunter",
+            "id": 62,
+            "localized_name": "Bounty Hunter"
+        },
+        {
+            "name": "weaver",
+            "id": 63,
+            "localized_name": "Weaver"
+        },
+        {
+            "name": "jakiro",
+            "id": 64,
+            "localized_name": "Jakiro"
+        },
+        {
+            "name": "batrider",
+            "id": 65,
+            "localized_name": "Batrider"
+        },
+        {
+            "name": "chen",
+            "id": 66,
+            "localized_name": "Chen"
+        },
+        {
+            "name": "spectre",
+            "id": 67,
+            "localized_name": "Spectre"
+        },
+        {
+            "name": "doom_bringer",
+            "id": 69,
+            "localized_name": "Doom"
+        },
+        {
+            "name": "ancient_apparition",
+            "id": 68,
+            "localized_name": "Ancient Apparition"
+        },
+        {
+            "name": "ursa",
+            "id": 70,
+            "localized_name": "Ursa"
+        },
+        {
+            "name": "spirit_breaker",
+            "id": 71,
+            "localized_name": "Spirit Breaker"
+        },
+        {
+            "name": "gyrocopter",
+            "id": 72,
+            "localized_name": "Gyrocopter"
+        },
+        {
+            "name": "alchemist",
+            "id": 73,
+            "localized_name": "Alchemist"
+        },
+        {
+            "name": "invoker",
+            "id": 74,
+            "localized_name": "Invoker"
+        },
+        {
+            "name": "silencer",
+            "id": 75,
+            "localized_name": "Silencer"
+        },
+        {
+            "name": "obsidian_destroyer",
+            "id": 76,
+            "localized_name": "Outworld Devourer"
+        },
+        {
+            "name": "lycan",
+            "id": 77,
+            "localized_name": "Lycanthrope"
+        },
+        {
+            "name": "brewmaster",
+            "id": 78,
+            "localized_name": "Brewmaster"
+        },
+        {
+            "name": "shadow_demon",
+            "id": 79,
+            "localized_name": "Shadow Demon"
+        },
+        {
+            "name": "lone_druid",
+            "id": 80,
+            "localized_name": "Lone Druid"
+        },
+        {
+            "name": "chaos_knight",
+            "id": 81,
+            "localized_name": "Chaos Knight"
+        },
+        {
+            "name": "meepo",
+            "id": 82,
+            "localized_name": "Meepo"
+        },
+        {
+            "name": "treant",
+            "id": 83,
+            "localized_name": "Treant Protector"
+        },
+        {
+            "name": "ogre_magi",
+            "id": 84,
+            "localized_name": "Ogre Magi"
+        },
+        {
+            "name": "undying",
+            "id": 85,
+            "localized_name": "Undying"
+        },
+        {
+            "name": "rubick",
+            "id": 86,
+            "localized_name": "Rubick"
+        },
+        {
+            "name": "disruptor",
+            "id": 87,
+            "localized_name": "Disruptor"
+        },
+        {
+            "name": "nyx_assassin",
+            "id": 88,
+            "localized_name": "Nyx Assassin"
+        },
+        {
+            "name": "naga_siren",
+            "id": 89,
+            "localized_name": "Naga Siren"
+        },
+        {
+            "name": "keeper_of_the_light",
+            "id": 90,
+            "localized_name": "Keeper of the Light"
+        },
+        {
+            "name": "wisp",
+            "id": 91,
+            "localized_name": "Wisp"
+        },
+        {
+            "name": "visage",
+            "id": 92,
+            "localized_name": "Visage"
+        },
+        {
+            "name": "slark",
+            "id": 93,
+            "localized_name": "Slark"
+        },
+        {
+            "name": "medusa",
+            "id": 94,
+            "localized_name": "Medusa"
+        },
+        {
+            "name": "troll_warlord",
+            "id": 95,
+            "localized_name": "Troll Warlord"
+        },
+        {
+            "name": "centaur",
+            "id": 96,
+            "localized_name": "Centaur Warrunner"
+        },
+        {
+            "name": "magnataur",
+            "id": 97,
+            "localized_name": "Magnus"
+        },
+        {
+            "name": "shredder",
+            "id": 98,
+            "localized_name": "Timbersaw"
+        },
+        {
+            "name": "bristleback",
+            "id": 99,
+            "localized_name": "Bristleback"
+        },
+        {
+            "name": "tusk",
+            "id": 100,
+            "localized_name": "Tusk"
+        },
+        {
+            "name": "skywrath_mage",
+            "id": 101,
+            "localized_name": "Skywrath Mage"
+        },
+        {
+            "name": "abaddon",
+            "id": 102,
+            "localized_name": "Abaddon"
+        },
+        {
+            "name": "elder_titan",
+            "id": 103,
+            "localized_name": "Elder Titan"
+        },
+        {
+            "name": "legion_commander",
+            "id": 104,
+            "localized_name": "Legion Commander"
+        },
+        {
+            "name": "ember_spirit",
+            "id": 106,
+            "localized_name": "Ember Spirit"
+        },
+        {
+            "name": "earth_spirit",
+            "id": 107,
+            "localized_name": "Earth Spirit"
+        },
+        {
+            "name": "abyssal_underlord",
+            "id": 108,
+            "localized_name": "Abyssal Underlord"
+        },
+        {
+            "name": "terrorblade",
+            "id": 109,
+            "localized_name": "Terrorblade"
+        },
+        {
+            "name": "phoenix",
+            "id": 110,
+            "localized_name": "Phoenix"
+        },
+        {
+            "name": "techies",
+            "id": 105,
+            "localized_name": "Techies"
+        },
+        {
+            "name": "oracle",
+            "id": 111,
+            "localized_name": "Oracle"
+        },
+        {
+            "name": "winter_wyvern",
+            "id": 112,
+            "localized_name": "Winter Wyvern"
+        },
+        {
+            "name": "arc_warden",
+            "id": 113,
+            "localized_name": "Arc Warden"
+        }
+]
\ No newline at end of file
diff --git a/main.py b/main.py
index c387d974..149412ec 100644
--- a/main.py
+++ b/main.py
@@ -3,12 +3,12 @@ import discord
 import json
 
 import opendota
-import overwatch
-import league
+#import overwatch
+#import league
 import strings as s
 import telegram
 import bs4
-import brawlhalla
+#import brawlhalla
 
 loop = asyncio.get_event_loop()
 d_client = discord.Client()
@@ -250,10 +250,30 @@ async def opendota_last_match(timeout):
                         old_last = 0
                     last = r["match_id"]
                     if last > old_last:
+                        # Get player team
+                        # 0 if radiant
+                        # 1 if dire
+                        team = r["player_slot"] & 0b10000000 >> 7
+                        # Get victory status
+                        victory = (bool(team) == r["radiant_win"])
+                        # Prepare format map
+                        f = {
+                            "k": r["kills"],
+                            "d": r["deaths"],
+                            "a": r["assists"],
+                            "player": player,
+                            "result": s.won if victory else s.lost,
+                            "hero": opendota.get_hero_name(r["hero_id"])
+                        }
                         # Send a message
-                        loop.create_task(send_event(s.dota_new_match, player=player, k=r["kills"], d=r["deaths"], a=r["assists"]))
+                        loop.create_task(send_event(s.dota_new_match, **f))
                         # Update database
-                        db[player]["dota"]["lastmatch"] = last
+                        try:
+                            db[player]["dota"]["lastmatch"] = last
+                        except KeyError:
+                            db[player]["dota"] = {
+                                "lastmatch": last
+                            }
                         f = open("db.json", "w")
                         json.dump(db, f)
                         f.close()
@@ -287,20 +307,20 @@ async def send_event(eventmsg: str, player: str, **kwargs):
     # Send the message
     loop.create_task(telegram.send_message(msg, -2141322))
 
-loop.create_task(overwatch_status_change(600))
-print("[Overwatch] Added level up check to the queue.")
+#loop.create_task(overwatch_status_change(600))
+#print("[Overwatch] Added level up check to the queue.")
 
-loop.create_task(league_rank_change(900))
-print("[League] Added rank change check to the queue.")
+#loop.create_task(league_rank_change(900))
+#print("[League] Added rank change check to the queue.")
 
-loop.create_task(league_level_up(900))
-print("[League] Added level change check to the queue.")
+#loop.create_task(league_level_up(900))
+#print("[League] Added level change check to the queue.")
 
-loop.create_task(brawlhalla_update_mmr(7200))
-print("[Brawlhalla] Added mmr change check to the queue.")
+#loop.create_task(brawlhalla_update_mmr(7200))
+#print("[Brawlhalla] Added mmr change check to the queue.")
 
-#loop.create_task(opendota_last_match(600))
-#print("[OpenDota] Added last match check to the queue.")
+loop.create_task(opendota_last_match(600))
+print("[OpenDota] Added last match check to the queue.")
 
 try:
     loop.run_until_complete(d_client.start(token))
diff --git a/opendota.py b/opendota.py
index 85415126..fb58b34d 100644
--- a/opendota.py
+++ b/opendota.py
@@ -1,5 +1,6 @@
 import asyncio
 import requests
+import json
 loop = asyncio.get_event_loop()
 
 async def get_latest_match(steamidtre: str):
@@ -11,3 +12,11 @@ async def get_latest_match(steamidtre: str):
         return pj[0]
     else:
         raise Exception("OpenDota request error")
+
+def get_hero_name(heroid: int):
+    j = open("herolist.json", "r")
+    herolist = json.loads(j.read())
+    for hero in herolist:
+        if hero["id"] == heroid:
+            return hero["localized_name"]
+    return None
\ No newline at end of file
diff --git a/strings.py b/strings.py
index bc97c19b..7c084572 100644
--- a/strings.py
+++ b/strings.py
@@ -42,4 +42,10 @@ league_level_up = "{player} è salito al livello **{level}** su _League of Legen
 brawlhalla_new_mmr = "{player} è passato da {oldmmr} MMR a **{mmr}** MMR su _Brawlhalla_!"
 
 # Dota: new match
-dota_new_match = "{player} ha finito una partita a _Dota 2_ con {k}/{d}/{a}!"
\ No newline at end of file
+dota_new_match = "{player} ha **{result}** a _Dota 2_ con {k}/{d}/{a}, giocando **{hero}**!"
+
+# Win: past participle
+won = "vinto"
+
+# Lose: past participle
+lost = "perso"
\ No newline at end of file