tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki 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

18
app/controllers/api/v1/devices_controller.rb
View File

@ -1,18 +0,0 @@
# frozen_string_literal: true
class Api::V1::DevicesController < ApiController
before_action -> { doorkeeper_authorize! :read }
before_action :require_user!
respond_to :json
def register
Device.where(account: current_account, registration_id: params[:registration_id]).first_or_create!(account: current_account, registration_id: params[:registration_id])
render_empty
end
def unregister
Device.where(account: current_account, registration_id: params[:registration_id]).delete_all
render_empty
end
end

7
app/controllers/api/v1/statuses_controller.rb
View File

@ -14,7 +14,12 @@ class Api::V1::StatusesController < ApiController
end
def context
@context = OpenStruct.new(ancestors: @status.in_reply_to_id.nil? ? [] : @status.ancestors(current_account), descendants: @status.descendants(current_account))
ancestors_results = @status.in_reply_to_id.nil? ? [] : @status.ancestors(current_account)
descendants_results = @status.descendants(current_account)
loaded_ancestors = cache_collection(ancestors_results, Status)
loaded_descendants = cache_collection(descendants_results, Status)
@context = OpenStruct.new(ancestors: loaded_ancestors, descendants: loaded_descendants)
statuses = [@status] + @context[:ancestors] + @context[:descendants]
set_maps(statuses)

4
app/controllers/stream_entries_controller.rb
View File

@ -14,8 +14,8 @@ class StreamEntriesController < ApplicationController
return gone if @stream_entry.activity.nil?
if @stream_entry.activity_type == 'Status'
@ancestors = @stream_entry.activity.ancestors(current_account)
@descendants = @stream_entry.activity.descendants(current_account)
@ancestors = @stream_entry.activity.reply? ? cache_collection(@stream_entry.activity.ancestors(current_account), Status) : []
@descendants = cache_collection(@stream_entry.activity.descendants(current_account), Status)
end
end