squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SubscriptionOperation: Let chat mentions through.

Browse Source
This commit is contained in:
lain 2020-06-04 20:28:33 +02:00
parent 74edd4f391
commit d44da91bbf
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/pleroma/web/api_spec/operations/subscription_operation.ex
View File

@ -141,6 +141,11 @@ defmodule Pleroma.Web.ApiSpec.SubscriptionOperation do
allOf: [BooleanLike], allOf: [BooleanLike],
nullable: true, nullable: true,
description: "Receive poll notifications?" description: "Receive poll notifications?"
},
"pleroma:chat_mention": %Schema{
allOf: [BooleanLike],
nullable: true,
description: "Receive chat notifications?"
} }
} }
} }

6
test/web/mastodon_api/controllers/subscription_controller_test.exs
View File

@ -58,7 +58,9 @@ defmodule Pleroma.Web.MastodonAPI.SubscriptionControllerTest do
result = result =
conn conn
|> post("/api/v1/push/subscription", %{ |> post("/api/v1/push/subscription", %{
"data" => %{"alerts" => %{"mention" => true, "test" => true}}, "data" => %{
"alerts" => %{"mention" => true, "test" => true, "pleroma:chat_mention" => true}
},
"subscription" => @sub "subscription" => @sub
}) })
|> json_response_and_validate_schema(200) |> json_response_and_validate_schema(200)
@ -66,7 +68,7 @@ defmodule Pleroma.Web.MastodonAPI.SubscriptionControllerTest do
[subscription] = Pleroma.Repo.all(Subscription) [subscription] = Pleroma.Repo.all(Subscription)
assert %{ assert %{
"alerts" => %{"mention" => true}, "alerts" => %{"mention" => true, "pleroma:chat_mention" => true},
"endpoint" => subscription.endpoint, "endpoint" => subscription.endpoint,
"id" => to_string(subscription.id), "id" => to_string(subscription.id),
"server_key" => @server_key "server_key" => @server_key