potsda.mn/mobilizon
10
4
Fork 1
Code Issues 22 Pull requests 1 Projects Releases Wiki Activity

Merge branch 'feature/disable-federation' into 'master'

Browse source 
Add config option to disable federation

Closes #148

See merge request framasoft/mobilizon!205
This commit is contained in:
Thomas Citharel 2019-09-27 16:32:57 +02:00
parent bcda0fc428 65b49e247f
commit d30b2fa147
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config/config.exs
View file

@ -17,6 +17,8 @@ config :mobilizon, :instance,
registrations_open: System.get_env("MOBILIZON_INSTANCE_REGISTRATIONS_OPEN") || false, registrations_open: System.get_env("MOBILIZON_INSTANCE_REGISTRATIONS_OPEN") || false,
repository: Mix.Project.config()[:source_url], repository: Mix.Project.config()[:source_url],
allow_relay: true, allow_relay: true,
# Federation is to be activated with Mobilizon 1.0.0-beta.2
federating: false,
remote_limit: 100_000, remote_limit: 100_000,
upload_limit: 16_000_000, upload_limit: 16_000_000,
avatar_upload_limit: 2_000_000, avatar_upload_limit: 2_000_000,

2
lib/service/activity_pub/utils.ex
View file

@ -58,6 +58,7 @@ defmodule Mobilizon.Service.ActivityPub.Utils do
def maybe_federate(%Activity{local: true} = activity) do def maybe_federate(%Activity{local: true} = activity) do
Logger.debug("Maybe federate an activity") Logger.debug("Maybe federate an activity")
if Mobilizon.Config.get!([:instance, :federating]) do
priority = priority =
case activity.data["type"] do case activity.data["type"] do
"Delete" -> 10 "Delete" -> 10
@ -66,6 +67,7 @@ defmodule Mobilizon.Service.ActivityPub.Utils do
end end
Federator.enqueue(:publish, activity, priority) Federator.enqueue(:publish, activity, priority)
end
:ok :ok
end end