AkkomaGang/akkoma
AkkomaGang/akkoma
13
63
Fork 84
Code Issues 162 Pull requests 12 Packages Projects 2 Releases 14 Wiki Activity

Post editing #202

Merged
floatingghost merged 51 commits from editing into develop 2022-09-06 19:24:03 +00:00
Conversation 0 Commits 51 Files changed 66 +7 -3
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 83746b001e - Show all commits

5
lib/pleroma/web/activity_pub/side_effects.ex
View file

@ -160,8 +160,9 @@ defmodule Pleroma.Web.ActivityPub.SideEffects do
updated_object_id = updated_object["id"] updated_object_id = updated_object["id"]
with {_, true} <- {:has_id, is_binary(updated_object_id)}, with {_, true} <- {:has_id, is_binary(updated_object_id)},
{_, user} <- {:user, Pleroma.User.get_by_ap_id(updated_object_id)} do %{"type" => type} <- updated_object,
if user do {_, is_user} <- {:is_user, type in Pleroma.Constants.actor_types()} do
if is_user do
handle_update_user(object, meta) handle_update_user(object, meta)
else else
handle_update_object(object, meta) handle_update_object(object, meta)

5
test/pleroma/web/activity_pub/side_effects_test.exs
View file

@ -123,7 +123,10 @@ defmodule Pleroma.Web.ActivityPub.SideEffectsTest do
describe "update users" do describe "update users" do
setup do setup do
user = insert(:user, local: false) user = insert(:user, local: false)
{:ok, update_data, []} = Builder.update(user, %{"id" => user.ap_id, "name" => "new name!"})
{:ok, update_data, []} =
Builder.update(user, %{"id" => user.ap_id, "type" => "Person", "name" => "new name!"})
{:ok, update, _meta} = ActivityPub.persist(update_data, local: true) {:ok, update, _meta} = ActivityPub.persist(update_data, local: true)
%{user: user, update_data: update_data, update: update} %{user: user, update_data: update_data, update: update}