From eba3cce77b45e89028f7e6bfa708b469b7416914 Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Fri, 7 Jul 2023 18:48:42 +0000
Subject: [PATCH] Update translation files

Updated by "Squash Git commits" hook in Weblate.

Translation: Pleroma fe/Akkoma Backend (Config Descriptions)
Translate-URL: http://translate.akkoma.dev/projects/akkoma/akkoma-backend-config-descriptions/
---
 CHANGELOG.md                                  |  1 -
 lib/pleroma/user.ex                           |  1 -
 ...tance_actors_to_actor_type_application.exs | 21 -------------------
 test/pleroma/web/activity_pub/relay_test.exs  |  6 ------
 4 files changed, 29 deletions(-)
 delete mode 100644 priv/repo/migrations/20230202154409_instance_actors_to_actor_type_application.exs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c2f3757fe..7b7f36a85 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -103,7 +103,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Rich media will now hard-exit after 5 seconds, to prevent timeline hangs
 - HTTP Content Security Policy is now far more strict to prevent any potential XSS/CSS leakages
 - Follow requests are now paginated, matches mastodon API spec, so use the Link header to paginate.
-- `internal.fetch` and `relay` actors are now represented with the actor type `Application`
 
 ### Fixed 
 - /api/v1/accounts/lookup will now respect restrict\_unauthenticated
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 119e80a4f..66090b596 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -2010,7 +2010,6 @@ defmodule Pleroma.User do
     %User{
       invisible: true,
       local: true,
-      actor_type: "Application",
       ap_id: uri,
       nickname: nickname,
       follower_address: uri <> "/followers"
diff --git a/priv/repo/migrations/20230202154409_instance_actors_to_actor_type_application.exs b/priv/repo/migrations/20230202154409_instance_actors_to_actor_type_application.exs
deleted file mode 100644
index 5bf10704a..000000000
--- a/priv/repo/migrations/20230202154409_instance_actors_to_actor_type_application.exs
+++ /dev/null
@@ -1,21 +0,0 @@
-defmodule Pleroma.Repo.Migrations.InstanceActorsToActorTypeApplication do
-  use Ecto.Migration
-
-  def up do
-    execute("""
-    update users
-    set actor_type = 'Application'
-    where local
-    and (ap_id like '%/relay' or ap_id like '%/internal/fetch')
-    """)
-  end
-
-  def down do
-    execute("""
-    update users
-    set actor_type = 'Person'
-    where local
-    and (ap_id like '%/relay' or ap_id like '%/internal/fetch')
-    """)
-  end
-end
diff --git a/test/pleroma/web/activity_pub/relay_test.exs b/test/pleroma/web/activity_pub/relay_test.exs
index 0bbfc316b..d6de7d61e 100644
--- a/test/pleroma/web/activity_pub/relay_test.exs
+++ b/test/pleroma/web/activity_pub/relay_test.exs
@@ -19,12 +19,6 @@ defmodule Pleroma.Web.ActivityPub.RelayTest do
     assert user.ap_id == "#{Pleroma.Web.Endpoint.url()}/relay"
   end
 
-  test "relay actor is an application" do
-    # See <https://www.w3.org/TR/activitystreams-vocabulary/#dfn-application>
-    user = Relay.get_actor()
-    assert user.actor_type == "Application"
-  end
-
   test "relay actor is invisible" do
     user = Relay.get_actor()
     assert User.invisible?(user)