From 3ced170a0a722b838d37fc3503117159fb0d103b Mon Sep 17 00:00:00 2001 From: localhost_frssoft Date: Sun, 17 Apr 2022 22:23:18 +0300 Subject: [PATCH] Notifications improvments: count of new notifications and read function --- pleroma-cli.sh | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/pleroma-cli.sh b/pleroma-cli.sh index 79c9a9a..dcee0e2 100755 --- a/pleroma-cli.sh +++ b/pleroma-cli.sh @@ -640,19 +640,25 @@ notif_menu() json=$(notif_api_get_all) while [ $sub_menu_lvl -eq 1 ]; do clear - echo "Notifications: $(echo $json | jj \#)" + count_new_notif=$(echo $json | jj -l '#[pleroma.is_seen=false]#.pleroma.is_seen' | wc -w) + echo "New notifications: $count_new_notif" for i in $(echo $json | jj -l \#.id); do date_utc=$(echo $json | jj \#[id=$i].created_at) date -d "$date_utc" "$format_time" acct=$(echo $json | jj \#[id=$i].account.acct) + status_id=$(echo $json | jj \#[id=$i].status.id) typenotif=$(echo $json | jj \#[id=$i].type) - echo "$typenotif <- $acct" - echo $json | jj \#[id=$i].status.pleroma.content.text/plain + echo "<$status_id> $typenotif <- $acct" + echo $json | jj -r \#[id=$i].status.content | delqse | html_to_txt_render echo '___' done - menu_choice=$(echo "Main menu\nRefresh\n$clrnotif" | fzy) + menu_choice=$(echo "Main menu\nRead\nRefresh\n$clrnotif" | fzy) case "$menu_choice" in "Main menu") sub_menu_lvl=0 ;; + "Read") + notif_api_read "$(echo $json | jj 0.id)" + json=$(notif_api_get_all) + ;; "Refresh") json=$(notif_api_get_all) ;; "$clrnotif") notif_api_remove_all && json=$(notif_api_get_all) ;; esac @@ -661,7 +667,14 @@ notif_menu() notif_api_get_all() { - default_curl_opt "$instance_point/notifications" | jj -p + default_curl_opt "$instance_point/notifications?limit=$max_statuses" | jj -p +} + +notif_api_read() +{ + post_request --url "$instance_point/pleroma/notifications/read" \ + --data-urlencode "max_id=$1" \ + --output /dev/null } notif_api_remove_all()