Merge branch 'develop' into webhooks

test/mix/tasks/pleroma/app_test.exs

@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Mix.Tasks.Pleroma.AppTest do
-  use Pleroma.DataCase, async: true
+  use Pleroma.DataCase, async: false
 
   setup_all do
     Mix.shell(Mix.Shell.Process)

test/mix/tasks/pleroma/config_test.exs

@@ -329,5 +329,39 @@ defmodule Mix.Tasks.Pleroma.ConfigTest do
 
       assert config_records() == []
     end
+
+    test "filters non-whitelisted settings" do
+      clear_config(:database_config_whitelist, [
+        {:pleroma},
+        {:web_push_encryption, :vapid_details}
+      ])
+
+      insert_config_record(:web_push_encryption, :non_whitelisted_key, a: 1)
+      insert_config_record(:web_push_encryption, :vapid_details, b: 1)
+
+      MixTask.run(["filter_whitelisted", "--force"])
+
+      assert [
+               %ConfigDB{group: :pleroma, key: :instance},
+               %ConfigDB{group: :pleroma, key: Pleroma.Captcha},
+               %ConfigDB{group: :web_push_encryption, key: :vapid_details}
+             ] = config_records()
+    end
+
+    test "filter_whitelisted doesn't crash when whitelist is unset" do
+      clear_config(:database_config_whitelist, nil)
+
+      existing = config_records()
+      MixTask.run(["filter_whitelisted", "--force"])
+      assert config_records() == existing
+    end
+
+    test "filter_whitelisted doesn't crash when whitelist is disabled" do
+      clear_config(:database_config_whitelist, false)
+
+      existing = config_records()
+      MixTask.run(["filter_whitelisted", "--force"])
+      assert config_records() == existing
+    end
   end
 end

test/mix/tasks/pleroma/database_test.exs

@@ -3,11 +3,12 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Mix.Tasks.Pleroma.DatabaseTest do
-  use Pleroma.DataCase, async: true
+  use Pleroma.DataCase, async: false
   use Oban.Testing, repo: Pleroma.Repo
 
   alias Pleroma.Activity
   alias Pleroma.Bookmark
+  alias Pleroma.Hashtag
   alias Pleroma.Object
   alias Pleroma.Repo
   alias Pleroma.User
@@ -551,6 +552,39 @@ defmodule Mix.Tasks.Pleroma.DatabaseTest do
 
       assert length(activities) == 3
     end
+
+    test "it prunes hashtags with no objects associated", %{old_insert_date: old_insert_date} do
+      user = insert(:user)
+
+      {:ok, hashtag_post_activity} =
+        CommonAPI.post(user, %{status: "morning #cofe", local: true})
+
+      hashtag_post_object = Object.normalize(hashtag_post_activity)
+
+      {:ok, hashtag_post2_activity} =
+        CommonAPI.post(user, %{status: "morning #cawfee", local: true})
+
+      hashtag_post2_object = Object.normalize(hashtag_post2_activity)
+
+      hashtag_post_object
+      |> Ecto.Changeset.change(%{updated_at: old_insert_date})
+      |> Repo.update!()
+
+      hashtag_post2_object
+      |> Ecto.Changeset.change(%{updated_at: old_insert_date})
+      |> Repo.update!()
+
+      # Test whether hashtags with follow relationships are kept
+      User.follow_hashtag(user, Hashtag.get_by_name("cofe"))
+
+      assert length(Repo.all(Hashtag)) == 2
+      assert length(Repo.all(Object)) == 2
+
+      Mix.Tasks.Pleroma.Database.run(["prune_objects"])
+      assert length(Repo.all(Hashtag)) == 1
+      assert length(Repo.all(Object)) == 0
+      assert Repo.one(Hashtag) |> Map.fetch!(:name) == "cofe"
+    end
   end
 
   describe "running update_users_following_followers_counts" do