free
/
freedombonee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve user blocking in pleroma

This commit is contained in:
Bob Mottram 2018-06-11 19:10:51 +01:00
parent 2a68cf0ef3
commit 67e6ceadb7
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/freedombone-app-pleroma
View File

@ -140,6 +140,14 @@ function create_pleroma_blocklist {
echo ' fi'; echo ' fi';
echo " websub_server_subscriptions_query=\"\${websub_server_subscriptions_query} callback like '%\${blocked}%'\""; echo " websub_server_subscriptions_query=\"\${websub_server_subscriptions_query} callback like '%\${blocked}%'\"";
echo ' websub_server_subscriptions_updated=1'; echo ' websub_server_subscriptions_updated=1';
echo ' else';
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 ' fi'; echo ' fi';
echo ' fi'; echo ' fi';
echo ' fi'; echo ' fi';
@ -158,14 +166,14 @@ function create_pleroma_blocklist {
echo ' fi'; echo ' fi';
echo 'fi'; echo 'fi';
echo ''; echo '';
echo 'cd /etc/postgresql'; echo '#cd /etc/postgresql';
echo "if [ \$objects_updated ]; then"; echo "#if [ \$objects_updated ]; then";
echo " sudo -u postgres psql -d pleroma -c \"\$objects_query\""; echo "# sudo -u postgres psql -d pleroma -c \"\$objects_query\"";
echo " sudo -u postgres psql -d pleroma -c \"\$users_query\""; echo "# sudo -u postgres psql -d pleroma -c \"\$users_query\"";
echo 'fi'; echo '#fi';
echo "if [ \$websub_server_subscriptions_updated ]; then"; echo "#if [ \$websub_server_subscriptions_updated ]; then";
echo " sudo -u postgres psql -d pleroma -c \"\$websub_server_subscriptions_query\""; echo "# sudo -u postgres psql -d pleroma -c \"\$websub_server_subscriptions_query\"";
echo 'fi'; echo '#fi';
echo 'rm /tmp/pleroma-blocking.lock'; } > $blocking_script_file echo 'rm /tmp/pleroma-blocking.lock'; } > $blocking_script_file
chmod +x $blocking_script_file chmod +x $blocking_script_file