tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge upstream (#81)

Browse Source
This commit is contained in:
kibigo!
2017-07-15 14:33:15 -07:00
parent 08d021916d 695439775e
commit 09cfc079b0
213 changed files with 2714 additions and 1364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/presenters/activitypub/collection_presenter.rb Normal file
View File

@@ -0,0 +1,5 @@
# frozen_string_literal: true
class ActivityPub::CollectionPresenter < ActiveModelSerializers::Model
attributes :id, :type, :current, :size, :items
end

2
app/presenters/initial_state_presenter.rb
View File

@@ -1,5 +1,5 @@
# frozen_string_literal: true
class InitialStatePresenter < ActiveModelSerializers::Model
attributes :settings, :token, :current_account, :admin
attributes :settings, :push_subscription, :token, :current_account, :admin
end

8
app/presenters/status_relationships_presenter.rb
View File

@@ -3,7 +3,7 @@
class StatusRelationshipsPresenter
attr_reader :reblogs_map, :favourites_map, :mutes_map
def initialize(statuses, current_account_id = nil)
def initialize(statuses, current_account_id = nil, reblogs_map: {}, favourites_map: {}, mutes_map: {})
if current_account_id.nil?
@reblogs_map = {}
@favourites_map = {}
@@ -11,9 +11,9 @@ class StatusRelationshipsPresenter
else
status_ids = statuses.compact.flat_map { |s| [s.id, s.reblog_of_id] }.uniq
conversation_ids = statuses.compact.map(&:conversation_id).compact.uniq
@reblogs_map = Status.reblogs_map(status_ids, current_account_id)
@favourites_map = Status.favourites_map(status_ids, current_account_id)
@mutes_map = Status.mutes_map(conversation_ids, current_account_id)
@reblogs_map = Status.reblogs_map(status_ids, current_account_id).merge(reblogs_map)
@favourites_map = Status.favourites_map(status_ids, current_account_id).merge(favourites_map)
@mutes_map = Status.mutes_map(conversation_ids, current_account_id).merge(mutes_map)
end
end
end