Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enhanced telegram functionality #5371

Merged
merged 9 commits into from
Sep 11, 2016
Merged

Enhanced telegram functionality #5371

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d4addb0
Merge pull request #5244 from PokemonGoF/dev
solderzzc Sep 6, 2016
11123a8
Update README.md (#5277)
solderzzc Sep 8, 2016
a63a929
Merge remote-tracking branch 'PokemonGoF/dev'
javajohnHub Sep 10, 2016
9915d97
cgm
javajohnHub Sep 10, 2016
dd95d70
my addition
javajohnHub Sep 10, 2016
d294b3d
fix for issue #5358
javajohnHub Sep 10, 2016
8d585da
Refactor possible solution.
javajohnHub Sep 10, 2016
9eb5e7e
Revert
javajohnHub Sep 10, 2016
347fa89
The underscores in <event_name> were preventing /start and /help to f…
javajohnHub Sep 11, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
155 changes: 146 additions & 9 deletions pokemongo_bot/event_handlers/telegram_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,23 @@
from pokemongo_bot import inventory
from telegram.utils import request

DEBUG_ON = False
DEBUG_ON = True
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should be False for publish


class TelegramClass:

update_id = None

def __init__(self, bot, master, pokemons, config):
self.bot = bot
request.CON_POOL_SIZE = 16

with self.bot.database as conn:
# initialize the DB table if it does not exist yet
initiator = TelegramDBInit(bot.database)

if master == None: # no master supplied
self.master = master

# if master is not numeric, try to fetch it from the database
elif unicode(master).isnumeric(): # master is numeric
self.master = master
Expand Down Expand Up @@ -64,7 +68,7 @@ def sendLocation(self, chat_id, latitude, longitude):
time.sleep(10)
except telegram.error.Unauthorized:
self.update_id += 1

def connect(self):
self._tbot = telegram.Bot(self.bot.config.telegram_token)
try:
Expand All @@ -74,7 +78,108 @@ def connect(self):

def _get_player_stats(self):
return inventory.player().player_stats


def get_evolved(self, chat_id):
with self.bot.database as conn:
cur = conn.cursor()
cur.execute("SELECT * FROM evolve_log ORDER BY dated DESC LIMIT 25")
evolved = cur.fetchall()
if evolved:
for x in evolved:
res = (
"*"+str(x[0])+"*",
"_CP:_ " + str(x[2]),
"_IV:_ " + str(x[1]),
str(x[3])
)

self.sendMessage(chat_id=chat_id, parse_mode='Markdown', text="\n".join(res))
else:
self.sendMessage(chat_id=chat_id, parse_mode='Markdown', text="No Evolutions Found.\n")

def get_softban(self, chat_id):
with self.bot.database as conn:
cur = conn.cursor()
cur.execute("SELECT * FROM softban_log")
softban = cur.fetchall()
if softban:
for x in softban:
res = (
"*" + str(x[0]) + "*",
str(x[2]))
self.sendMessage(chat_id=chat_id, parse_mode='Markdown', text="\n".join(res))
else:
self.sendMessage(chat_id=chat_id, parse_mode='Markdown', text="No Softbans found! Good job!\n")

def get_hatched(self, chat_id):
with self.bot.database as conn:
cur = conn.cursor()
cur.execute("SELECT * FROM eggs_hatched_log ORDER BY dated DESC LIMIT 25")
hatched = cur.fetchall()
if hatched:
for x in hatched:
res = (
"*" + str(x[0]) + "*",
"_CP:_ " + str(x[1]),
"_IV:_ " + str(x[2]),
str(x[4])
)
self.sendMessage(chat_id=chat_id, parse_mode='Markdown', text="\n".join(res))
else:
self.sendMessage(chat_id=chat_id, parse_mode='Markdown', text="No Eggs Hatched Yet.\n")

def get_caught(self, chat_id):
with self.bot.database as conn:
cur = conn.cursor()
cur.execute("SELECT * FROM catch_log ORDER BY dated DESC LIMIT 25")
caught = cur.fetchall()
if caught:
for x in caught:
res = (
"*" + str(x[0]) + "*",
"_CP:_ " + str(x[1]),
"_IV:_ " + str(x[2]),
str(x[5])
)
self.sendMessage(chat_id=chat_id, parse_mode='Markdown', text="\n".join(res))
else:
self.sendMessage(chat_id=chat_id, parse_mode='Markdown', text="No Pokemon Caught Yet.\n")

def get_pokestop(self, chat_id):
with self.bot.database as conn:
cur = conn.cursor()
cur.execute("SELECT * FROM pokestop_log ORDER BY dated DESC LIMIT 25")
pokestop = cur.fetchall()
if pokestop:
for x in pokestop:
res = (
"*" + str(x[0] + "*"),
"_XP:_ " + str(x[1]),
"_Items:_ " + str(x[2]),
str(x[3])
)
self.sendMessage(chat_id=chat_id, parse_mode='Markdown', text="\n".join(res))
else:
self.sendMessage(chat_id=chat_id, parse_mode='Markdown', text="No Pokestops Encountered Yet.\n")

def get_transfer(self, chat_id):
with self.bot.database as conn:
cur = conn.cursor()
cur.execute("SELECT * FROM transfer_log ORDER BY dated DESC LIMIT 25")
transfer = cur.fetchall()
if transfer:
for x in transfer:
res = (
"*" + str(x[0]) + "*",
"_CP:_ " + str(x[2]),
"_IV:_ " + str(x[1]),
str(x[3])
)
self.sendMessage(chat_id=chat_id, parse_mode='Markdown', text="\n".join(res))
else:
self.sendMessage(chat_id=chat_id, parse_mode='Markdown', text="No Pokemon Released Yet.\n")


def send_player_stats_to_chat(self, chat_id):
stats = self._get_player_stats()
if stats:
Expand All @@ -96,7 +201,7 @@ def send_player_stats_to_chat(self, chat_id):
self.sendLocation(chat_id=chat_id, latitude=self.bot.api._position_lat, longitude=self.bot.api._position_lng)
else:
self.sendMessage(chat_id=chat_id, parse_mode='Markdown', text="Stats not loaded yet\n")

def grab_uid(self, update):
with self.bot.database as conn:
conn.execute("replace into telegram_uids (uid, username) values (?, ?)", (update.message.chat_id, update.message.from_user.username))
Expand Down Expand Up @@ -191,7 +296,7 @@ def run(self):
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("Telegram message from {} ({}): {}".format(update.message.from_user.username, update.message.from_user.id, update.message.text))
#self.bot.logger.info("Telegram message from {} ({}): {}".format(update.message.from_user.username, update.message.from_user.id, update.message.text))
if update.message.text == "/start" or update.message.text == "/help":
res = (
"Commands: ",
Expand All @@ -203,12 +308,18 @@ def run(self):
"/unsub everything - will remove all subscriptions for this uid",
"/showsubs - show current subscriptions",
"/events <filter> - show available events, filtered by regular expression <filter>",
"/top <num> <cp-or-iv> - show top X pokemons, sorted by CP or IV"
"/top <num> <cp-or-iv> - show top X pokemons, sorted by CP or IV",
"/evolved - show last 25 pokemon evolved",
"/hatched - show last 25 pokemon hatched",
"/caught - show last 25 pokemon caught",
"/pokestops - show last 25 pokestops",
"/transfers - show last 25 transfers",
"/softbans - info about possible softbans"
)
self.sendMessage(chat_id=update.message.chat_id, parse_mode='Markdown', text="\n".join(res))
continue

if self.config.get('password', None) == None and (not hasattr(self, "master") or not self.master): # no auth provided in config
if self.config.get('password', None) == None and (not hasattr(self, "master") or not self.config.get('master', None)): # no auth provided in config
self.sendMessage(chat_id=update.message.chat_id, parse_mode='Markdown', text="No password nor master configured in TelegramTask section, bot will not accept any commands")
continue
if re.match(r'^/login [^ ]+', update.message.text):
Expand Down Expand Up @@ -237,6 +348,24 @@ def run(self):
if update.message.text == "/info":
self.send_player_stats_to_chat(update.message.chat_id)
continue
if update.message.text == "/evolved":
self.get_evolved(update.message.chat_id)
continue
if update.message.text == "/hatched":
self.get_hatched(update.message.chat_id)
continue
if update.message.text == "/caught":
self.get_caught(update.message.chat_id)
continue
if update.message.text == "/pokestops":
self.get_pokestop(update.message.chat_id)
continue
if update.message.text == "/transfers":
self.get_transfer(update.message.chat_id)
continue
if update.message.text == "/softbans":
self.get_softban(update.message.chat_id)
continue
if re.match("^/events", update.message.text):
self.display_events(update)
continue
Expand All @@ -261,7 +390,7 @@ def run(self):
continue

self.sendMessage(chat_id=update.message.chat_id, parse_mode='Markdown', text="Unrecognized command: {}".format(update.message.text))

def showsubs(self, chatid):
subs = []
with self.bot.database as conn:
Expand Down Expand Up @@ -391,6 +520,14 @@ def handle_event(self, event, sender, level, formatted_msg, data):
msg = "*You have reached your daily catch limit, quitting.*"
elif event == 'spin_limit':
msg = "*You have reached your daily spin limit, quitting.*"
elif event == 'bot_random_pause':
msg = "Taking a random break until {}.".format(data["resume"])
elif event == 'bot_random_alive_pause':
msg = "Taking a random break until {}.".format(data["resume"])
elif event == 'log_stats':
msg = "{}".format(data["msg"])
elif event == 'show_inventory':
msg = "{}".format(data["msg"])
else:
msg = formatted_msg
except KeyError:
Expand Down Expand Up @@ -448,4 +585,4 @@ def handle_event(self, event, sender, level, formatted_msg, data):
else:
return
self.tbot.sendMessage(chat_id=master, parse_mode='Markdown', text=msg)

2 changes: 1 addition & 1 deletion web
Open in desktop
Submodule web updated 3 files
+9 −10 config/userdata.js.example
+ − image/forts/img_pokestop_lured.png
+143 −188 js/main.js