Merge branch 'develop' of https://code.gab.com/gab/social/gab-social into feature/removing_ruby_junk

2020-12-09 00:00:35 -05:00
parent bb7348fc61 c18991f174
commit 586935f07f
28 changed files with 827 additions and 7 deletions
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -290,13 +290,13 @@ class Status < ApplicationRecord
    end

    def as_home_timeline(account)
-      query = where('updated_at > ?', 5.days.ago)
+      query = where('created_at > ?', 5.days.ago)
      query.where(visibility: [:public, :unlisted, :private])
      query.where(account: [account] + account.following).without_replies
    end

    def as_group_timeline(group)
-      query = where('updated_at > ?', 5.days.ago)
+      query = where('created_at > ?', 5.days.ago)
      query.where(group: group).without_replies
    end