projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'improve_upgrade_user_from_ap_id' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
federator
/
federator.ex
diff --git
a/lib/pleroma/web/federator/federator.ex
b/lib/pleroma/web/federator/federator.ex
index b5b5049a40edf3727404846c46eaf28cf4535177..c47328e13a4e096182ffc97ae1688f7c559eb099 100644
(file)
--- a/
lib/pleroma/web/federator/federator.ex
+++ b/
lib/pleroma/web/federator/federator.ex
@@
-4,7
+4,6
@@
defmodule Pleroma.Web.Federator do
alias Pleroma.Activity
defmodule Pleroma.Web.Federator do
alias Pleroma.Activity
- alias Pleroma.Jobs
alias Pleroma.User
alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.Web.ActivityPub.Relay
alias Pleroma.User
alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.Web.ActivityPub.Relay
@@
-22,7
+21,7
@@
defmodule Pleroma.Web.Federator do
@websub Application.get_env(:pleroma, :websub)
@ostatus Application.get_env(:pleroma, :ostatus)
@websub Application.get_env(:pleroma, :websub)
@ostatus Application.get_env(:pleroma, :ostatus)
- def init
()
do
+ def init do
# 1 minute
Process.sleep(1000 * 60)
refresh_subscriptions()
# 1 minute
Process.sleep(1000 * 60)
refresh_subscriptions()
@@
-31,39
+30,39
@@
defmodule Pleroma.Web.Federator do
# Client API
def incoming_doc(doc) do
# Client API
def incoming_doc(doc) do
-
Jobs
.enqueue(:federator_incoming, __MODULE__, [:incoming_doc, doc])
+
PleromaJobQueue
.enqueue(:federator_incoming, __MODULE__, [:incoming_doc, doc])
end
def incoming_ap_doc(params) do
end
def incoming_ap_doc(params) do
-
Jobs
.enqueue(:federator_incoming, __MODULE__, [:incoming_ap_doc, params])
+
PleromaJobQueue
.enqueue(:federator_incoming, __MODULE__, [:incoming_ap_doc, params])
end
def publish(activity, priority \\ 1) do
end
def publish(activity, priority \\ 1) do
-
Jobs
.enqueue(:federator_outgoing, __MODULE__, [:publish, activity], priority)
+
PleromaJobQueue
.enqueue(:federator_outgoing, __MODULE__, [:publish, activity], priority)
end
def publish_single_ap(params) do
end
def publish_single_ap(params) do
-
Jobs
.enqueue(:federator_outgoing, __MODULE__, [:publish_single_ap, params])
+
PleromaJobQueue
.enqueue(:federator_outgoing, __MODULE__, [:publish_single_ap, params])
end
def publish_single_websub(websub) do
end
def publish_single_websub(websub) do
-
Jobs
.enqueue(:federator_outgoing, __MODULE__, [:publish_single_websub, websub])
+
PleromaJobQueue
.enqueue(:federator_outgoing, __MODULE__, [:publish_single_websub, websub])
end
def verify_websub(websub) do
end
def verify_websub(websub) do
-
Jobs
.enqueue(:federator_outgoing, __MODULE__, [:verify_websub, websub])
+
PleromaJobQueue
.enqueue(:federator_outgoing, __MODULE__, [:verify_websub, websub])
end
def request_subscription(sub) do
end
def request_subscription(sub) do
-
Jobs
.enqueue(:federator_outgoing, __MODULE__, [:request_subscription, sub])
+
PleromaJobQueue
.enqueue(:federator_outgoing, __MODULE__, [:request_subscription, sub])
end
end
- def refresh_subscriptions
()
do
-
Jobs
.enqueue(:federator_outgoing, __MODULE__, [:refresh_subscriptions])
+ def refresh_subscriptions do
+
PleromaJobQueue
.enqueue(:federator_outgoing, __MODULE__, [:refresh_subscriptions])
end
def publish_single_salmon(params) do
end
def publish_single_salmon(params) do
-
Jobs
.enqueue(:federator_outgoing, __MODULE__, [:publish_single_salmon, params])
+
PleromaJobQueue
.enqueue(:federator_outgoing, __MODULE__, [:publish_single_salmon, params])
end
# Job Worker Callbacks
end
# Job Worker Callbacks