diff options
| author | lain <lain@soykaf.club> | 2019-03-25 13:37:32 +0100 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-03-25 13:37:32 +0100 |
| commit | 037fefe21871ee0a1926286c87c334ea1d339394 (patch) | |
| tree | 2775b91de5652ddd5baa3e32861ac9cac4bc40be /lib/pleroma/web/twitter_api/controllers/util_controller.ex | |
| parent | f6fab01ba7a08fe0e5147f82d9e3dd294922dc93 (diff) | |
| parent | b028b0f97d4b6310b1402b3b876aa8f8b286bc4d (diff) | |
| download | pleroma-037fefe21871ee0a1926286c87c334ea1d339394.tar.gz | |
Merge remote-tracking branch 'origin/develop' into features/mastoapi/2.6.0-conversations
Diffstat (limited to 'lib/pleroma/web/twitter_api/controllers/util_controller.ex')
| -rw-r--r-- | lib/pleroma/web/twitter_api/controllers/util_controller.ex | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/pleroma/web/twitter_api/controllers/util_controller.ex b/lib/pleroma/web/twitter_api/controllers/util_controller.ex index 320ec778c..faa733fec 100644 --- a/lib/pleroma/web/twitter_api/controllers/util_controller.ex +++ b/lib/pleroma/web/twitter_api/controllers/util_controller.ex @@ -197,7 +197,9 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do vapidPublicKey: vapid_public_key, accountActivationRequired: if(Keyword.get(instance, :account_activation_required, false), do: "1", else: "0"), - invitesEnabled: if(Keyword.get(instance, :invites_enabled, false), do: "1", else: "0") + invitesEnabled: if(Keyword.get(instance, :invites_enabled, false), do: "1", else: "0"), + safeDMMentionsEnabled: + if(Pleroma.Config.get([:instance, :safe_dm_mentions]), do: "1", else: "0") } pleroma_fe = |