a1batross
/
pleroma
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Harden re: detection.

This commit is contained in:
scarlett 2018-12-06 13:48:12 +00:00
parent 6a6aaa0e1a
commit 3dff61ebec
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/pleroma/web/activity_pub/mrf/ensure_re_prepended.ex
View File

@ -3,13 +3,16 @@ defmodule Pleroma.Web.ActivityPub.MRF.EnsureRePrepended do
@behaviour Pleroma.Web.ActivityPub.MRF
@have_re Regex.compile!("^re:[[:space:]]*", [:caseless])
def filter_by_summary(
%{"summary" => parent_summary} = parent,
%{"summary" => child_summary} = child
)
when not is_nil(child_summary) and child_summary == parent_summary and
byte_size(child_summary) > 1 do
if not String.starts_with?(child_summary, "re:") do
when not is_nil(child_summary) and byte_size(child_summary) > 0 and
not is_nil(parent_summary) and byte_size(parent_summary) > 0 do
if (child_summary == parent_summary and not Regex.match?(@have_re, child_summary)) or
(Regex.match?(@have_re, parent_summary) &&
Regex.replace(@have_re, parent_summary, "") == child_summary) do
Map.put(child, "summary", "re: " <> child_summary)
else
child