Return to blocked words

src/freedombone-app-pleroma

@@ -411,11 +411,11 @@ function create_pleroma_blocklist {
       echo "    if [ \${#blocked} -gt 2 ]; then";
       echo "        if [[ \"\$blocked\" != '#'* ]]; then";
       echo '            # Create a filter string for the pleroma configuration';
-      echo "            blocked_regex=\"~r/\${blocked}/iu\"";
+      echo "            blocked_word=\"\${blocked}\"";
       echo "            if [ \"\$muted_words_str\" ]; then";
-      echo "                muted_words_str=\"\${muted_words_str}, \\\"\${blocked_regex}\\\"\"";
+      echo "                muted_words_str=\"\${muted_words_str}, \\\"\${blocked_word}\\\"\"";
       echo '            else';
-      echo "                muted_words_str=\"\\\"\${blocked_regex}\\\"\"";
+      echo "                muted_words_str=\"\\\"\${blocked_word}\\\"\"";
       echo '            fi';
       echo '        fi';
       echo '    fi';

src/freedombone-ignore

@@ -112,13 +112,13 @@ if [ "$ALL_TEXT" ]; then
     if [ -f "$PLEROMA_CONFIG" ]; then
         if grep -q ':mrf_keyword' "$PLEROMA_CONFIG"; then
             lines=$(grep -Pzo '.*mrf_keyword(.*\n)*' "$PLEROMA_CONFIG")
-            blocked_regex="~r/${ALL_TEXT}/iu"
+            blocked_word="${ALL_TEXT}"
             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_word\" ],|}" "$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_word\" ],|}" "$PLEROMA_CONFIG"
                 recompile=1
             else
                 # subsequent muted words
@@ -126,9 +126,9 @@ if [ "$ALL_TEXT" ]; then
                 if [ "$curr_filter_words" ]; 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"
+                    if [[ "$filter_words" != *"\"${blocked_word}\""* ]]; then
+                        sed -i "/mrf_keyword/{N;s|reject:.*|reject: [ ${filter_words},\"$blocked_word\" ],|}" "$PLEROMA_CONFIG"
+                        sed -i "/mrf_keyword/{N;N;s|federated_timeline_removal:.*|federated_timeline_removal: [ ${filter_words},\"$blocked_word\" ],|}" "$PLEROMA_CONFIG"
                         recompile=1
                     fi
                 fi

src/freedombone-unignore

@@ -106,22 +106,22 @@ if [ "$ALL_TEXT" ]; then
                 if [[ "$lines" != *' reject: []'* ]]; then
                     curr_filter_words=$(printf "%s" "$lines" | grep ' reject: ')
                     if [ "$curr_filter_words" ]; then
-                        blocked_regex="~r/${ALL_TEXT}/iu"
+                        blocked_word="${ALL_TEXT}"
                         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_word}\""* ]]; then
+                            sed -i "/mrf_keyword/{N;s|,\"${blocked_word}\"||}" "$PLEROMA_CONFIG"
+                            sed -i "/mrf_keyword/{N;N;s|,\"${blocked_word}\"||}" "$PLEROMA_CONFIG"
+                            sed -i "/mrf_keyword/{N;N;N;s|,\"${blocked_word}\"||}" "$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_word}\","* ]]; then
+                                sed -i "/mrf_keyword/{N;s|\"${blocked_word}\",||}" "$PLEROMA_CONFIG"
+                                sed -i "/mrf_keyword/{N;N;s|\"${blocked_word}\",||}" "$PLEROMA_CONFIG"
+                                sed -i "/mrf_keyword/{N;N;N;s|\"${blocked_word}\",||}" "$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_word}\" "* ]]; then
+                                    sed -i "/mrf_keyword/{N;s| \"${blocked_word}\" ||}" "$PLEROMA_CONFIG"
+                                    sed -i "/mrf_keyword/{N;N;s| \"${blocked_word}\" ||}" "$PLEROMA_CONFIG"
+                                    sed -i "/mrf_keyword/{N;N;N;s| \"${blocked_word}\" ||}" "$PLEROMA_CONFIG"
                                 else
                                     recompile=
                                 fi