Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

This commit is contained in:
Jenkins
2018-02-19 15:17:14 +00:00
25 changed files with 193 additions and 60 deletions
+6
View File
@@ -83,6 +83,8 @@ class Status < ApplicationRecord
delegate :domain, to: :account, prefix: true
REAL_TIME_WINDOW = 6.hours
def searchable_by(preloaded = nil)
ids = [account_id]
@@ -111,6 +113,10 @@ class Status < ApplicationRecord
!reblog_of_id.nil?
end
def within_realtime_window?
created_at >= REAL_TIME_WINDOW.ago
end
def verb
if destroyed?
:delete