Ubuntu 7 years ago
parent
commit
eee3dc031e
3 changed files with 428 additions and 5 deletions
  1. 21 2
      bot.py
  2. 406 0
      nohup.out
  3. 1 3
      pubg_lablab/objects.py

+ 21 - 2
bot.py

@@ -8,7 +8,8 @@ bg = pubg_lablab.Battlegrounds('Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJq
 def bot_query(bot, update):
     query = update.inline_query.query
     print(query)
-    allowed_users = ['Vogelstrauss', 'tsi_tsi', 'Ceelbee', 'Konfusio']
+    allowed_users = ['Vogelstrauss', 'tsi_tsi', 'Ceelbee', 'DerDeckel', 'th3fr3ddy', 'Konfusio']
+#    allowed_users = ['tsi_tsi']
     if query in allowed_users:
         squad_lifetime_stats = bg.lifetime(bg.player(query).id).squad
         out = query + " (Rounds: " + str(squad_lifetime_stats.roundsPlayed) + ")" \
@@ -41,6 +42,24 @@ def bot_query(bot, update):
             title="Ranking",
             input_message_content=InputTextMessageContent(out , parse_mode = "HTML"))
         ]
+    if query == 'rank kd':
+        toplist = {}
+        for i in allowed_users:
+            stats = bg.lifetime(bg.player(i).id).squad
+            toplist[i] = round(stats.kills/stats.losses,2)
+        toplist = sorted(toplist.items(), key=lambda kv: kv[1], reverse=True)
+        out = "Ranking (KD Ratio)\n"
+        n = 1
+        for i in toplist:
+            out += str(n) + ". " + str(i[0]) + " - " + str(i[1]) + '\n'
+            n = n + 1
+        options = [
+            InlineQueryResultArticle(
+            id=uuid4(),
+            title="Ranking",
+            input_message_content=InputTextMessageContent(out , parse_mode = "HTML"))
+        ]
+
 
     update.inline_query.answer(options, cache_time=0)
 
@@ -48,6 +67,6 @@ def bot_query(bot, update):
 updater = Updater(token='627697353:AAEuYCZSPfMg9ll0D0Gf3QhA9G21wJh97Wk')
 dispatcher = updater.dispatcher
 dispatcher.add_handler(InlineQueryHandler(bot_query))
-updater.start_polling(clean=True)
+updater.start_polling(clean=False)
 print ("Running")
 updater.idle()

+ 406 - 0
nohup.out

