quiz: stop quizzes and timers on cleanup

[user/henk/code/ruby/rbot.git] / data / rbot / plugins / twitter.rb

diff --git a/data/rbot/plugins/twitter.rb b/data/rbot/plugins/twitter.rb
index 753a0e45babef487969711fd23996f74329af4cd..2ce8142fea50373d6340b63adc10a65c61555a16 100644 (file)
--- a/data/rbot/plugins/twitter.rb
+++ b/data/rbot/plugins/twitter.rb
@@ -90,7 +90,7 @@ class TwitterPlugin < Plugin
       return false
     end
 
-    count = @bot.config['twitter.friends_status_count']
+    count = friends ? @bot.config['twitter.friends_status_count'] : @bot.config['twitter.status_count']
     user = URI.escape(nick)
     if @has_oauth and @registry.has_key?(m.sourcenick + "_access_token")
         if friends
@@ -98,7 +98,6 @@ class TwitterPlugin < Plugin
           uri = "https://api.twitter.com/1/statuses/friends_timeline.xml?count=#{count}"
           response = @access_token.get(uri).body
         else
-          count = @bot.config['twitter.status_count']
           uri = "https://api.twitter.com/1/statuses/user_timeline.xml?screen_name=#{user}&count=#{count}"
           response = @access_token.get(uri).body
         end