From: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Wed, 24 Aug 2022 09:06:48 +0000 (+0100)
Subject: allow new mfm classes
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=fd7f4874baeaa68984cb41995efb8c8dee9f8627;p=akkoma

allow new mfm classes
---

diff --git a/mix.exs b/mix.exs
index 2c2d63b01..f6cdac595 100644
--- a/mix.exs
+++ b/mix.exs
@@ -193,7 +193,7 @@ defmodule Pleroma.Mixfile do
        git: "https://akkoma.dev/AkkomaGang/elasticsearch-elixir.git", ref: "main"},
       {:mfm_parser,
        git: "https://akkoma.dev/AkkomaGang/mfm-parser.git",
-       ref: "51282dd6a784f4e75d6987ae3ceb91671e46dcfb"},
+       ref: "912fba81152d4d572e457fd5427f9875b2bc3dbe"},
 
       # indirect dependency version override
       {:plug, "~> 1.10.4", override: true},
diff --git a/mix.lock b/mix.lock
index 9f9d5b035..bda77cf5a 100644
--- a/mix.lock
+++ b/mix.lock
@@ -67,7 +67,7 @@
   "makeup_erlang": {:hex, :makeup_erlang, "0.1.1", "3fcb7f09eb9d98dc4d208f49cc955a34218fc41ff6b84df7c75b3e6e533cc65f", [:mix], [{:makeup, "~> 1.0", [hex: :makeup, repo: "hexpm", optional: false]}], "hexpm", "174d0809e98a4ef0b3309256cbf97101c6ec01c4ab0b23e926a9e17df2077cbb"},
   "meck": {:hex, :meck, "0.9.2", "85ccbab053f1db86c7ca240e9fc718170ee5bda03810a6292b5306bf31bae5f5", [:rebar3], [], "hexpm", "81344f561357dc40a8344afa53767c32669153355b626ea9fcbc8da6b3045826"},
   "metrics": {:hex, :metrics, "1.0.1", "25f094dea2cda98213cecc3aeff09e940299d950904393b2a29d191c346a8486", [:rebar3], [], "hexpm", "69b09adddc4f74a40716ae54d140f93beb0fb8978d8636eaded0c31b6f099f16"},
-  "mfm_parser": {:git, "https://akkoma.dev/AkkomaGang/mfm-parser.git", "51282dd6a784f4e75d6987ae3ceb91671e46dcfb", [ref: "51282dd6a784f4e75d6987ae3ceb91671e46dcfb"]},
+  "mfm_parser": {:git, "https://akkoma.dev/AkkomaGang/mfm-parser.git", "912fba81152d4d572e457fd5427f9875b2bc3dbe", [ref: "912fba81152d4d572e457fd5427f9875b2bc3dbe"]},
   "mime": {:hex, :mime, "1.6.0", "dabde576a497cef4bbdd60aceee8160e02a6c89250d6c0b29e56c0dfb00db3d2", [:mix], [], "hexpm", "31a1a8613f8321143dde1dafc36006a17d28d02bdfecb9e95a880fa7aabd19a7"},
   "mimerl": {:hex, :mimerl, "1.2.0", "67e2d3f571088d5cfd3e550c383094b47159f3eee8ffa08e64106cdf5e981be3", [:rebar3], [], "hexpm", "f278585650aa581986264638ebf698f8bb19df297f66ad91b18910dfc6e19323"},
   "mint": {:hex, :mint, "1.4.2", "50330223429a6e1260b2ca5415f69b0ab086141bc76dc2fbf34d7c389a6675b2", [:mix], [{:castore, "~> 0.1.0", [hex: :castore, repo: "hexpm", optional: true]}, {:hpax, "~> 0.1.1", [hex: :hpax, repo: "hexpm", optional: false]}], "hexpm", "ce75a5bbcc59b4d7d8d70f8b2fc284b1751ffb35c7b6a6302b5192f8ab4ddd80"},
diff --git a/priv/scrubbers/default.ex b/priv/scrubbers/default.ex
index 68ac06e32..950b6c21e 100644
--- a/priv/scrubbers/default.ex
+++ b/priv/scrubbers/default.ex
@@ -62,20 +62,20 @@ defmodule Pleroma.HTML.Scrubber.Default do
     "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_"
+    "mfm _mfm_tada_",
+    "mfm _mfm_jelly_",
+    "mfm _mfm_twitch_",
+    "mfm _mfm_shake_",
+    "mfm _mfm_spin_",
+    "mfm _mfm_jump_",
+    "mfm _mfm_bounce_",
+    "mfm _mfm_flip_",
+    "mfm _mfm_x2_",
+    "mfm _mfm_x3_",
+    "mfm _mfm_x4_",
+    "mfm _mfm_blur_",
+    "mfm _mfm_rainbow_",
+    "mfm _mfm_rotate_"
   ])
 
   Meta.allow_tag_with_these_attributes(:span, [