diff options
author | ThibG <thib@sitedethib.com> | 2019-06-07 22:15:44 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-07 22:15:44 +0200 |
commit | 11c28abcfebcf8827f99a86540076347f1a1edff (patch) | |
tree | b5d615001967cf102e88fac86b8ddb3227600109 /app/services/unfollow_service.rb | |
parent | 83600198961cce9bfe82cf0f0c33286703bc86d1 (diff) | |
parent | aec3fa35fda50e7f618dcf8b8f14e78a995583f4 (diff) |
Merge pull request #1097 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/services/unfollow_service.rb')
-rw-r--r-- | app/services/unfollow_service.rb | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/app/services/unfollow_service.rb b/app/services/unfollow_service.rb index 95da2a667..17dc29735 100644 --- a/app/services/unfollow_service.rb +++ b/app/services/unfollow_service.rb @@ -1,6 +1,8 @@ # frozen_string_literal: true class UnfollowService < BaseService + include Payloadable + # Unfollow and notify the remote user # @param [Account] source_account Where to unfollow from # @param [Account] target_account Which to unfollow @@ -50,19 +52,11 @@ class UnfollowService < BaseService end def build_json(follow) - ActiveModelSerializers::SerializableResource.new( - follow, - serializer: ActivityPub::UndoFollowSerializer, - adapter: ActivityPub::Adapter - ).to_json + Oj.dump(serialize_payload(follow, ActivityPub::UndoFollowSerializer)) end def build_reject_json(follow) - ActiveModelSerializers::SerializableResource.new( - follow, - serializer: ActivityPub::RejectFollowSerializer, - adapter: ActivityPub::Adapter - ).to_json + Oj.dump(serialize_payload(follow, ActivityPub::RejectFollowSerializer)) end def build_xml(follow) |