Simplify pleroma blocking script

src/freedombone-app-pleroma

@@ -79,9 +79,11 @@ function pleroma_enable_chat {
 
 function create_pleroma_blocklist {
     { echo '#!/bin/bash';
+      echo '';
       echo "if [ ! -f /root/${PROJECT_NAME}-firewall-domains.cfg ]; then";
       echo '    exit 0';
       echo 'fi';
+      echo '';
       echo 'if [ -f /tmp/pleroma-blocking.lock ]; then';
       echo '    cd /tmp';
       echo '    find ./pleroma*.lock -type f -mmin +5 -exec rm {} \;';
@@ -89,47 +91,36 @@ function create_pleroma_blocklist {
       echo '        exit 0';
       echo '    fi';
       echo 'fi';
+      echo '';
       echo 'touch /tmp/pleroma-blocking.lock';
-      echo 'objects_query="DELETE FROM objects WHERE"';
-      echo 'objects_updated=';
-      echo 'users_query="DELETE FROM users WHERE"';
-      echo 'websub_server_subscriptions_query="DELETE FROM websub_server_subscriptions WHERE"';
-      echo 'websub_server_subscriptions_updated=';
       echo 'filter_str=';
+      echo '';
       echo 'while read blocked; do';
-      echo "    if [[ \"\$blocked\" == *\".\"* || \"\$blocked\" == *\"@\"* ]]; then";
+      echo "    if [[ \"\$blocked\" == *\".\"* && \"\$blocked\" != *\"@\"* ]]; then";
       echo "        if [ \${#blocked} -gt 4 ]; then";
-      echo "            if [ \$objects_updated ]; then";
-      echo "                objects_query=\"\${objects_query} or\"";
-      echo "                users_query=\"\${users_query} or\"";
+      echo '            # Create a filter string for the pleroma configuration';
+      echo "            if [ \"\$filter_str\" ]; then";
+      echo "                filter_str=\"\${filter_str}, \\\"\$blocked\\\"\"";
+      echo '            else';
+      echo "                filter_str=\"\\\"\${blocked}\\\"\"";
       echo '            fi';
-      echo "            objects_query=\"\${objects_query} data->>'content' ilike '%\${blocked}%' or data->>'actor' ilike '%\${blocked}%' or data->>'to' ilike '%\${blocked}%' or data->>'id' ilike '%\${blocked}%' or data->>'external_url' ilike '%\${blocked}%'\"";
-      echo "            users_query=\"\${users_query} nickname ilike '%\${blocked}%'\"";
-      echo '            objects_updated=1';
-      echo "            if [[ \"\$blocked\" != *\"@\"* ]]; then";
-      echo '                # Create a filter string for the pleroma configuration';
-      echo "                if [ \"\$filter_str\" ]; then";
-      echo "                    filter_str=\"\${filter_str}, \\\"\$blocked\\\"\"";
-      echo '                else';
-      echo "                    filter_str=\"\\\"\${blocked}\\\"\"";
-      echo '                fi';
       echo '';
-      echo "                if ! grep -q \"127.0.0.1  \$blocked\" /etc/hosts; then";
-      echo "                    echo \"127.0.0.1  \$blocked\" >> /etc/hosts";
-      echo '                fi';
-      echo "                if [ \$websub_server_subscriptions_updated ]; then";
-      echo "                    websub_server_subscriptions_query=\"\${websub_server_subscriptions_query} or\"";
-      echo '                fi';
-      echo "                websub_server_subscriptions_query=\"\${websub_server_subscriptions_query} callback like '%\${blocked}%'\"";
-      echo '                websub_server_subscriptions_updated=1';
-      echo '            else';
+      echo "            if ! grep -q \"127.0.0.1  \$blocked\" /etc/hosts; then";
+      echo "                echo \"127.0.0.1  \$blocked\" >> /etc/hosts";
+      echo '            fi';
+      echo '        fi';
+      echo '    fi';
+      echo 'done </root/freedombone-firewall-domains.cfg';
+      echo '';
+      echo 'while read blocked; do';
+      echo "    if [[ \"\$blocked\" == *\".\"* && \"\$blocked\" == *\"@\"* ]]; then";
+      echo "        if [ \${#blocked} -gt 4 ]; then";
 
-      echo "                curr_user_query=\"SELECT nickname FROM users where nickname ilike '%\${blocked}%'\"";
-      echo "                curr_user_present=\$(sudo -u postgres psql -d pleroma -c \"\$curr_user_query\")";
-      echo "                if [[ \"\$curr_user_present\" != *'(0 '* ]]; then";
-      echo "                    cd $PLEROMA_DIR";
-      echo "                    sudo -u pleroma mix deactivate_user \${blocked}";
-      echo '                fi';
+      echo "            curr_user_query=\"SELECT nickname FROM users where nickname ilike '%\${blocked}%'\"";
+      echo "            curr_user_present=\$(sudo -u postgres psql -d pleroma -c \"\$curr_user_query\")";
+      echo "            if [[ \"\$curr_user_present\" != *'(0 '* ]]; then";
+      echo "                /bin/bash -c \"cd /etc/pleroma;sudo -u pleroma mix deactivate_user \${blocked}\" &";
+      echo '                sleep 1';
       echo '            fi';
       echo '        fi';
       echo '    fi';
@@ -148,14 +139,6 @@ function create_pleroma_blocklist {
       echo '    fi';
       echo 'fi';
       echo '';
-      echo '#cd /etc/postgresql';
-      echo "#if [ \$objects_updated ]; then";
-      echo "#    sudo -u postgres psql -d pleroma -c \"\$objects_query\"";
-      echo "#    sudo -u postgres psql -d pleroma -c \"\$users_query\"";
-      echo '#fi';
-      echo "#if [ \$websub_server_subscriptions_updated ]; then";
-      echo "#    sudo -u postgres psql -d pleroma -c \"\$websub_server_subscriptions_query\"";
-      echo '#fi';
       echo 'rm /tmp/pleroma-blocking.lock'; } > $blocking_script_file
 
     chmod +x $blocking_script_file