From: Egor Kislitsyn <egor@kislitsyn.com>
Date: Tue, 17 Nov 2020 14:29:52 +0000 (+0400)
Subject: Merge branch 'develop' into hide-muted-reactions
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=79d2d3f609ccb14c532ada6fbaf600224f8e4f07;p=akkoma

Merge branch 'develop' into hide-muted-reactions
---

79d2d3f609ccb14c532ada6fbaf600224f8e4f07
diff --cc test/pleroma/web/mastodon_api/controllers/status_controller_test.exs
index 49a100f1c,d95200f99..44e63eb80
--- a/test/pleroma/web/mastodon_api/controllers/status_controller_test.exs
+++ b/test/pleroma/web/mastodon_api/controllers/status_controller_test.exs
@@@ -1741,74 -1741,22 +1741,93 @@@ defmodule Pleroma.Web.MastodonAPI.Statu
               |> json_response_and_validate_schema(:ok)
    end
  
+   test "posting a local only status" do
+     %{user: _user, conn: conn} = oauth_access(["write:statuses"])
+ 
+     conn_one =
+       conn
+       |> put_req_header("content-type", "application/json")
+       |> post("/api/v1/statuses", %{
+         "status" => "cofe",
+         "visibility" => "local"
+       })
+ 
+     local = Pleroma.Constants.as_local_public()
+ 
+     assert %{"content" => "cofe", "id" => id, "visibility" => "local"} =
+              json_response(conn_one, 200)
+ 
+     assert %Activity{id: ^id, data: %{"to" => [^local]}} = Activity.get_by_id(id)
+   end
++
 +  describe "muted reactions" do
 +    test "index" do
 +      %{conn: conn, user: user} = oauth_access(["read:statuses"])
 +
 +      other_user = insert(:user)
 +      {:ok, activity} = CommonAPI.post(user, %{status: "test"})
 +
 +      {:ok, _} = CommonAPI.react_with_emoji(activity.id, other_user, "🎅")
 +      User.mute(user, other_user)
 +
 +      result =
 +        conn
 +        |> get("/api/v1/statuses/?ids[]=#{activity.id}")
 +        |> json_response_and_validate_schema(200)
 +
 +      assert [
 +               %{
 +                 "pleroma" => %{
 +                   "emoji_reactions" => []
 +                 }
 +               }
 +             ] = result
 +
 +      result =
 +        conn
 +        |> get("/api/v1/statuses/?ids[]=#{activity.id}&with_muted=true")
 +        |> json_response_and_validate_schema(200)
 +
 +      assert [
 +               %{
 +                 "pleroma" => %{
 +                   "emoji_reactions" => [%{"count" => 1, "me" => false, "name" => "🎅"}]
 +                 }
 +               }
 +             ] = result
 +    end
 +
 +    test "show" do
 +      # %{conn: conn, user: user, token: token} = oauth_access(["read:statuses"])
 +      %{conn: conn, user: user, token: _token} = oauth_access(["read:statuses"])
 +
 +      other_user = insert(:user)
 +      {:ok, activity} = CommonAPI.post(user, %{status: "test"})
 +
 +      {:ok, _} = CommonAPI.react_with_emoji(activity.id, other_user, "🎅")
 +      User.mute(user, other_user)
 +
 +      result =
 +        conn
 +        |> get("/api/v1/statuses/#{activity.id}")
 +        |> json_response_and_validate_schema(200)
 +
 +      assert %{
 +               "pleroma" => %{
 +                 "emoji_reactions" => []
 +               }
 +             } = result
 +
 +      result =
 +        conn
 +        |> get("/api/v1/statuses/#{activity.id}?with_muted=true")
 +        |> json_response_and_validate_schema(200)
 +
 +      assert %{
 +               "pleroma" => %{
 +                 "emoji_reactions" => [%{"count" => 1, "me" => false, "name" => "🎅"}]
 +               }
 +             } = result
 +    end
 +  end
  end