Rename regular expression 'have_re' to 'reply_prefix'.

This commit is contained in:
scarlett 2018-12-06 14:00:41 +00:00
parent 3dff61ebec
commit d27e3f269f

View File

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