worst/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity

Don't try removing deleted users and such from index as posts

Browse source
This commit is contained in:
Ekaterina Vaartis 2022-01-22 16:52:06 +03:00 committed by FloatingGhost
parent 7aebff799b
commit 7f53aa400b
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/pleroma/search.ex
View file

@ -1,12 +1,12 @@
defmodule Pleroma.Search do defmodule Pleroma.Search do
alias Pleroma.Workers.SearchIndexingWorker alias Pleroma.Workers.SearchIndexingWorker
def add_to_index(activity) do def add_to_index(%Pleroma.Activity{id: activity_id}) do
SearchIndexingWorker.enqueue("add_to_index", %{"activity" => activity.id}) SearchIndexingWorker.enqueue("add_to_index", %{"activity" => activity_id})
end end
def remove_from_index(object) do def remove_from_index(%Pleroma.Object{id: object_id}) do
SearchIndexingWorker.enqueue("remove_from_index", %{"object" => object.id}) SearchIndexingWorker.enqueue("remove_from_index", %{"object" => object_id})
end end
def search(query, options) do def search(query, options) do

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

@ -325,7 +325,10 @@ def handle(%{data: %{"type" => "Delete", "object" => deleted_object}} = object,
if result == :ok do if result == :ok do
Notification.create_notifications(object) Notification.create_notifications(object)
# Only remove from index when deleting actual objects, not users or anything else
with %Pleroma.Object{} <- deleted_object do
Pleroma.Search.remove_from_index(deleted_object) Pleroma.Search.remove_from_index(deleted_object)
end
{:ok, object, meta} {:ok, object, meta}
else else