From d1c6075f5ee38ff6edbca8545f65be3c2516ebf2 Mon Sep 17 00:00:00 2001 From: Giuseppe Bilotta Date: Fri, 21 Sep 2012 14:55:42 +0200 Subject: poll: handle privately-asked polls When a poll is asked in private, its channel will be empty. Make sure that communication go in private again, and do mention that the poll was asked in private in the poll info. --- data/rbot/plugins/poll.rb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'data') diff --git a/data/rbot/plugins/poll.rb b/data/rbot/plugins/poll.rb index 4dc28e69..0b91d27d 100644 --- a/data/rbot/plugins/poll.rb +++ b/data/rbot/plugins/poll.rb @@ -236,7 +236,9 @@ class PollPlugin < Plugin return if poll == nil poll.stop! - @bot.say(poll.channel, _("let's find the answer to: %{q}") % { + dest = poll.channel ? poll.channel : poll.author + + @bot.say(dest, _("let's find the answer to: %{q}") % { :q => "#{Bold}#{poll.question}#{Bold}" }) @@ -268,7 +270,7 @@ class PollPlugin < Plugin end end - @bot.say poll.channel, poll.outcome + @bot.say dest, poll.outcome # Now that we're done, move it to the archives archives = @registry[:archives] @@ -342,7 +344,8 @@ class PollPlugin < Plugin m.reply((to_reply % { :bold => Bold, - :id => poll.id, :author => poll.author, :channel => poll.channel, + :id => poll.id, :author => poll.author, + :channel => (poll.channel ? poll.channel : _("private")), :started => poll.started, :end => poll.ends_at }) + options + outcome) -- cgit v1.2.3