Skip to content

Commit

Permalink
[bucket] Fix bug introduced in commit 50059bd
Browse files Browse the repository at this point in the history
  • Loading branch information
Elad Alfassa committed Aug 11, 2012
1 parent f82ecbe commit 0b7f6f5
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions modules/bucket.py
Expand Up @@ -371,7 +371,7 @@ def inv_give(jenni, trigger):
tidbit = tidbit.replace('$item', item) tidbit = tidbit.replace('$item', item)
tidbit = tidbit_vars(tidbit, trigger, False) tidbit = tidbit_vars(tidbit, trigger, False)


say_factoid(jenni, verb, tidbit, True) say_factoid(jenni, fact, verb, tidbit, True)
was = result was = result
return return
inv_give.rule = ('((^\001ACTION (gives|hands) $nickname)|^$nickname. take this) (.*)') inv_give.rule = ('((^\001ACTION (gives|hands) $nickname)|^$nickname. take this) (.*)')
Expand Down Expand Up @@ -508,7 +508,7 @@ def say_fact(jenni, trigger):
jenni.reply('Here you go! %s (%d factoids)' % (bucket_literal_baseurl+web.quote(filename+'.txt'), len(results))) jenni.reply('Here you go! %s (%d factoids)' % (bucket_literal_baseurl+web.quote(filename+'.txt'), len(results)))
result = 'Me giving you a literal link' result = 'Me giving you a literal link'
else: else:
say_factoid(jenni, verb, tidbit, addressed) say_factoid(jenni, fact, verb, tidbit, addressed)
was[trigger.sender] = result was[trigger.sender] = result




Expand Down Expand Up @@ -592,10 +592,10 @@ def dont_know(jenni):
rebuild_dont_know_cache(jenni) rebuild_dont_know_cache(jenni)
return dont_know(jenni) return dont_know(jenni)
fact, tidbit, verb = parse_factoid(reply) fact, tidbit, verb = parse_factoid(reply)
say_factoid(jenni, verb, tidbit, True) say_factoid(jenni, fact, verb, tidbit, True)
return reply return reply


def say_factoid(jenni, verb, tidbit, addressed): def say_factoid(jenni, fact, verb, tidbit, addressed):
if verb not in bucket_runtime_data.special_verbs: if verb not in bucket_runtime_data.special_verbs:
jenni.say("%s %s %s" % (fact, verb, tidbit)) jenni.say("%s %s %s" % (fact, verb, tidbit))
elif verb == '<reply>': elif verb == '<reply>':
Expand Down

0 comments on commit 0b7f6f5

Please sign in to comment.