Merge branch 'feature/gen-magic' into 'develop'

Use libmagic via majic

Closes #1736

See merge request pleroma/pleroma!2534

diff --combined test/pleroma/web/activity_pub/activity_pub_test.exs
index 3efc0d1b410307f2ade56a9c47b21b130b538917,8f53d059939d8d655dff4770fd7bb5527035f8e0..1a8a844ca89466202cf92e069634828096a90b95
--- 1/test/pleroma/web/activity_pub/activity_pub_test.exs
--- 2/test/pleroma/web/activity_pub/activity_pub_test.exs
+++ b/test/pleroma/web/activity_pub/activity_pub_test.exs
@@@ -1029,7 -1029,7 +1029,7 @@@ defmodule Pleroma.Web.ActivityPub.Activ
    describe "uploading files" do
      setup do
        test_file = %Plug.Upload{
-         content_type: "image/jpg",
+         content_type: "image/jpeg",
          path: Path.absname("test/fixtures/image.jpg"),
          filename: "an_image.jpg"
        }
@@@ -1120,7 -1120,7 +1120,7 @@@
  
      test "creates an undo activity for a pending follow request" do
        follower = insert(:user)
 -      followed = insert(:user, %{locked: true})
 +      followed = insert(:user, %{is_locked: true})
  
        {:ok, _, _, follow_activity} = CommonAPI.follow(follower, followed)
        {:ok, activity} = ActivityPub.unfollow(follower, followed)

diff --combined test/pleroma/web/common_api_test.exs
index a8e22d44f4da4a971e41386a63486f043fdbb1fc,d19d484b78471f9cf94b940b23476f27c52cf7ee..f5d09f39657eabd614de0491b3a665a445a7df3f
--- 1/test/pleroma/web/common_api_test.exs
--- 2/test/pleroma/web/common_api_test.exs
+++ b/test/pleroma/web/common_api_test.exs
@@@ -100,7 -100,7 +100,7 @@@ defmodule Pleroma.Web.CommonAPITest d
        recipient = insert(:user)
  
        file = %Plug.Upload{
-         content_type: "image/jpg",
+         content_type: "image/jpeg",
          path: Path.absname("test/fixtures/image.jpg"),
          filename: "an_image.jpg"
        }
@@@ -1071,7 -1071,7 +1071,7 @@@
  
      test "cancels a pending follow for a local user" do
        follower = insert(:user)
 -      followed = insert(:user, locked: true)
 +      followed = insert(:user, is_locked: true)
  
        assert {:ok, follower, followed, %{id: activity_id, data: %{"state" => "pending"}}} =
                 CommonAPI.follow(follower, followed)
@@@ -1093,7 -1093,7 +1093,7 @@@
  
      test "cancels a pending follow for a remote user" do
        follower = insert(:user)
 -      followed = insert(:user, locked: true, local: false, ap_enabled: true)
 +      followed = insert(:user, is_locked: true, local: false, ap_enabled: true)
  
        assert {:ok, follower, followed, %{id: activity_id, data: %{"state" => "pending"}}} =
                 CommonAPI.follow(follower, followed)
@@@ -1116,7 -1116,7 +1116,7 @@@
  
    describe "accept_follow_request/2" do
      test "after acceptance, it sets all existing pending follow request states to 'accept'" do
 -      user = insert(:user, locked: true)
 +      user = insert(:user, is_locked: true)
        follower = insert(:user)
        follower_two = insert(:user)
  
@@@ -1136,7 -1136,7 +1136,7 @@@
      end
  
      test "after rejection, it sets all existing pending follow request states to 'reject'" do
 -      user = insert(:user, locked: true)
 +      user = insert(:user, is_locked: true)
        follower = insert(:user)
        follower_two = insert(:user)
  
@@@ -1156,7 -1156,7 +1156,7 @@@
      end
  
      test "doesn't create a following relationship if the corresponding follow request doesn't exist" do
 -      user = insert(:user, locked: true)
 +      user = insert(:user, is_locked: true)
        not_follower = insert(:user)
        CommonAPI.accept_follow_request(not_follower, user)
  

diff --combined test/pleroma/web/mastodon_api/controllers/account_controller_test.exs
index 0b803b7ab11c14d227e1b7a00dcdd447fe7c504e,4ef404541082280d0ad642e1d42c98266e4d9b5a..7336fa8de756f1ab9a1106758c26d85cb10167f3
--- 1/test/pleroma/web/mastodon_api/controllers/account_controller_test.exs
--- 2/test/pleroma/web/mastodon_api/controllers/account_controller_test.exs
+++ b/test/pleroma/web/mastodon_api/controllers/account_controller_test.exs
@@@ -380,7 -380,7 +380,7 @@@ defmodule Pleroma.Web.MastodonAPI.Accou
        other_user = insert(:user)
  
        file = %Plug.Upload{
-         content_type: "image/jpg",
+         content_type: "image/jpeg",
          path: Path.absname("test/fixtures/image.jpg"),
          filename: "an_image.jpg"
        }
@@@ -706,7 -706,7 +706,7 @@@
      end
  
      test "cancelling follow request", %{conn: conn} do
 -      %{id: other_user_id} = insert(:user, %{locked: true})
 +      %{id: other_user_id} = insert(:user, %{is_locked: true})
  
        assert %{"id" => ^other_user_id, "following" => false, "requested" => true} =
                 conn