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

Revert to storing application info, and display it to the author via API

Browse Source
This commit is contained in:
Thibaut Girka 2019-01-21 22:40:26 +01:00 committed by ThibG
parent 05415fa5d3
commit f938800ef4
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,7 +14,7 @@ class REST::StatusSerializer < ActiveModel::Serializer
attribute :local_only if :local? attribute :local_only if :local?
belongs_to :reblog, serializer: REST::StatusSerializer belongs_to :reblog, serializer: REST::StatusSerializer
belongs_to :application, if: :user_shows_application? belongs_to :application, if: :show_application?
belongs_to :account, serializer: REST::AccountSerializer belongs_to :account, serializer: REST::AccountSerializer
has_many :media_attachments, serializer: REST::MediaAttachmentSerializer has_many :media_attachments, serializer: REST::MediaAttachmentSerializer
@ -40,8 +40,8 @@ class REST::StatusSerializer < ActiveModel::Serializer
!current_user.nil? !current_user.nil?
end end
def user_shows_application? def show_application?
object.account.user_shows_application? object.account.user_shows_application? || (current_user? && current_user.account_id == object.account_id)
end end
def visibility def visibility

1
app/services/post_status_service.rb
View File

@ -22,7 +22,6 @@ class PostStatusService < BaseService
@options = options @options = options
@text = @options[:text] || '' @text = @options[:text] || ''
@in_reply_to = @options[:thread] @in_reply_to = @options[:thread]
@options.delete(:application) unless @account.user&.setting_show_application
return idempotency_duplicate if idempotency_given? && idempotency_duplicate? return idempotency_duplicate if idempotency_given? && idempotency_duplicate?