Browse Source

SideEffects: Fix comment

2168-media-preview-proxy
lain 4 years ago
parent
commit
5da08c2b73
2 changed files with 2 additions and 28 deletions
  1. +1
    -1
      lib/pleroma/web/activity_pub/side_effects.ex
  2. +1
    -27
      test/user_test.exs

+ 1
- 1
lib/pleroma/web/activity_pub/side_effects.ex View File

@@ -35,7 +35,7 @@ defmodule Pleroma.Web.ActivityPub.SideEffects do
# - Replace object with Tombstone
# - Set up notification
# - Reduce the user note count
# - TODO: Reduce the reply count
# - Reduce the reply count
def handle(%{data: %{"type" => "Delete", "object" => deleted_object}} = object, meta) do
deleted_object =
Object.normalize(deleted_object, false) || User.get_cached_by_ap_id(deleted_object)


+ 1
- 27
test/user_test.exs View File

@@ -15,7 +15,6 @@ defmodule Pleroma.UserTest do
use Pleroma.DataCase
use Oban.Testing, repo: Pleroma.Repo

import Mock
import Pleroma.Factory
import ExUnit.CaptureLog

@@ -1131,7 +1130,7 @@ defmodule Pleroma.UserTest do

User.delete_user_activities(user)

# TODO: Remove favorites, repeats, delete activities.
# TODO: Test removal favorites, repeats, delete activities.
refute Activity.get_by_id(activity.id)
end

@@ -1180,31 +1179,6 @@ defmodule Pleroma.UserTest do
refute Activity.get_by_id(like_two.id)
refute Activity.get_by_id(repeat.id)
end

test_with_mock "it sends out User Delete activity",
%{user: user},
Pleroma.Web.ActivityPub.Publisher,
[:passthrough],
[] do
Pleroma.Config.put([:instance, :federating], true)

{:ok, follower} = User.get_or_fetch_by_ap_id("http://mastodon.example.org/users/admin")
{:ok, _} = User.follow(follower, user)

{:ok, job} = User.delete(user)
{:ok, _user} = ObanHelpers.perform(job)

assert ObanHelpers.member?(
%{
"op" => "publish_one",
"params" => %{
"inbox" => "http://mastodon.example.org/inbox",
"id" => "pleroma:fakeid"
}
},
all_enqueued(worker: Pleroma.Workers.PublisherWorker)
)
end
end

test "get_public_key_for_ap_id fetches a user that's not in the db" do


Loading…
Cancel
Save