projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'notifications-dismiss-api' 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 c90bd2bda005e849f7740a79aa68f280175c5b49..5c448d6c9e2c3ef4247a144602fa9dfaf172f9c9 100644
(file)
--- a/
lib/pleroma/web/push/subscription.ex
+++ b/
lib/pleroma/web/push/subscription.ex
@@
-1,5
+1,5
@@
# 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
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.Push.Subscription do
@@
-15,7
+15,7
@@
defmodule Pleroma.Web.Push.Subscription do
@type t :: %__MODULE__{}
schema "push_subscriptions" do
@type t :: %__MODULE__{}
schema "push_subscriptions" do
- belongs_to(:user, User, type:
Pleroma.FlakeId
)
+ 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)
@@
-82,8
+82,8
@@
defmodule Pleroma.Web.Push.Subscription do
end
# Some webpush clients (e.g. iOS Toot!) use an non urlsafe base64 as an encoding for the key.
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("+", "-")