summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorthea <ta.kupler@gmail.com>2016-09-07 16:22:20 +0200
committerthea <ta.kupler@gmail.com>2016-09-07 16:22:20 +0200
commitb62bc48bc3bfbd2781cef16d210749ded8d96c37 (patch)
tree6d774f7aca4876a1eb7d96a0d3c4466276de7ae2 /app
parentf269b960f9928ce3211ee3ab80e7a8eead426dac (diff)
changed naming for tweets-method in _index and included time-checking and a twitter call will only be made every 15 minutes
Diffstat (limited to 'app')
-rw-r--r--app/helpers/twitter_helper.rb20
-rw-r--r--app/views/twitter/_index.html.erb2
2 files changed, 19 insertions, 3 deletions
diff --git a/app/helpers/twitter_helper.rb b/app/helpers/twitter_helper.rb
index 035d75c..a5e7ae4 100644
--- a/app/helpers/twitter_helper.rb
+++ b/app/helpers/twitter_helper.rb
@@ -35,7 +35,23 @@ module TwitterHelper
twitter_user_info[1] = twitter_client.user(twitter_handle).name
end
- def tweets
- twitter_client.user_timeline(twitter_handle).select{ |tweet| tweet.text.start_with?('RT','@')==false}.take(3)
+ def twitter_tweets
+ $twitter_tweets ||= []
+ end
+
+ def twitter_timeline
+ if twitter_tweets[0] == nil
+ update_twitter_timeline
+ else
+ if Time.now > twitter_tweets[0] + 15.minutes
+ update_twitter_timeline
+ end
+ end
+ twitter_tweets[1]
+ end
+
+ def update_twitter_timeline
+ twitter_tweets[0] = Time.now
+ twitter_tweets[1] = twitter_client.user_timeline(twitter_handle).select{ |tweet| tweet.text.start_with?('RT','@')==false}.take(3)
end
end
diff --git a/app/views/twitter/_index.html.erb b/app/views/twitter/_index.html.erb
index 2d17aad..ac10aa4 100644
--- a/app/views/twitter/_index.html.erb
+++ b/app/views/twitter/_index.html.erb
@@ -11,7 +11,7 @@
</div>
<div class="twitter_list">
- <% tweets.each do |e| %>
+ <% twitter_timeline.each do |e| %>
<div class="tweet">
<div class="tweet_text"><%= " #{e.text}" %>
</div>