Should fix PokemonGoF#5128 and PokemonGoF#5523 (both regards MoveToMa…

…pPokemon task). NOTE: Please note that there are many reasons a pokemon will "not exist" and they are: it could be already caught by you, expired, too far from the given coords and/or wrong coords/infos at all. Also, when using social and MoveToMapPokemon, the reason it skips the catch after it teleports back is due to the "spawnpoint_id" key, which doesnt exist in the social JSON data and the correct key value is "spawn_point_id" (its been fixed).

Minor text refactors on the new Sniper task.

pokemongo_bot/cell_workers/move_to_map_pokemon.py

@@ -218,9 +218,9 @@ def snipe(self, pokemon):
         # Simulate kind of a lag after teleporting/moving to a long distance
         time.sleep(2)
 
-        # If social is enabled, trust it
-        exists = self.bot.config.enable_social
-        verify = not self.bot.config.enable_social
+        # If social is enabled and if no verification is needed, trust it. Otherwise, update IDs!
+        verify = not pokemon.get('encounter_id') or not pokemon.get('spawn_point_id')
+        exists = not verify and self.bot.config.enable_social
 
         # If social is disabled, we will have to make sure the target still exists
         if verify:

pokemongo_bot/cell_workers/sniper.py

@@ -125,9 +125,9 @@ def validate(self):
             else:
                 raise ValueError("Empty reply")
         except requests.exceptions.Timeout:
-            raise ValueError("Fetching has timed out!")
+            raise ValueError("Fetching has timed out")
         except requests.exceptions.ConnectionError:
-            raise ValueError("Source not available!")
+            raise ValueError("Source not available")
         except:
             raise
 
@@ -231,7 +231,7 @@ def initialize(self):
 
                 # Notify user if all sources are invalid and cant proceed
                 if not self.sources:
-                    self._error("There is no source available. Disabling TeleportSniper...")
+                    self._error("There is no source available. Disabling Sniper...")
                     self.disabled = True
 
     def is_snipeable(self, pokemon):
@@ -242,7 +242,7 @@ def is_snipeable(self, pokemon):
 
         # Skip if expired (cast milliseconds to seconds for comparision)
         if (pokemon.get('expiration_timestamp_ms', 0) or pokemon.get('last_modified_timestamp_ms', 0)) / 1000 < time.time():
-            self._trace('{} is expired ! Skipping...'.format(pokemon.get('pokemon_name')))
+            self._trace('{} is expired! Skipping...'.format(pokemon.get('pokemon_name')))
             return False
 
         # Skip if already cached
@@ -311,7 +311,7 @@ def snipe(self, pokemon):
                 for nearby_pokemon in nearby_pokemons:
                     nearby_pokemon_id = nearby_pokemon.get('pokemon_data', {}).get('pokemon_id') or nearby_pokemon.get('pokemon_id')
 
-                    # If we find the target, it exists and will very likely be encountered/caught (success)
+                    # If we found the target, it exists and will very likely be encountered/caught (success)
                     if nearby_pokemon_id == pokemon.get('pokemon_id', 0):
                         exists = True
                         success = True