Skip to content
Snippets Groups Projects
Commit fb1aba67 authored by Bob Mottram's avatar Bob Mottram
Browse files

regex syntax

parent c9b36449
No related branches found
No related tags found
No related merge requests found
......@@ -413,9 +413,9 @@ function create_pleroma_blocklist {
echo ' # Create a filter string for the pleroma configuration';
echo " blocked_regex=\"~r/\${blocked}/iu\"";
echo " if [ \"\$muted_words_str\" ]; then";
echo " muted_words_str=\"\${muted_words_str}, \\\"\${blocked_regex}\\\"\"";
echo " muted_words_str=\"\${muted_words_str}, [\${blocked_regex}]\"";
echo ' else';
echo " muted_words_str=\"\\\"\${blocked_regex}\\\"\"";
echo " muted_words_str=\"[\${blocked_regex}]\"";
echo ' fi';
echo ' fi';
echo ' fi';
......
......@@ -116,9 +116,9 @@ if [ "$ALL_TEXT" ]; then
recompile=
if [[ "$lines" == *' reject: []'* ]]; then
# first muted words
sed -i "/mrf_keyword/{N;s|reject:.*|reject: [ \"$blocked_regex\" ],|}" "$PLEROMA_CONFIG"
sed -i "/mrf_keyword/{N;s|reject:.*|reject: [ [$blocked_regex] ],|}" "$PLEROMA_CONFIG"
sed -i "/mrf_keyword/{N;N;s|federated_timeline_removal:.*|federated_timeline_removal: [ \"$blocked_regex\" ],|}" "$PLEROMA_CONFIG"
sed -i "/mrf_keyword/{N;N;s|federated_timeline_removal:.*|federated_timeline_removal: [ [$blocked_regex] ],|}" "$PLEROMA_CONFIG"
recompile=1
else
# subsequent muted words
......@@ -127,8 +127,8 @@ if [ "$ALL_TEXT" ]; then
filter_words=$(echo -n "$curr_filter_words" | sed 's| reject: [ ||g' | sed 's| ],||g')
# does it already exist?
if [[ "$filter_words" != *"\"${blocked_regex}\""* ]]; then
sed -i "/mrf_keyword/{N;s|reject:.*|reject: [ ${filter_words},\"$blocked_regex\" ],|}" "$PLEROMA_CONFIG"
sed -i "/mrf_keyword/{N;N;s|federated_timeline_removal:.*|federated_timeline_removal: [ ${filter_words},\"$blocked_regex\" ],|}" "$PLEROMA_CONFIG"
sed -i "/mrf_keyword/{N;s|reject:.*|reject: [ ${filter_words},[$blocked_regex] ],|}" "$PLEROMA_CONFIG"
sed -i "/mrf_keyword/{N;N;s|federated_timeline_removal:.*|federated_timeline_removal: [ ${filter_words},[$blocked_regex] ],|}" "$PLEROMA_CONFIG"
recompile=1
fi
fi
......
......@@ -108,20 +108,20 @@ if [ "$ALL_TEXT" ]; then
if [ "$curr_filter_words" ]; then
blocked_regex="~r/${ALL_TEXT}/iu"
recompile=1
if [[ "$curr_filter_words" == *",\"${blocked_regex}\""* ]]; then
sed -i "/mrf_keyword/{N;s|,\"${blocked_regex}\"||}" "$PLEROMA_CONFIG"
sed -i "/mrf_keyword/{N;N;s|,\"${blocked_regex}\"||}" "$PLEROMA_CONFIG"
sed -i "/mrf_keyword/{N;N;N;s|,\"${blocked_regex}\"||}" "$PLEROMA_CONFIG"
if [[ "$curr_filter_words" == *",[${blocked_regex}]"* ]]; then
sed -i "/mrf_keyword/{N;s|,[${blocked_regex}]||}" "$PLEROMA_CONFIG"
sed -i "/mrf_keyword/{N;N;s|,[${blocked_regex}]||}" "$PLEROMA_CONFIG"
sed -i "/mrf_keyword/{N;N;N;s|,[${blocked_regex}]||}" "$PLEROMA_CONFIG"
else
if [[ "$curr_filter_words" == *"\"${blocked_regex}\","* ]]; then
sed -i "/mrf_keyword/{N;s|\"${blocked_regex}\",||}" "$PLEROMA_CONFIG"
sed -i "/mrf_keyword/{N;N;s|\"${blocked_regex}\",||}" "$PLEROMA_CONFIG"
sed -i "/mrf_keyword/{N;N;N;s|\"${blocked_regex}\",||}" "$PLEROMA_CONFIG"
if [[ "$curr_filter_words" == *"[${blocked_regex}],"* ]]; then
sed -i "/mrf_keyword/{N;s|[${blocked_regex}],||}" "$PLEROMA_CONFIG"
sed -i "/mrf_keyword/{N;N;s|[${blocked_regex}],||}" "$PLEROMA_CONFIG"
sed -i "/mrf_keyword/{N;N;N;s|[${blocked_regex}],||}" "$PLEROMA_CONFIG"
else
if [[ "$curr_filter_words" == *" \"${blocked_regex}\" "* ]]; then
sed -i "/mrf_keyword/{N;s| \"${blocked_regex}\" ||}" "$PLEROMA_CONFIG"
sed -i "/mrf_keyword/{N;N;s| \"${blocked_regex}\" ||}" "$PLEROMA_CONFIG"
sed -i "/mrf_keyword/{N;N;N;s| \"${blocked_regex}\" ||}" "$PLEROMA_CONFIG"
if [[ "$curr_filter_words" == *" [${blocked_regex}] "* ]]; then
sed -i "/mrf_keyword/{N;s| [${blocked_regex}] ||}" "$PLEROMA_CONFIG"
sed -i "/mrf_keyword/{N;N;s| [${blocked_regex}] ||}" "$PLEROMA_CONFIG"
sed -i "/mrf_keyword/{N;N;N;s| [${blocked_regex}] ||}" "$PLEROMA_CONFIG"
else
recompile=
fi
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment