mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert #4616 (#4638)

fix-uploadarea-keyup-for-upstream
Eugen Rochko 2017-08-19 02:23:47 +02:00 committed by GitHub
parent c7d2619ab1
commit 774b8661bc
3 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/serializers/activitypub/accept_follow_serializer.rb
View File

@ -3,7 +3,7 @@
class ActivityPub::AcceptFollowSerializer < ActiveModel::Serializer class ActivityPub::AcceptFollowSerializer < ActiveModel::Serializer
attributes :id, :type, :actor attributes :id, :type, :actor
has_one :object, serializer: ActivityPub::InverseFollowSerializer has_one :object, serializer: ActivityPub::FollowSerializer
def id def id
[ActivityPub::TagManager.instance.uri_for(object.target_account), '#accepts/follows/', object.id].join [ActivityPub::TagManager.instance.uri_for(object.target_account), '#accepts/follows/', object.id].join

22
app/serializers/activitypub/inverse_follow_serializer.rb
View File

@ -1,22 +0,0 @@
# frozen_string_literal: true
class ActivityPub::InverseFollowSerializer < ActiveModel::Serializer
attributes :id, :type, :actor
attribute :virtual_object, key: :object
def id
[ActivityPub::TagManager.instance.uri_for(object.target_account), '#follows/', object.id].join
end
def type
'Follow'
end
def actor
ActivityPub::TagManager.instance.uri_for(object.target_account)
end
def virtual_object
ActivityPub::TagManager.instance.uri_for(object.account)
end
end

2
app/serializers/activitypub/reject_follow_serializer.rb
View File

@ -3,7 +3,7 @@
class ActivityPub::RejectFollowSerializer < ActiveModel::Serializer class ActivityPub::RejectFollowSerializer < ActiveModel::Serializer
attributes :id, :type, :actor attributes :id, :type, :actor
has_one :object, serializer: ActivityPub::InverseFollowSerializer has_one :object, serializer: ActivityPub::FollowSerializer
def id def id
[ActivityPub::TagManager.instance.uri_for(object.target_account), '#rejects/follows/', object.id].join [ActivityPub::TagManager.instance.uri_for(object.target_account), '#rejects/follows/', object.id].join