aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/user.ex
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2018-09-22 03:08:19 +0000
committerkaniini <nenolod@gmail.com>2018-09-22 03:08:19 +0000
commitec6a7799d8e6b912007b25df9398375f93728b4d (patch)
tree52a094ce864c6ea2766f0b2bb920c13dabd3a001 /lib/pleroma/user.ex
parent4cb6331843d25c91bb374563b2dc8e41d41a4c9c (diff)
parentbd03644ca8d3877fd1abb0c8f8d58603c5a4329e (diff)
downloadpleroma-ec6a7799d8e6b912007b25df9398375f93728b4d.tar.gz
Merge branch 'feature/rich-text-optout-backend' into 'develop'
backend support for opting out of rich text on a per-account basis See merge request pleroma/pleroma!354
Diffstat (limited to 'lib/pleroma/user.ex')
-rw-r--r--lib/pleroma/user.ex6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index e3e6aa0d8..487bfce32 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -669,6 +669,12 @@ defmodule Pleroma.User do
:ok
end
+ def html_filter_policy(%User{info: %{"no_rich_text" => true}}) do
+ Pleroma.HTML.Scrubber.TwitterText
+ end
+
+ def html_filter_policy(_), do: nil
+
def get_or_fetch_by_ap_id(ap_id) do
user = get_by_ap_id(ap_id)