-
-
Notifications
You must be signed in to change notification settings - Fork 13
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
webhook: integrate bot instance with Bottle #29
Open
HumorBaby
wants to merge
3
commits into
sopel-irc:master
Choose a base branch
from
HumorBaby:feat-bottle-sopel
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
HumorBaby
force-pushed
the
feat-bottle-sopel
branch
from
April 23, 2019 04:28
16ac9d3
to
2b93aaf
Compare
@HumorBaby Switching to use the |
HumorBaby
force-pushed
the
feat-bottle-sopel
branch
from
August 1, 2019 12:54
c3a4409
to
ee07c8a
Compare
Done. |
dgw
reviewed
Aug 10, 2019
Injecting the bot instance into the WSGI server environment obviates the need for passing around a bot instance or using `global`s.
Functions that have a `bot` parameter (has to be called `bot`, it is not a matter of position, but name) will receive the managing Sopel instance as an argument. This precludes the use of `global sopel_instance`.
HumorBaby
force-pushed
the
feat-bottle-sopel
branch
from
August 11, 2019 02:53
ee07c8a
to
7864002
Compare
👍 |
More merge conflicts, oh boy! 🙁 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR makes use of WSGI middleware and a Bottle plugin to ensure that the bot instance is accessible wherever the
Bottle
app is visible (bottle
isimport
'd).There are two main goals of this PR:
Obviate the need for unsightly
global
s. See:sopel-github/sopel_modules/github/webhook.py
Lines 32 to 33 in 853a6c5
@route
decorated callbacks to accept an optionalbot
parameter that corresponds to the actual bot instance, making the webhook callbacks more like normal Sopel callables. For example:bot
parameter if it is not needed would be perfectly acceptable. Thanks to Bottle plugins, no extra work is necessary to decorate webhook callbacks.Expose the bot instance through bottle
Then, each subsequent call has access to the
the_bot
global variable. Other options include getting the bot instance frombottle.request.environ...
in each function as needed, and makingthe_bot
a local variable and passing it to functions as needed.Hopefully, this can serve as a starting point for #19 since it now exposes the bot instance (so
bot.config
or the DB can be accessed for settings) informatting.py
, which in my understanding is the current limitation.Coming soon
A PR based on this one to completely remove the use of globals inEnded up adding it to this PR.webhook.py
and instead use the bot instance provided by@bottle.route
.