@@ -0,0 +1,406 @@
+Running
+
+Vogelstrauss
+[<telegram.inline.inlinequeryresultarticle.InlineQueryResultArticle object at 0x7f3e82f26f60>]
+Vogelstrauss
+looked up player id from cache
+[<telegram.inline.inlinequeryresultarticle.InlineQueryResultArticle object at 0x7f3e82f31128>]
+
+Vogelstrauss
+looked up player id from cache
+[<telegram.inline.inlinequeryresultarticle.InlineQueryResultArticle object at 0x7f3e82f26588>]
+
+Vogelstrauss
+looked up player id from cache
+[<telegram.inline.inlinequeryresultarticle.InlineQueryResultArticle object at 0x7f3e82f26048>]
+
+tsi_tsi
+[<telegram.inline.inlinequeryresultarticle.InlineQueryResultArticle object at 0x7f3e82e58c50>]
+
+Ceelbee
+[<telegram.inline.inlinequeryresultarticle.InlineQueryResultArticle object at 0x7f3e82f26668>]
+
+tsi
+tsi_tsi
+looked up player id from cache
+[<telegram.inline.inlinequeryresultarticle.InlineQueryResultArticle object at 0x7f3e82e58e10>]
+
+
+tsi
+Tsi_tsi
+Tsi_tsi
+
+tsi
+tsi_
+tsi_tsi
+looked up player id from cache
+[<telegram.inline.inlinequeryresultarticle.InlineQueryResultArticle object at 0x7f3e82b88ef0>]
+
+
+rank
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+
+rank
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+
+rank
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+
+rank
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+
+rank
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+
+rank
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+
+rank
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+
+rank
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+
+rank
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+
+Ceelbee
+looked up player id from cache
+[<telegram.inline.inlinequeryresultarticle.InlineQueryResultArticle object at 0x7f3e82b8d940>]
+
+tsi_tsi
+looked up player id from cache
+[<telegram.inline.inlinequeryresultarticle.InlineQueryResultArticle object at 0x7f3e82b88fd0>]
+
+Vogelstrauss
+looked up player id from cache
+[<telegram.inline.inlinequeryresultarticle.InlineQueryResultArticle object at 0x7f3e82b8d7f0>]
+
+rank
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+
+tsi
+Tsi_tsi
+Tsi_tsi
+si_tsi
+tsi_tsi
+looked up player id from cache
+[<telegram.inline.inlinequeryresultarticle.InlineQueryResultArticle object at 0x7f3e82e58048>]
+rank
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+
+rank
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+
+rank
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+
+Ceelbee
+looked up player id from cache
+[<telegram.inline.inlinequeryresultarticle.InlineQueryResultArticle object at 0x7f3e82e63e80>]
+
+tsi
+Tsi_tsi
+
+tsi
+tsi_
+tsi_tsi
+looked up player id from cache
+[<telegram.inline.inlinequeryresultarticle.InlineQueryResultArticle object at 0x7f3e85626cc0>]
+
+Vogelstrauss
+looked up player id from cache
+[<telegram.inline.inlinequeryresultarticle.InlineQueryResultArticle object at 0x7f3e82f08d68>]
+
+rank
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+rank
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+rank
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+
+Ce
+Ceelbee
+looked up player id from cache
+[<telegram.inline.inlinequeryresultarticle.InlineQueryResultArticle object at 0x7f3e82f31550>]
+
+tsi_tsi
+looked up player id from cache
+[<telegram.inline.inlinequeryresultarticle.InlineQueryResultArticle object at 0x7f3e82ba2e48>]
+
+rank
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+
+rank
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+
+rank
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+
+Vogelstrauss
+looked up player id from cache
+[<telegram.inline.inlinequeryresultarticle.InlineQueryResultArticle object at 0x7f3e82e5a860>]
+
+ra
+rank
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+
+ramk
+rank
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+
+
+
+rank
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+
+Vogelstrauss
+looked up player id from cache
+[<telegram.inline.inlinequeryresultarticle.InlineQueryResultArticle object at 0x7f3e82e48b38>]
+
+tsi_tsi
+looked up player id from cache
+[<telegram.inline.inlinequeryresultarticle.InlineQueryResultArticle object at 0x7f3e82ba7278>]
+rank
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+
+rank
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+rank
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+
+tsi_tsi
+looked up player id from cache
+[<telegram.inline.inlinequeryresultarticle.InlineQueryResultArticle object at 0x7f3e82e5a320>]
+
+rank
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+Traceback (most recent call last):
+  File "bot.py", line 1, in <module>
+    import pubg_lablab
+  File "/home/ubuntu/workspace/pubg_lablab/pubg_lablab/__init__.py", line 1, in <module>
+    from .core import Battlegrounds
+  File "/home/ubuntu/workspace/pubg_lablab/pubg_lablab/core.py", line 3, in <module>
+    import requests
+ModuleNotFoundError: No module named 'requests'
+Traceback (most recent call last):
+  File "bot.py", line 1, in <module>
+    import pubg_lablab
+  File "/home/ubuntu/workspace/pubg_lablab/pubg_lablab/__init__.py", line 1, in <module>
+    from .core import Battlegrounds
+  File "/home/ubuntu/workspace/pubg_lablab/pubg_lablab/core.py", line 3, in <module>
+    import requests
+ModuleNotFoundError: No module named 'requests'
+Running
+
+DerDeckel
+[<telegram.inline.inlinequeryresultarticle.InlineQueryResultArticle object at 0x7fdc235c4a20>]
+
+Cee
+Ceelbee
+[<telegram.inline.inlinequeryresultarticle.InlineQueryResultArticle object at 0x7fdc20740b70>]
+
+tsi
+tsi_tsi
+[<telegram.inline.inlinequeryresultarticle.InlineQueryResultArticle object at 0x7fdc20760198>]
+
+Vogelstrau
+Vogelstrauss
+[<telegram.inline.inlinequeryresultarticle.InlineQueryResultArticle object at 0x7fdc207606d8>]
+
+
+t
+th3f
+th3f3
+
+th3fr3ddy
+tsi_tsi
+looked up player id from cache
+[<telegram.inline.inlinequeryresultarticle.InlineQueryResultArticle object at 0x7fdc266ee5c0>]
+th3fr3ddy
+
+
+th3fr3ddy
+
+th3fr3ddy
+
+
+rank
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+Traceback (most recent call last):
+  File "bot.py", line 1, in <module>
+    import pubg_lablab
+  File "/home/ubuntu/workspace/pubg_lablab/pubg_lablab/__init__.py", line 1, in <module>
+    from .core import Battlegrounds
+  File "/home/ubuntu/workspace/pubg_lablab/pubg_lablab/core.py", line 3, in <module>
+    import requests
+ModuleNotFoundError: No module named 'requests'
+  File "bot.py", line 44
+    if query == 'rank kd'
+                        ^
+SyntaxError: invalid syntax
+Running
+
+t
+th3fr3ddy
+[<telegram.inline.inlinequeryresultarticle.InlineQueryResultArticle object at 0x7f08e58cdfd0>]
+
+rank
+rank
+looked up player id from cache
+
+rank
+looked up player id from cache
+
+tsi_tsi
+looked up player id from cache
+tsi_tsi
+looked up player id from cache
+[<telegram.inline.inlinequeryresultarticle.InlineQueryResultArticle object at 0x7f08e407e160>]
+tsi_tsi
+looked up player id from cache
+[<telegram.inline.inlinequeryresultarticle.InlineQueryResultArticle object at 0x7f08e409be10>]
+rank
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+
+rank
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+
+rank
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+
+rank
+looked up player id from cache
+
+
+tsi_tsi
+looked up player id from cache
+
+rank
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+
+tsi_tsi
+looked up player id from cache
+[<telegram.inline.inlinequeryresultarticle.InlineQueryResultArticle object at 0x7f08e4029cc0>]
+
+tsi_tsi
+looked up player id from cache
+[<telegram.inline.inlinequeryresultarticle.InlineQueryResultArticle object at 0x7f08e4048208>]
+
+rank
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+
+DerDeckel
+looked up player id from cache
+[<telegram.inline.inlinequeryresultarticle.InlineQueryResultArticle object at 0x7f08e408d668>]
+
+rank
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache
+looked up player id from cache

+ 1 - 3
pubg_lablab/objects.py

@@ -17,15 +17,13 @@ class Lifetime(Base):
             self.roadKills = self.data.get('roadKills')
             self.longestKill = self.data.get('longestKill')
             self.timeSurvived = self.data.get('timeSurvived')
+            self.losses = self.data.get('losses')
 
     def __init__(self, data):
         super().__init__(data)
         self.duo = Lifetime.GameModeStats(self.data.get('data').get('attributes').get('gameModeStats').get('duo'))
         self.duofpp = Lifetime.GameModeStats(self.data.get('data').get('attributes').get('gameModeStats').get('duo-fpp'))
         self.squad = Lifetime.GameModeStats(self.data.get('data').get('attributes').get('gameModeStats').get('squad'))
-        self.type = self.data.get('data').get('type')
-        self.assists = self.data.get('data').get('assists')
-        self.boosts = self.data.get('boosts')
 
 
 class Player(Base):