autonomic-cooperative/hometown
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge tag 'v2.8.0' into instance_only_statuses

Browse Source
This commit is contained in:
Renato "Lond" Cerqueira
2019-04-13 23:47:24 +02:00
parent 153385e508 6afab2587d
commit 546581d2ba
689 changed files with 25483 additions and 9047 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/serializers/rest/status_serializer.rb
View File

@ -12,7 +12,7 @@ class REST::StatusSerializer < ActiveModel::Serializer
attribute :pinned, if: :pinnable?
belongs_to :reblog, serializer: REST::StatusSerializer
belongs_to :application
belongs_to :application, if: :show_application?
belongs_to :account, serializer: REST::AccountSerializer
has_many :media_attachments, serializer: REST::MediaAttachmentSerializer
@ -21,6 +21,7 @@ class REST::StatusSerializer < ActiveModel::Serializer
has_many :emojis, serializer: REST::CustomEmojiSerializer
has_one :preview_card, key: :card, serializer: REST::PreviewCardSerializer
has_one :preloadable_poll, key: :poll, serializer: REST::PollSerializer
def id
object.id.to_s
@ -38,6 +39,10 @@ class REST::StatusSerializer < ActiveModel::Serializer
!current_user.nil?
end
def show_application?
object.account.user_shows_application? || (current_user? && current_user.account_id == object.account_id)
end
def visibility
# This visibility is masked behind "private"
# to avoid API changes because there are no