summaryrefslogtreecommitdiff
path: root/data/rbot/plugins
diff options
context:
space:
mode:
authorGiuseppe Bilotta <giuseppe.bilotta@gmail.com>2010-09-28 13:28:24 +0200
committerGiuseppe Bilotta <giuseppe.bilotta@gmail.com>2010-09-28 13:28:24 +0200
commit14db2532b7ef64707395cf21a7730abd8dcc4441 (patch)
tree221f908677bf46ce24aa70bb1acfe29e6f69deab /data/rbot/plugins
parent2ed8235cdb9e92b0bc46ee97ddbf4c4a1f70c6d8 (diff)
twitter: fix status count
Diffstat (limited to 'data/rbot/plugins')
-rw-r--r--data/rbot/plugins/twitter.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/data/rbot/plugins/twitter.rb b/data/rbot/plugins/twitter.rb
index 753a0e45..2ce8142f 100644
--- 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