# HG changeset patch # User nanaya # Date 1448901252 -32400 # Node ID 1161ad2a4390ecbc4951df2059c8231b39a505a4 # Parent eecb35eac2f36f37596de809de0444f8b70371bc Take care of rt removal from gem api Double the default count since filtering is done at gem level, not api. diff -r eecb35eac2f3 -r 1161ad2a4390 app/controllers/tweets_controller.rb --- a/app/controllers/tweets_controller.rb Tue Dec 01 01:27:22 2015 +0900 +++ b/app/controllers/tweets_controller.rb Tue Dec 01 01:34:12 2015 +0900 @@ -6,7 +6,7 @@ def show client = Tweet.new(params[:id]) - @tweets = client.timeline + @tweets = client.timeline :exclude_replies => true, :count => 40 @user = client.user rescue Twitter::Error::NotFound head :not_found diff -r eecb35eac2f3 -r 1161ad2a4390 app/models/tweet.rb --- a/app/models/tweet.rb Tue Dec 01 01:27:22 2015 +0900 +++ b/app/models/tweet.rb Tue Dec 01 01:34:12 2015 +0900 @@ -1,8 +1,8 @@ class Tweet - def timeline + def timeline(options = {}) @timeline ||= - Rails.cache.fetch({ :timeline => @twitter_id }, :expires_in => 5.minutes) do - @client.user_timeline(@twitter_id) + Rails.cache.fetch({ :timeline => @twitter_id, :options => options }, :expires_in => 5.minutes) do + @client.user_timeline(@twitter_id, options) end end diff -r eecb35eac2f3 -r 1161ad2a4390 app/views/tweets/show.atom.builder --- a/app/views/tweets/show.atom.builder Tue Dec 01 01:27:22 2015 +0900 +++ b/app/views/tweets/show.atom.builder Tue Dec 01 01:34:12 2015 +0900 @@ -3,7 +3,6 @@ feed.updated @tweets.first.try(:created_at) || Time.at(0) @tweets.each do |tweet| - next if tweet.in_reply_to_status_id.present? feed.entry tweet, :url => tweet.uri, :updated => tweet.created_at do |entry| entry.title tweet.created_at.rfc2822 entry.content render(:partial => "tweet", :formats => :html, :locals => { :tweet => tweet }), :type => "html"