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 git.pleroma.social:pleroma/pleroma into feature/jobs
[akkoma]
/
lib
/
pleroma
/
web
/
websub
/
websub.ex
diff --git
a/lib/pleroma/web/websub/websub.ex
b/lib/pleroma/web/websub/websub.ex
index 90ba79962718ef0f6550f5cc3b380c094a276d26..c00ec08582aa328598d14fa02019d14833ecea1f 100644
(file)
--- a/
lib/pleroma/web/websub/websub.ex
+++ b/
lib/pleroma/web/websub/websub.ex
@@
-4,12
+4,16
@@
defmodule Pleroma.Web.Websub do
alias Ecto.Changeset
defmodule Pleroma.Web.Websub do
alias Ecto.Changeset
- alias Pleroma.Repo
alias Pleroma.Instances
alias Pleroma.Instances
- alias Pleroma.Web.Websub.{WebsubServerSubscription, WebsubClientSubscription}
+ alias Pleroma.Repo
+ alias Pleroma.Web.Websub.WebsubServerSubscription
+ alias Pleroma.Web.Websub.WebsubClientSubscription
alias Pleroma.Web.OStatus.FeedRepresenter
alias Pleroma.Web.OStatus.FeedRepresenter
- alias Pleroma.Web.{XML, Endpoint, OStatus}
+ alias Pleroma.Web.XML
+ alias Pleroma.Web.Endpoint
+ alias Pleroma.Web.OStatus
alias Pleroma.Web.Router.Helpers
alias Pleroma.Web.Router.Helpers
+ alias Pleroma.Web.Federator
require Logger
import Ecto.Query
require Logger
import Ecto.Query
@@
-84,7
+88,7
@@
defmodule Pleroma.Web.Websub do
unreachable_since: reachable_callbacks_metadata[sub.callback]
}
unreachable_since: reachable_callbacks_metadata[sub.callback]
}
-
Pleroma.Web.Federator.enqueue(:publish_single_websub,
data)
+
Federator.publish_single_websub(
data)
end)
end
end)
end
@@
-116,7
+120,7
@@
defmodule Pleroma.Web.Websub do
websub = Repo.update!(change)
websub = Repo.update!(change)
-
Pleroma.Web.Federator.enqueue(:verify_websub,
websub)
+
Federator.verify_websub(
websub)
{:ok, websub}
else
{:ok, websub}
else
@@
-266,7
+270,7
@@
defmodule Pleroma.Web.Websub do
subs = Repo.all(query)
Enum.each(subs, fn sub ->
subs = Repo.all(query)
Enum.each(subs, fn sub ->
-
Pleroma.Web.Federator.enqueue(:request_subscription,
sub)
+
Federator.request_subscription(
sub)
end)
end
end)
end