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.

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

Enhanced telegram functionality #5371

Merged
merged 9 commits into from
Sep 11, 2016
Merged

Enhanced telegram functionality #5371

merged 9 commits into from
Sep 11, 2016

Conversation

javajohnHub
Copy link
Contributor

@javajohnHub javajohnHub commented Sep 10, 2016

Enhanced telegram functionality.
this should also close issue #5236

/softbans - shows info about possible softbans
/caught - last 25
/evolved - last 25
/hatched - last 25
/pokestops - last 25
/transfers - last 25

also displays info on events:

bot_random_pause
bot_random_alive_pause
log_stats
show_inventory

@mention-bot
Copy link

@javajohnHub, thanks for your PR! By analyzing the annotation information on this pull request, we identified @Gobberwart, @DBa2016 and @solderzzc to be potential reviewers

@DBa2016
Copy link
Contributor

DBa2016 commented Sep 10, 2016

Can we have a meaningful PR description before we start reviewing?

@javajohnHub
Copy link
Contributor Author

My apologies for all the trouble with the pull request. I figured this one would fail also.

@solderzzc
Copy link
Contributor

The web version was touched, but I’ll get it right later

@solderzzc
Copy link
Contributor

solderzzc commented Sep 10, 2016

👍

Approved with PullApprove

fix for issue #5358
def __init__(self, bot, master, pokemons, config):
self.bot = bot
master = config["master"]
Copy link
Contributor

Choose a reason for hiding this comment

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

This will fail if no "master" is supplied in the config.

@DBa2016
Copy link
Contributor

DBa2016 commented Sep 10, 2016

Have you tested this with "master" absent in the config file?

@javajohnHub
Copy link
Contributor Author

No. if telegram class is instantiated there should always be a master.

@javajohnHub
Copy link
Contributor Author

Nevermind i see what you're saying

@DBa2016
Copy link
Contributor

DBa2016 commented Sep 10, 2016

No, with the new "password" configuration, you do not need a "master" at all.

@javajohnHub
Copy link
Contributor Author

So whats the solution here. This allows telegram to work for me. The other way always keeps master at None. (for me) at least

@javajohnHub
Copy link
Contributor Author

If config ['master']
Master = config ["master"] ??

@DBa2016
Copy link
Contributor

DBa2016 commented Sep 10, 2016

The master is not needed, and actually subject o be removed in future. Use password.

@DBa2016
Copy link
Contributor

DBa2016 commented Sep 10, 2016

But if you MUST use the master, always use config.get('master', None), otherwise you will get errors if master is not specified in the config.

@javajohnHub
Copy link
Contributor Author

Thanks for the heads up....ill abandon this and start using password.

@@ -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

@solderzzc
Copy link
Contributor

solderzzc commented Sep 11, 2016

👍

Approved with PullApprove

@solderzzc solderzzc merged commit 669ae22 into PokemonGoF:dev Sep 11, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants