From 16307da3115a840163be149c3847fc600b260bc6 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Sun, 9 Sep 2018 12:12:31 +0000 Subject: [PATCH] twitterapi: frontend config: add formattingOptionsEnabled --- config/config.exs | 1 + lib/pleroma/web/twitter_api/controllers/util_controller.ex | 1 + 2 files changed, 2 insertions(+) diff --git a/config/config.exs b/config/config.exs index 2290119f7..c3094eb2b 100644 --- a/config/config.exs +++ b/config/config.exs @@ -98,6 +98,7 @@ config :pleroma, :fe, redirect_root_login: "/main/friends", show_instance_panel: true, scope_options_enabled: false, + formatting_options_enabled: false, collapse_message_with_subject: false config :pleroma, :activitypub, diff --git a/lib/pleroma/web/twitter_api/controllers/util_controller.ex b/lib/pleroma/web/twitter_api/controllers/util_controller.ex index 886b70f5f..4aaf28869 100644 --- a/lib/pleroma/web/twitter_api/controllers/util_controller.ex +++ b/lib/pleroma/web/twitter_api/controllers/util_controller.ex @@ -176,6 +176,7 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do chatDisabled: !Keyword.get(@instance_chat, :enabled), showInstanceSpecificPanel: Keyword.get(@instance_fe, :show_instance_panel), scopeOptionsEnabled: Keyword.get(@instance_fe, :scope_options_enabled), + formattingOptionsEnabled: Keyword.get(@instance_fe, :formatting_options_enabled), collapseMessageWithSubject: Keyword.get(@instance_fe, :collapse_message_with_subject) } -- 2.45.2