diff --git a/bot.sh b/bot.sh index e8c76e4..71edc2f 100644 --- a/bot.sh +++ b/bot.sh @@ -45,23 +45,23 @@ done } scalps(){ -data=$STATS_MESSAGE users=( $(echo "select nickname from users where ap_id like '%${ENDPOINT}%';" | PGPASSWORD=sql psql -h $SQL_HOST -U $SQL_USER $SQL_DATABASE --csv | egrep -vi 'relay|nickname|internal.fetch') ); - +echo > /tmp/a.txt for i in "${users[@]}" do : - number=`echo "select * from activities where data->>'type' = 'Block';" | PGPASSWORD=$SQL_PASS psql -h $SQL_HOST -U $SQL_USER $SQL_DATABASE | grep -i $i | cut -d '"' -f18 | grep -iv $ENDPOINT | wc -l` - if [ $number -gt 0 ]; - then - data=$data" @$i: ` echo "select * from activities where data->>'type' = 'Block';" | PGPASSWORD=$SQL_PASS psql -h $SQL_HOST -U $SQL_USER $SQL_DATABASE | grep -i $i | cut -d '"' -f18 | grep -iv $ENDPOINT | wc -l`! " - fi + number=`echo "select * from activities where data->>'type' = 'Block';" | PGPASSWORD=$SQL_PASS psql -h $SQL_HOST -U $SQL_USER $SQL_DATABASE | grep -i "$ENDPOINT/users/$i" | cut -d '"' -f18 | grep -iv $ENDPOINT | wc -l` + if [ $number -gt 1 ]; + then + echo "@$i: ` echo "select * from activities where data->>'type' = 'Block';" | PGPASSWORD=$SQL_PASS psql -h $SQL_HOST -U $SQL_USER $SQL_DATABASE | grep -i "$ENDPOINT/users/$i" | cut -d '"' -f18 | grep -iv $ENDPOINT | wc -l`! " >> /tmp/a.txt + fi done + data="$STATS_MESSAGE `cat /tmp/a.txt | sort -n -k 2`" if [ -n "$1" ]; then - echo "$data" + echo $data else - toot post "$data" + echo $data | toot post "$data" fi } @@ -78,7 +78,7 @@ background_daemon(){ echo "Checking for new blocks.......";echo blocks fi - if [[ `date` == *"10:10:"* ]]; then + if [[ `date` == *"16:30:"* ]]; then echo "Sending Block Report.......";echo scalps fi