diff options
| author | Eugen <eugen@zeonfederated.com> | 2017-04-04 14:51:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-04 14:51:42 +0200 |
| commit | 48dfdad49255ae4a100e01f41852e65806858fce (patch) | |
| tree | a2bfe7a94bcd7a37399470b31c0453e1b489dea9 /app/models | |
| parent | 5b6f4fdeb4932df1704da01762cc22c63aacb20f (diff) | |
| parent | ed4a723a82e90fc057494e4fdec4a2074a3164c7 (diff) | |
Merge branch 'master' into patch-1
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/feed.rb | 12 | ||||
| -rw-r--r-- | app/models/status.rb | 2 |
2 files changed, 3 insertions, 11 deletions
diff --git a/app/models/feed.rb b/app/models/feed.rb index 5e1905e15..3cbc160a0 100644 --- a/app/models/feed.rb +++ b/app/models/feed.rb @@ -10,17 +10,9 @@ class Feed max_id = '+inf' if max_id.blank? since_id = '-inf' if since_id.blank? unhydrated = redis.zrevrangebyscore(key, "(#{max_id}", "(#{since_id}", limit: [0, limit], with_scores: true).map(&:last).map(&:to_i) + status_map = Status.where(id: unhydrated).cache_ids.map { |s| [s.id, s] }.to_h - # If we're after most recent items and none are there, we need to precompute the feed - if unhydrated.empty? && max_id == '+inf' && since_id == '-inf' - RegenerationWorker.perform_async(@account.id, @type) - @statuses = Status.send("as_#{@type}_timeline", @account).cache_ids.paginate_by_max_id(limit, nil, nil) - else - status_map = Status.where(id: unhydrated).cache_ids.map { |s| [s.id, s] }.to_h - @statuses = unhydrated.map { |id| status_map[id] }.compact - end - - @statuses + unhydrated.map { |id| status_map[id] }.compact end private diff --git a/app/models/status.rb b/app/models/status.rb index 81b26fd14..daf128572 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -188,7 +188,7 @@ class Status < ApplicationRecord end before_validation do - text.strip! + text&.strip! spoiler_text&.strip! self.reply = !(in_reply_to_id.nil? && thread.nil?) unless reply |