projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma]
/
lib
/
pleroma
/
web
/
push
/
subscription.ex
diff --git
a/lib/pleroma/web/push/subscription.ex
b/lib/pleroma/web/push/subscription.ex
index 82b30950ce7d7102d95573e2aae493fb0493b8b8..5b5aa0d597567fb80cf5521f66628d4e09d86fae 100644
(file)
--- a/
lib/pleroma/web/push/subscription.ex
+++ b/
lib/pleroma/web/push/subscription.ex
@@
-1,16
+1,21
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
20
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.Push.Subscription do
use Ecto.Schema
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.Push.Subscription do
use Ecto.Schema
+
import Ecto.Changeset
import Ecto.Changeset
- alias Pleroma.{Repo, User}
+
+ alias Pleroma.Repo
+ alias Pleroma.User
alias Pleroma.Web.OAuth.Token
alias Pleroma.Web.Push.Subscription
alias Pleroma.Web.OAuth.Token
alias Pleroma.Web.Push.Subscription
+ @type t :: %__MODULE__{}
+
schema "push_subscriptions" do
schema "push_subscriptions" do
- belongs_to(:user, User)
+ belongs_to(:user, User
, type: FlakeId.Ecto.CompatType
)
belongs_to(:token, Token)
field(:endpoint, :string)
field(:key_p256dh, :string)
belongs_to(:token, Token)
field(:endpoint, :string)
field(:key_p256dh, :string)
@@
-20,20
+25,28
@@
defmodule Pleroma.Web.Push.Subscription do
timestamps()
end
timestamps()
end
- @supported_alert_types ~w[follow favourite mention reblog
]
+ @supported_alert_types ~w[follow favourite mention reblog
pleroma:chat_mention]a
- defp alerts(%{
"data" => %{"alerts" =>
alerts}}) do
+ defp alerts(%{
data: %{alerts:
alerts}}) do
alerts = Map.take(alerts, @supported_alert_types)
%{"alerts" => alerts}
end
alerts = Map.take(alerts, @supported_alert_types)
%{"alerts" => alerts}
end
+ def enabled?(subscription, "follow_request") do
+ enabled?(subscription, "follow")
+ end
+
+ def enabled?(subscription, alert_type) do
+ get_in(subscription.data, ["alerts", alert_type])
+ end
+
def create(
%User{} = user,
%Token{} = token,
%{
def create(
%User{} = user,
%Token{} = token,
%{
-
"subscription" =>
%{
-
"endpoint" =>
endpoint,
-
"keys" => %{"auth" => key_auth, "p256dh" =>
key_p256dh}
+
subscription:
%{
+
endpoint:
endpoint,
+
keys: %{auth: key_auth, p256dh:
key_p256dh}
}
} = params
) do
}
} = params
) do
@@
-47,30
+60,38
@@
defmodule Pleroma.Web.Push.Subscription do
})
end
})
end
+ @doc "Gets subsciption by user & token"
+ @spec get(User.t(), Token.t()) :: {:ok, t()} | {:error, :not_found}
def get(%User{id: user_id}, %Token{id: token_id}) do
def get(%User{id: user_id}, %Token{id: token_id}) do
- Repo.get_by(Subscription, user_id: user_id, token_id: token_id)
+ case Repo.get_by(Subscription, user_id: user_id, token_id: token_id) do
+ nil -> {:error, :not_found}
+ subscription -> {:ok, subscription}
+ end
end
def update(user, token, params) do
end
def update(user, token, params) do
- get(user, token)
- |> change(data: alerts(params))
- |> Repo.update()
+ with {:ok, subscription} <- get(user, token) do
+ subscription
+ |> change(data: alerts(params))
+ |> Repo.update()
+ end
end
def delete(user, token) do
end
def delete(user, token) do
- Repo.delete(get(user, token))
+ with {:ok, subscription} <- get(user, token),
+ do: Repo.delete(subscription)
end
def delete_if_exists(user, token) do
case get(user, token) do
end
def delete_if_exists(user, token) do
case get(user, token) do
-
nil
-> {:ok, nil}
-
sub
-> Repo.delete(sub)
+
{:error, _}
-> {:ok, nil}
+
{:ok, sub}
-> Repo.delete(sub)
end
end
# Some webpush clients (e.g. iOS Toot!) use an non urlsafe base64 as an encoding for the key.
end
end
# Some webpush clients (e.g. iOS Toot!) use an non urlsafe base64 as an encoding for the key.
- # However, the web push rfs specify to use base64 urlsafe, and the `web_push_encryption` library
we use
- # requires the key to be properly encoded. So we just convert base64 to urlsafe base64.
+ # However, the web push rfs specify to use base64 urlsafe, and the `web_push_encryption` library
+ #
we use
requires the key to be properly encoded. So we just convert base64 to urlsafe base64.
defp ensure_base64_urlsafe(string) do
string
|> String.replace("+", "-")
defp ensure_base64_urlsafe(string) do
string
|> String.replace("+", "-")