webhook: integrate bot instance with Bottle#29
Open
HumorBaby wants to merge 3 commits intosopel-irc:masterfrom
Open
webhook: integrate bot instance with Bottle#29HumorBaby wants to merge 3 commits intosopel-irc:masterfrom
HumorBaby wants to merge 3 commits intosopel-irc:masterfrom
Conversation
16ac9d3 to
2b93aaf
Compare
Member
|
@HumorBaby Switching to use the |
c3a4409 to
ee07c8a
Compare
Contributor
Author
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`.
ee07c8a to
7864002
Compare
Contributor
Author
|
👍 |
Member
|
More merge conflicts, oh boy! 🙁 |
Member
|
I was looking at release notes because #141 came up again on IRC. Asking since it needs a rebase anyway 😅 |
This file contains hidden or 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
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
Bottleapp is visible (bottleisimport'd).There are two main goals of this PR:
Obviate the need for unsightly
globals. See:sopel-github/sopel_modules/github/webhook.py
Lines 32 to 33 in 853a6c5
@routedecorated callbacks to accept an optionalbotparameter that corresponds to the actual bot instance, making the webhook callbacks more like normal Sopel callables. For example:botparameter 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_botglobal variable. Other options include getting the bot instance frombottle.request.environ...in each function as needed, and makingthe_bota 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.configor 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.pyand instead use the bot instance provided by@bottle.route.