Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Removing failed push notification API, make context loads use cache

Browse source
This commit is contained in:
Eugen Rochko 2017-02-05 17:51:44 +01:00
parent 19b9e1e2c3
commit 77e13c2bc9
9 changed files with 13 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/models/favourite.rb
View file

@ -5,7 +5,7 @@ class Favourite < ApplicationRecord
include Streamable
belongs_to :account, inverse_of: :favourites
belongs_to :status, inverse_of: :favourites, touch: true
belongs_to :status, inverse_of: :favourites
has_one :notification, as: :activity, dependent: :destroy

8
app/models/status.rb
View file

@ -14,7 +14,7 @@ class Status < ApplicationRecord
belongs_to :in_reply_to_account, foreign_key: 'in_reply_to_account_id', class_name: 'Account'
belongs_to :thread, foreign_key: 'in_reply_to_id', class_name: 'Status', inverse_of: :replies
belongs_to :reblog, foreign_key: 'reblog_of_id', class_name: 'Status', inverse_of: :reblogs, touch: true
belongs_to :reblog, foreign_key: 'reblog_of_id', class_name: 'Status', inverse_of: :reblogs
has_many :favourites, inverse_of: :status, dependent: :destroy
has_many :reblogs, foreign_key: 'reblog_of_id', class_name: 'Status', inverse_of: :reblog, dependent: :destroy
@ -81,7 +81,7 @@ class Status < ApplicationRecord
def ancestors(account = nil)
ids = (Status.find_by_sql(['WITH RECURSIVE search_tree(id, in_reply_to_id, path) AS (SELECT id, in_reply_to_id, ARRAY[id] FROM statuses WHERE id = ? UNION ALL SELECT statuses.id, statuses.in_reply_to_id, path || statuses.id FROM search_tree JOIN statuses ON statuses.id = search_tree.in_reply_to_id WHERE NOT statuses.id = ANY(path)) SELECT id FROM search_tree ORDER BY path DESC', id]) - [self]).pluck(:id)
statuses = Status.where(id: ids).with_includes.group_by(&:id)
statuses = Status.where(id: ids).group_by(&:id)
results = ids.map { |id| statuses[id].first }
results = results.reject { |status| filter_from_context?(status, account) }
@ -90,7 +90,7 @@ class Status < ApplicationRecord
def descendants(account = nil)
ids = (Status.find_by_sql(['WITH RECURSIVE search_tree(id, path) AS (SELECT id, ARRAY[id] FROM statuses WHERE id = ? UNION ALL SELECT statuses.id, path || statuses.id FROM search_tree JOIN statuses ON statuses.in_reply_to_id = search_tree.id WHERE NOT statuses.id = ANY(path)) SELECT id FROM search_tree ORDER BY path', id]) - [self]).pluck(:id)
statuses = Status.where(id: ids).with_includes.group_by(&:id)
statuses = Status.where(id: ids).group_by(&:id)
results = ids.map { |id| statuses[id].first }
results = results.reject { |status| filter_from_context?(status, account) }
@ -180,6 +180,6 @@ class Status < ApplicationRecord
private
def filter_from_context?(status, account)
account&.blocking?(status.account) || !status.permitted?(account)
account&.blocking?(status.account_id) || !status.permitted?(account)
end
end