Merge pull request #4961 from PokemonGoF/dev

Dev merge to master

Dockerfile

@@ -16,22 +16,19 @@ FROM alpine
 
 ARG BUILD_REPO=PokemonGoF/PokemonGo-Bot
 ARG BUILD_BRANCH=master
-ARG TIMEZONE=Etc/UTC
 
 LABEL build_repo=$BUILD_REPO build_branch=$BUILD_BRANCH
 
 WORKDIR /usr/src/app
 VOLUME ["/usr/src/app/configs", "/usr/src/app/web"]
 
-RUN apk -U --no-cache add python py-pip \
+RUN apk -U --no-cache add python py-pip tzdata \
     && rm -rf /var/cache/apk/* \
     && find / -name '*.pyc' -o -name '*.pyo' | xargs -rn1 rm -f
 
 ADD http://pgoapi.com/pgoencrypt.tar.gz /tmp/pgoencrypt.tar.gz
 ADD https://raw.githubusercontent.com/$BUILD_REPO/$BUILD_BRANCH/requirements.txt .
-RUN apk -U --no-cache add --virtual .build-dependencies python-dev gcc make musl-dev git tzdata \
-    && cp -fa /usr/share/zoneinfo/$TIMEZONE /etc/localtime \
-    && echo $TIMEZONE > /etc/timezone \
+RUN apk -U --no-cache add --virtual .build-dependencies python-dev gcc make musl-dev git \
     && tar zxf /tmp/pgoencrypt.tar.gz -C /tmp \
     && make -C /tmp/pgoencrypt/src \
     && cp /tmp/pgoencrypt/src/libencrypt.so /usr/src/app/encrypt.so \
@@ -48,4 +45,14 @@ RUN apk -U --no-cache add --virtual .pgobot-dependencies wget ca-certificates ta
     && apk del .pgobot-dependencies \
     && rm -rf /var/cache/apk/* /tmp/pgobot-version
 
-ENTRYPOINT ["python", "pokecli.py"]
+RUN printf "#!/bin/sh\n\
+\n\
+TIMEZONE=\${TIMEZONE:-Etc/UTC}\n\
+\n\
+ln -sfn /usr/share/zoneinfo/\$TIMEZONE /etc/localtime\n\
+echo \$TIMEZONE > /etc/timezone\n\
+\n\
+python pokecli.py \$@\n" > /entrypoint.sh \
+    && chmod +x /entrypoint.sh
+
+ENTRYPOINT ["/entrypoint.sh"]

configs/config.json.example

@@ -12,7 +12,6 @@
         "config": {
           "enabled": false,
           "master": null,
-          "min_interval": 120,
           "// old syntax, still supported: alert_catch": ["all"],
           "// new syntax:": {},
           "alert_catch": {

docker-compose.yml

@@ -6,6 +6,8 @@ services:
      - ./configs:/usr/src/app/configs
      - ./data:/usr/src/app/data
      - ./web:/usr/src/app/web
+    environment:
+     - TIMEZONE=Etc/UTC
     stdin_open: true
     tty: true
   bot1-pokegoweb:

docker-compose_tor.yml

@@ -23,6 +23,8 @@ services:
      - ./configs:/usr/src/app/configs
      - ./data:/usr/src/app/data
      - ./web:/usr/src/app/web
+    environment:
+     - TIMEZONE=Etc/UTC
     stdin_open: true
     tty: true
   bot1-pokegoweb:

docs/configuration_files.md

@@ -991,7 +991,6 @@ Bot answer on command '/info' self stats.
 * `telegram_token` : bot token (getting [there](https://core.telegram.org/bots#6-botfather) - one token per bot)
 * `master` : id (without quotes) of bot owner, who will gett announces.
 * `alert_catch` : dict of rules pokemons catch.
-* `min_interval`: min interval check messages from telegram.
 
 ### Sample configuration
 [[back to top](#table-of-contents)]
@@ -1001,7 +1000,6 @@ Bot answer on command '/info' self stats.
     "config": {
         "enabled": true,
         "master": 12345678,
-        "min_interval": 120,
         "alert_catch": {
           "all": {"operator": "and", "cp": 1300, "iv": 0.95},
           "Snorlax": {"operator": "or", "cp": 900, "iv": 0.9}

map-chat/javascript/main.js

@@ -26,15 +26,34 @@ function initialiseEventBus(){
       var pLoadR2 = pLoadR.split(",");
       var olat = pLoadR2[0]
       var olong = pLoadR2[1]
-      var sessid = pLoadR2[2]
-      var ico = pLoadR2[3]
-      var expir = pLoadR2[4]
-      var pokenick = pLoadR2[5]
-      var path = "./images/p/"
-      var icon = path + "0" + ico + ".png"
-      var icostr = icon.toString();
-      displayMessageOnMap(payload, olat, olong, sessid, icostr, expir, pokenick);
-      console.debug('[CATCHABLE]', pokenick, '(' + olat + ',' + olong + ')');
+
+      var pokemon_id = parseInt(pLoadR2[2])
+      if (pokemon_id>0 && pokemon_id< 160){
+        var ico = pLoadR2[2]
+        var expir = pLoadR2[3]
+        var pokenick = pLoadR2[4]
+        var sessid = pLoadR2[2]
+        var path = "./images/p/"
+        console.log('icon is '+ico)
+        var icon = path + "0" + ico.replace(" ","") + ".png"
+        var icostr = icon.toString();
+        displayMessageOnMap(payload, olat, olong, sessid, icostr, expir, pokenick);
+        console.debug('[CATCHABLE]', pokenick, '(' + olat + ',' + olong + ')');
+      } else {
+        var pokemon_id = parseInt(pLoadR2[3])
+        if (pokemon_id>0 && pokemon_id< 160){
+          var ico = pLoadR2[3]
+          var expir = pLoadR2[4]
+          var pokenick = pLoadR2[5]
+          var sessid = pLoadR2[5]
+          var path = "./images/p/"
+          console.log('icon is '+ico)
+          var icon = path + "0" + ico.replace(" ","") + ".png"
+          var icostr = icon.toString();
+          displayMessageOnMap(payload, olat, olong, sessid, icostr, expir, pokenick);
+          console.debug('[CATCHABLE]', pokenick, '(' + olat + ',' + olong + ')');
+        }
+      }
     } else {
       console.debug(topic);
     }

pokemongo_bot/__init__.py

@@ -1251,7 +1251,7 @@ def heartbeat(self):
                               'level': badgelevel}
                     )
                     human_behaviour.action_delay(3, 10)
-                    
+
             inventory.refresh_inventory()
 
         try:
@@ -1322,7 +1322,7 @@ def _load_recent_forts(self):
                 with open(cached_forts_path) as f:
                     cached_recent_forts = json.load(f)
             except (IOError, ValueError) as e:
-                self.bot.logger.info('[x] Error while opening cached forts: %s' % e, 'red')
+                self.logger.info('[x] Error while opening cached forts: %s' % e, 'red')
                 pass
             except:
                 raise FileIOException("Unexpected error opening {}".cached_forts_path)

pokemongo_bot/cell_workers/evolve_pokemon.py

@@ -49,7 +49,7 @@ def work(self):
             filtered_list = filter(lambda x: x.name in self.evolve_list, filtered_list)
 
         if (len(self.donot_evolve_list) > 0) and self.donot_evolve_list[0] != 'none':
-            filtered_list = filter(lambda pokemon: pokemon.name not in donot_evolve_list, filtered_list)
+            filtered_list = filter(lambda pokemon: pokemon.name not in self.donot_evolve_list, filtered_list)
 
         cache = {}
         for pokemon in filtered_list:

pokemongo_bot/cell_workers/telegram_task.py

@@ -14,108 +14,12 @@ class FileIOException(Exception):
 
 class TelegramTask(BaseTask):
     SUPPORTED_TASK_API_VERSION = 1
-    update_id = None
-    tbot = None
-    min_interval = None
-    next_job = None
 
     def initialize(self):
         if not self.enabled:
             return
-        api_key = self.bot.config.telegram_token
-        if api_key is None:
-            self.emit_event(
-                'config_error',
-                formatted='api_key not defined.'
-            )
-            return
-        self.tbot = telegram.Bot(api_key)
-        self.master = self.config.get('master', None)
-        if self.master:
-            self.bot.event_manager.add_handler(TelegramHandler(self.tbot, self.master, self.config.get('alert_catch')))
-        try:
-            self.update_id = self.tbot.getUpdates()[0].update_id
-        except IndexError:
-            self.update_id = None
-        self.min_interval = self.config.get('min_interval', 120)
-        self.next_job = datetime.now() + timedelta(seconds=self.min_interval)
+        self.bot.event_manager.add_handler(TelegramHandler(self.bot, self.config))
+
     def work(self):
         if not self.enabled:
             return
-        if datetime.now() < self.next_job:
-            return
-        self.next_job = datetime.now() + timedelta(seconds=self.min_interval)
-        for update in self.tbot.getUpdates(offset=self.update_id, timeout=10):
-            self.update_id = update.update_id+1
-            if update.message:
-                self.bot.logger.info("message from {} ({}): {}".format(update.message.from_user.username, update.message.from_user.id, update.message.text))
-                if self.config.get('master', None) and self.config.get('master', None) not in [update.message.from_user.id, "@{}".format(update.message.from_user.username)]:
-                    self.emit_event(
-                        'debug',
-                        formatted="Master wrong: expecting {}, got {}({})".format(self.master, update.message.from_user.username, update.message.from_user.id))
-                    continue
-                else:
-                    if not re.match(r'^[0-9]+$', "{}".format(self.config['master'])): # master was not numeric...
-                        self.config['master'] = update.message.chat_id
-                        idx = (i for i,v in enumerate(self.bot.event_manager._handlers) if type(v) is TelegramHandler).next()
-                        self.bot.event_manager._handlers[idx] = TelegramHandler(self.tbot, self.master, self.config.get('alert_catch'))
-                if update.message.text == "/info":
-                    stats = self._get_player_stats()
-                    if stats:
-                        with self.bot.database as conn:
-                            cur = conn.cursor()
-                            cur.execute("SELECT DISTINCT COUNT(encounter_id) FROM catch_log WHERE dated >= datetime('now','-1 day')")
-                            catch_day = cur.fetchone()[0]
-                            cur.execute("SELECT DISTINCT COUNT(pokestop) FROM pokestop_log WHERE dated >= datetime('now','-1 day')")
-                            ps_day = cur.fetchone()[0]
-                            res = (
-                                "*"+self.bot.config.username+"*",
-                                "_Level:_ "+str(stats["level"]),
-                                "_XP:_ "+str(stats["experience"])+"/"+str(stats["next_level_xp"]),
-                                "_Pokemons Captured:_ "+str(stats["pokemons_captured"])+" ("+str(catch_day)+" _last 24h_)",
-                                "_Poke Stop Visits:_ "+str(stats["poke_stop_visits"])+" ("+str(ps_day)+" _last 24h_)",
-                                "_KM Walked:_ "+str(stats["km_walked"])
-                            )
-                            self.send_message(chat_id=update.message.chat_id, parse_mode='Markdown', text="\n".join(res))
-                            self.send_location(chat_id=update.message.chat_id, latitude=self.bot.api._position_lat, longitude=self.bot.api._position_lng)
-                    else:
-                        self.send_message(chat_id=update.message.chat_id, parse_mode='Markdown', text="Stats not loaded yet\n")
-                elif update.message.text == "/start" or update.message.text == "/help":
-                    res = (
-                        "Commands: ",
-                        "/info - info about bot"
-                    )
-                    self.send_message(chat_id=update.message.chat_id, parse_mode='Markdown', text="\n".join(res))
-    def send_message(self, chat_id, parse_mode, text):
-        try:
-            self.tbot.sendMessage(chat_id, parse_mode, text)
-        except telegram.error.NetworkError:
-            pass
-    def send_location(self, chat_id, latitude, longitude):
-        try:
-            self.tbot.send_location(chat_id, latitude, longitude)
-        except telegram.error.NetworkError:
-            pass
-    def _get_player_stats(self):
-        """
-        Helper method parsing the bot inventory object and returning the player stats object.
-        :return: The player stats object.
-        :rtype: dict
-        """
-        web_inventory = os.path.join(_base_dir, "web", "inventory-%s.json" % self.bot.config.username)
-
-        try:
-            with open(web_inventory, "r") as infile:
-                json_inventory = json.load(infile)
-        except ValueError as exception:
-            # Unable to read json from web inventory
-            # File may be corrupt. Create a new one.
-            self.bot.logger.info('[x] Error while opening inventory file for read: %s' % exception)
-            json_inventory = []
-        except:
-            raise FileIOException("Unexpected error reading from {}".format(web_inventory))
-
-        return next((x["inventory_item_data"]["player_stats"]
-                     for x in json_inventory
-                     if x.get("inventory_item_data", {}).get("player_stats", {})),
-                    None)

pokemongo_bot/event_handlers/telegram_handler.py

@@ -1,18 +1,111 @@
 # -*- coding: utf-8 -*-
 from pokemongo_bot.event_manager import EventHandler
+from pokemongo_bot.base_dir import _base_dir
+import json
+import os
+import time
+import telegram
 import thread
 import re
 
 DEBUG_ON = False
 
+class FileIOException(Exception):
+    pass
+
+class TelegramClass:
+
+    update_id = None
+
+    def __init__(self, bot, master, pokemons):
+        self.bot = bot
+        self.master = master
+        self.pokemons = pokemons
+        self._tbot = None
+
+    def sendMessage(self, chat_id=None, parse_mode='Markdown', text=None):
+        self._tbot.sendMessage(chat_id=chat_id, parse_mode=parse_mode, text=text)
+
+    def connect(self):
+        self._tbot = telegram.Bot(self.bot.config.telegram_token)
+        try:
+            self.update_id = self._tbot.getUpdates()[0].update_id
+        except IndexError:
+            self.update_id = None
+
+    def _get_player_stats(self):
+        web_inventory = os.path.join(_base_dir, "web", "inventory-%s.json" % self.bot.config.username)
+        try:
+            with open(web_inventory, "r") as infile:
+                json_inventory = json.load(infile)
+        except ValueError as exception:
+            self.bot.logger.info('[x] Error while opening inventory file for read: %s' % exception)
+            json_inventory = []
+        except:
+            raise FileIOException("Unexpected error reading from {}".format(web_inventory))
+        return next((x["inventory_item_data"]["player_stats"]
+                for x in json_inventory
+                if x.get("inventory_item_data", {}).get("player_stats", {})),
+            None)
+
+    def run(self):
+        time.sleep(1)
+        while True:
+            try:
+                for update in self._tbot.getUpdates(offset=self.update_id, timeout=10):
+                    self.update_id = update.update_id+1
+                    if update.message:
+                        self.bot.logger.info("message from {} ({}): {}".format(update.message.from_user.username, update.message.from_user.id, update.message.text))
+                        if self.master and self.master not in [update.message.from_user.id, "@{}".format(update.message.from_user.username)]:
+                            continue
+                        if update.message.text == "/info":
+                            stats = self._get_player_stats()
+                            if stats:
+                                with self.bot.database as conn:
+                                    cur = conn.cursor()
+                                    cur.execute("SELECT DISTINCT COUNT(encounter_id) FROM catch_log WHERE dated >= datetime('now','-1 day')")
+                                    catch_day = cur.fetchone()[0]
+                                    cur.execute("SELECT DISTINCT COUNT(pokestop) FROM pokestop_log WHERE dated >= datetime('now','-1 day')")
+                                    ps_day = cur.fetchone()[0]
+                                    res = (
+                                        "*"+self.bot.config.username+"*",
+                                        "_Level:_ "+str(stats["level"]),
+                                        "_XP:_ "+str(stats["experience"])+"/"+str(stats["next_level_xp"]),
+                                        "_Pokemons Captured:_ "+str(stats["pokemons_captured"])+" ("+str(catch_day)+" _last 24h_)",
+                                        "_Poke Stop Visits:_ "+str(stats["poke_stop_visits"])+" ("+str(ps_day)+" _last 24h_)",
+                                        "_KM Walked:_ "+str(stats["km_walked"])
+                                    )
+                                self._tbot.sendMessage(chat_id=update.message.chat_id, parse_mode='Markdown', text="\n".join(res))
+                                self._tbot.send_location(chat_id=update.message.chat_id, latitude=self.bot.api._position_lat, longitude=self.bot.api._position_lng)
+                            else:
+                                self._tbot.sendMessage(chat_id=update.message.chat_id, parse_mode='Markdown', text="Stats not loaded yet\n")
+                        elif update.message.text == "/start" or update.message.text == "/help":
+                            res = (
+                                "Commands: ",
+                                "/info - info about bot"
+                            )
+                            self._tbot.sendMessage(chat_id=update.message.chat_id, parse_mode='Markdown', text="\n".join(res))
+            except telegram.error.NetworkError:
+                time.sleep(1)
+            except telegram.error.Unauthorized:
+                self.update_id += 1
+
 class TelegramHandler(EventHandler):
-    def __init__(self, tbot,master,pokemons):
-        self.tbot = tbot
-        self.master=master
-        self.pokemons=pokemons
-        self.whoami="TelegramHandler"
+    def __init__(self, bot, config):
+        self.bot = bot
+        self.tbot = None
+        self.master = config.get('master', None)
+        self.pokemons = config.get('alert_catch', {})
+        self.whoami = "TelegramHandler"
 
     def handle_event(self, event, sender, level, formatted_msg, data):
+        if self.tbot is None:
+            try:
+                self.tbot = TelegramClass(self.bot, self.master, self.pokemons)
+                self.tbot.connect()
+                thread.start_new_thread(self.tbot.run)
+            except Exception as inst:
+                self.tbot = None
         if self.master:
             if not re.match(r'^[0-9]+$', str(self.master)):
                 return
@@ -23,7 +116,7 @@ def handle_event(self, event, sender, level, formatted_msg, data):
             elif event == 'pokemon_caught':
                 if isinstance(self.pokemons, list):
                     if data["pokemon"] in self.pokemons or "all" in self.pokemons:
-                        msg = "Caught {} CP: {}, IV: {}".format(data["pokemon"],data["cp"],data["iv"])
+                        msg = "Caught {} CP: {}, IV: {}".format(data["pokemon"], data["cp"], data["iv"])
                     else:
                         return
                 else:
@@ -34,7 +127,7 @@ def handle_event(self, event, sender, level, formatted_msg, data):
                     else:
                         return
                     if (not "operator" in trigger or trigger["operator"] == "and") and data["cp"] >= trigger["cp"] and data["iv"] >= trigger["iv"] or ("operator" in trigger and trigger["operator"] == "or" and (data["cp"] >= trigger["cp"] or data["iv"] >= trigger["iv"])):
-                        msg = "Caught {} CP: {}, IV: {}".format(data["pokemon"],data["cp"],data["iv"])
+                        msg = "Caught {} CP: {}, IV: {}".format(data["pokemon"], data["cp"], data["iv"])
                     else:
                         return
             else: