Closed starsparrow closed 6 years ago
If you still want this command, I'd recommend converting it to the new foods.py
structure
I did, sorry. I meant to get it cleaned up yesterday but was unexpectedly busy. I'll check it out soon!
On Wed, Oct 25, 2017, 9:23 PM linuxdaemon notifications@github.com wrote:
@linuxdaemon commented on this pull request.
In plugins/foods.py https://github.com/edwardslabs/CloudBot/pull/93#discussion_r147027195:
+ +@asyncio.coroutine +@hook.command +def burger(text, action):
- """
- give a burger to """ - user = text.strip()
- if not is_valid(user):
- return "Sorry, I can't burg that user."
- generator = textgen.TextGenerator(burger_data["templates"], burger_data["parts"], variables={"user": user})
act out the message
- action(generator.generate_string()) +======= +>>>>>>> upstream/gonzobot
I believe you forgot to resolve all the conflicts during the merge
— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/edwardslabs/CloudBot/pull/93#pullrequestreview-72057920, or mute the thread https://github.com/notifications/unsubscribe-auth/AIINYFtyEVB7T7rv5mbtHAsL5u2Upne1ks5sv98hgaJpZM4LprBK .
@linuxdaemon okies I think this should be good now, let me know if it needs anything else!
@linuxdaemon also, should I be branching future silly things like this off of the python3.4 branch instead of gonzobot?
nah, the python3.4
branch is the upstream CloudBot branch, the gonzobot
branch is the one the live gonzobot instance runs off of
Ah. Should I base my branches in gonzobot-dev then or should I just keep doing it off of gonzobot?
Just off of the gonzobot
branch
This has merge conflicts that need to be fixed before it can be merged.
Yet another addition to foods.py
Tested in ##burgerops on snoonet