Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Pleroma
pleroma
Commits
79668c08
Commit
79668c08
authored
Dec 06, 2018
by
minibikini
Browse files
cleanup
parent
3d492795
Changes
2
Hide whitespace changes
Inline
Side-by-side
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
View file @
79668c08
...
...
@@ -2,13 +2,22 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
use
Pleroma
.
Web
,
:controller
alias
Pleroma
.
{
Repo
,
Object
,
Activity
,
User
,
Notification
,
Stats
}
alias
Pleroma
.
Web
alias
Pleroma
.
Web
.
MastodonAPI
.
{
StatusView
,
AccountView
,
MastodonView
,
ListView
,
FilterView
}
alias
Pleroma
.
Web
.
MastodonAPI
.
{
StatusView
,
AccountView
,
MastodonView
,
ListView
,
FilterView
,
PushSubscriptionView
}
alias
Pleroma
.
Web
.
ActivityPub
.
ActivityPub
alias
Pleroma
.
Web
.
ActivityPub
.
Utils
alias
Pleroma
.
Web
.
CommonAPI
alias
Pleroma
.
Web
.
OAuth
.
{
Authorization
,
Token
,
App
}
alias
Pleroma
.
Web
.
MediaProxy
alias
Comeonin
.
Pbkdf2
import
Ecto
.
Query
require
Logger
...
...
@@ -1160,8 +1169,6 @@ def delete_filter(%{assigns: %{user: user}} = conn, %{"id" => filter_id}) do
json
(
conn
,
%{})
end
alias
Pleroma
.
Web
.
MastodonAPI
.
PushSubscriptionView
def
create_push_subscription
(%{
assigns:
%{
user:
user
,
token:
token
}}
=
conn
,
params
)
do
Pleroma
.
Web
.
Push
.
Subscription
.
delete_if_exists
(
user
,
token
)
{
:ok
,
subscription
}
=
Pleroma
.
Web
.
Push
.
Subscription
.
create
(
user
,
token
,
params
)
...
...
lib/pleroma/web/push/push.ex
View file @
79668c08
...
...
@@ -70,7 +70,6 @@ def handle_cast(
data
->
Logger
.
error
(
"Web Push Nonification failed with unknown error"
)
IO
.
inspect
(
data
)
:error
end
end
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment