X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=priv%2Fscrubbers%2Fdefault.ex;h=68ac06e321cf4d2fa2cc6ba2d50c4d4c462c4cf0;hb=e9f1897cfdb32c890e9eaf2e894128be5c7e1123;hp=ea0480dcd910ff6476fbdb16cf18c6fc91aa7c7f;hpb=15c7e3b4bf15ceb5087dde139bde1eb4f3150627;p=akkoma

diff --git a/priv/scrubbers/default.ex b/priv/scrubbers/default.ex
index ea0480dcd..68ac06e32 100644
--- a/priv/scrubbers/default.ex
+++ b/priv/scrubbers/default.ex
@@ -39,6 +39,7 @@ defmodule Pleroma.HTML.Scrubber.Default do
   Meta.allow_tag_with_these_attributes(:code, [])
   Meta.allow_tag_with_these_attributes(:del, [])
   Meta.allow_tag_with_these_attributes(:em, [])
+  Meta.allow_tag_with_these_attributes(:hr, [])
   Meta.allow_tag_with_these_attributes(:i, [])
   Meta.allow_tag_with_these_attributes(:li, [])
   Meta.allow_tag_with_these_attributes(:ol, [])
@@ -47,11 +48,46 @@ defmodule Pleroma.HTML.Scrubber.Default do
   Meta.allow_tag_with_these_attributes(:strong, [])
   Meta.allow_tag_with_these_attributes(:sub, [])
   Meta.allow_tag_with_these_attributes(:sup, [])
+  Meta.allow_tag_with_these_attributes(:ruby, [])
+  Meta.allow_tag_with_these_attributes(:rb, [])
+  Meta.allow_tag_with_these_attributes(:rp, [])
+  Meta.allow_tag_with_these_attributes(:rt, [])
+  Meta.allow_tag_with_these_attributes(:rtc, [])
   Meta.allow_tag_with_these_attributes(:u, [])
   Meta.allow_tag_with_these_attributes(:ul, [])
 
-  Meta.allow_tag_with_this_attribute_values(:span, "class", ["h-card"])
-  Meta.allow_tag_with_these_attributes(:span, [])
+  Meta.allow_tags_with_style_attributes([:span])
+
+  Meta.allow_tag_with_this_attribute_values(:span, "class", [
+    "h-card",
+    "quote-inline",
+    "mfm",
+    "_mfm_tada_",
+    "_mfm_jelly_",
+    "_mfm_twitch_",
+    "_mfm_shake_",
+    "_mfm_spin_",
+    "_mfm_jump_",
+    "_mfm_bounce_",
+    "_mfm_flip_",
+    "_mfm_x2_",
+    "_mfm_x3_",
+    "_mfm_x4_",
+    "_mfm_blur_",
+    "_mfm_rainbow_",
+    "_mfm_rotate_"
+  ])
+
+  Meta.allow_tag_with_these_attributes(:span, [
+    "data-x",
+    "data-y",
+    "data-h",
+    "data-v",
+    "data-left",
+    "data-right"
+  ])
+
+  Meta.allow_tag_with_this_attribute_values(:code, "class", ["inline"])
 
   @allow_inline_images Pleroma.Config.get([:markup, :allow_inline_images])
 
@@ -89,5 +125,10 @@ defmodule Pleroma.HTML.Scrubber.Default do
     Meta.allow_tag_with_these_attributes(:font, ["face"])
   end
 
+  Meta.allow_tag_with_these_attributes(:center, [])
+  Meta.allow_tag_with_these_attributes(:small, [])
+
   Meta.strip_everything_not_covered()
+
+  defp scrub_css(value), do: value
 end