summaryrefslogtreecommitdiff
path: root/app/helpers
diff options
context:
space:
mode:
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/twitter_helper.rb21
1 files changed, 14 insertions, 7 deletions
diff --git a/app/helpers/twitter_helper.rb b/app/helpers/twitter_helper.rb
index 719f95e..9b1d78d 100644
--- a/app/helpers/twitter_helper.rb
+++ b/app/helpers/twitter_helper.rb
@@ -22,26 +22,33 @@ module TwitterHelper
def update_twitter_info
twitter_user_info[0] = Time.now
twitter_user_info[1] = twitter_client.user(twitter_handle).name
- twitter_user_info[2] = twitter_client.user_timeline(twitter_handle).select{ |tweet| tweet.text.start_with?('RT','@')==false}.take(3)
+<<<<<<< HEAD
+ twitter_user_info[2] = twitter_client.user_timeline(twitter_handle, {:count => 200}).select{ |tweet| tweet.text.start_with?('RT','@')==false}.take(3)
if twitter_user_info[2] == nil
error_handling
- twitter_user_info[3] = "The twitter-handle does not exist or the account is private. Please change it or contact your provider-admin."
+ twitter_user_info[3] = "The twitter handle does not exist or the account's tweets are protected. Please change the privacy settings accordingly or contact your provider-admin."
end
rescue Twitter::Error::BadRequest
error_handling
- twitter_user_info[3] = "The request to have the tweets shown was invalid or cannot be otherwise served."
+ twitter_user_info[3] = "The request for displaying tweets is invalid or cannot be otherwise served."
rescue Twitter::Error::Unauthorized
error_handling
- twitter_user_info[3] = "Please change your twitter-credentials, make sure that the twitter-account you access is public or contact your provider-admin to have the tweets shown."
+ twitter_user_info[3] = "Your bearer-token is invalid or the account's tweets are protected and cannot be displayed. Please change the privacy settings of the corresponding account, check your bearer-token in the secrets-file or contact your provider-admin to have the tweets shown."
rescue Twitter::Error::Forbidden
error_handling
- twitter_user_info[3] = "The request to have the tweets shown is understood, but it has been refused or access is not allowed."
+ twitter_user_info[3] = "The request for displaying tweets is understood, but it has been refused or access is not allowed."
rescue Twitter::Error::NotAcceptable
error_handling
- twitter_user_info[3] = "An invalid format is specified in the request to have the tweets shown."
+ twitter_user_info[3] = "An invalid format is specified in the request for displaying tweets."
rescue Twitter::Error::TooManyRequests
error_handling
- twitter_user_info[3] = "The rate-limit for accessing the tweets is reached. You should be able to see the tweets in a couple of minutes."
+ twitter_user_info[3] = "The rate-limit for accessing the tweets is reached. You should be able to display tweets in a couple of minutes."
+ rescue Twitter::Error::NotFound
+ error_handling
+ twitter_user_info[3] = "The twitter hanlde does not exist."
+ rescue Twitter::Error
+ error_handling
+ twitter_user_info[3] = "An error occured while fetching the tweets."
end
def error_handling