Browse Source

Remove notifications for blocked users

Bob Mottram 7 years ago
parent
commit
de8bacd3c2
1 changed files with 2 additions and 1 deletions
  1. 2
    1
      src/freedombone-app-pleroma

+ 2
- 1
src/freedombone-app-pleroma View File

@@ -82,6 +82,7 @@ function create_pleroma_blocklist {
82 82
     echo '    if [[ "$blocked" == *"."* || "$blocked" == *"@"* ]]; then' >> $blocking_script_file
83 83
     echo '        if [ ${#blocked} -gt 4 ]; then' >> $blocking_script_file
84 84
     echo "            sudo -u postgres psql -d pleroma -c \"DELETE FROM objects WHERE 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}%'\"" >> $blocking_script_file
85
+    echo "            sudo -u postgres psql -d pleroma -c \"DELETE FROM notifications INNER JOIN users ON users.id = notifications.user_id WHERE users.nickname ilike '%${blocked}%';\"" >> $blocking_script_file
85 86
     echo "            sudo -u postgres psql -d pleroma -c \"DELETE FROM users WHERE nickname ilike '%\${blocked}%'\"" >> $blocking_script_file
86 87
     echo '        fi' >> $blocking_script_file
87 88
     echo '    fi' >> $blocking_script_file
@@ -89,7 +90,7 @@ function create_pleroma_blocklist {
89 90
     chmod +x $blocking_script_file
90 91
 
91 92
     if ! grep -q "$blocking_script_file" /etc/crontab; then
92
-        echo "*/1            * *   *   *   root $blocking_script_file > /dev/null" >> /etc/crontab
93
+        echo "*/2            * *   *   *   root $blocking_script_file > /dev/null" >> /etc/crontab
93 94
     fi
94 95
 }
95 96