diff options
| author | lain <lain@soykaf.club> | 2020-10-01 11:15:13 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-10-01 11:15:13 +0000 |
| commit | 241f7cb1ed91a8d6855dbd03517e85c98c08edb7 (patch) | |
| tree | 5b60cabc2c4c41ed8c956aa2202cf0ee71706caa /lib | |
| parent | 34029ffb90175e9beb43bc20b76a8093971d8ca6 (diff) | |
| parent | cbdaabad345914e7424e614032056ff86e21142f (diff) | |
| download | pleroma-241f7cb1ed91a8d6855dbd03517e85c98c08edb7.tar.gz pleroma-241f7cb1ed91a8d6855dbd03517e85c98c08edb7.zip | |
Merge branch 'web-push-fix' into 'develop'
web push http_client fix
Closes #2202
See merge request pleroma/pleroma!3052
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/http/web_push.ex | 12 | ||||
| -rw-r--r-- | lib/pleroma/web/push/impl.ex | 12 |
2 files changed, 18 insertions, 6 deletions
diff --git a/lib/pleroma/http/web_push.ex b/lib/pleroma/http/web_push.ex new file mode 100644 index 000000000..78148a12e --- /dev/null +++ b/lib/pleroma/http/web_push.ex @@ -0,0 +1,12 @@ +# Pleroma: A lightweight social networking server +# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/> +# SPDX-License-Identifier: AGPL-3.0-only + +defmodule Pleroma.HTTP.WebPush do + @moduledoc false + + def post(url, payload, headers) do + list_headers = Map.to_list(headers) + Pleroma.HTTP.post(url, payload, list_headers) + end +end diff --git a/lib/pleroma/web/push/impl.ex b/lib/pleroma/web/push/impl.ex index 16368485e..da535aa68 100644 --- a/lib/pleroma/web/push/impl.ex +++ b/lib/pleroma/web/push/impl.ex @@ -19,7 +19,7 @@ defmodule Pleroma.Web.Push.Impl do @types ["Create", "Follow", "Announce", "Like", "Move"] @doc "Performs sending notifications for user subscriptions" - @spec perform(Notification.t()) :: list(any) | :error + @spec perform(Notification.t()) :: list(any) | :error | {:error, :unknown_type} def perform( %{ activity: %{data: %{"type" => activity_type}} = activity, @@ -64,20 +64,20 @@ defmodule Pleroma.Web.Push.Impl do @doc "Push message to web" def push_message(body, sub, api_key, subscription) do case WebPushEncryption.send_web_push(body, sub, api_key) do - {:ok, %{status_code: code}} when 400 <= code and code < 500 -> + {:ok, %{status: code}} when code in 400..499 -> Logger.debug("Removing subscription record") Repo.delete!(subscription) :ok - {:ok, %{status_code: code}} when 200 <= code and code < 300 -> + {:ok, %{status: code}} when code in 200..299 -> :ok - {:ok, %{status_code: code}} -> + {:ok, %{status: code}} -> Logger.error("Web Push Notification failed with code: #{code}") :error - _ -> - Logger.error("Web Push Notification failed with unknown error") + error -> + Logger.error("Web Push Notification failed with #{inspect(error)}") :error end end |