From 201025ff771e8481a19017c9a59402d2496109a6 Mon Sep 17 00:00:00 2001 From: localhost_frssoft Date: Sun, 8 May 2022 18:24:53 +0300 Subject: [PATCH] Fixes send post; Maybe fix mentions --- pleroma-cli.sh | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/pleroma-cli.sh b/pleroma-cli.sh index 3e1459f..86b111f 100755 --- a/pleroma-cli.sh +++ b/pleroma-cli.sh @@ -734,24 +734,20 @@ write_api_status() { if [ -n "$mediaattach" ]; then media=$(upload_api_media | jj id) - post_request -w "%{http_code}" --url "$instance_point"/statuses \ - --data-urlencode "status=$1" \ - --data-urlencode "content_type=$content_type" \ - --data-urlencode "visibility=$status_visibility" \ - --data-urlencode "in_reply_to_id=$replyto" \ - --data-urlencode "media_ids[]=$media" \ - --data-urlencode "to[]=$mentions_reply" \ - --output /dev/null - echo "$http_code" + post_request --url "$instance_point"/statuses \ + --data-urlencode "status@$1" \ + --data-raw "content_type=$content_type" \ + --data-raw "visibility=$status_visibility" \ + --data-raw "in_reply_to_id=$replyto" \ + --data-raw "media_ids[]=$media" \ + --data-raw "to[]=$mentions_reply" else - post_request -w "%{http_code}" --url "$instance_point"/statuses \ - --data-urlencode "status=$1" \ - --data-urlencode "content_type=$content_type" \ - --data-urlencode "visibility=$status_visibility" \ - --data-urlencode "in_reply_to_id=$replyto" \ - --data-urlencode "to[]=$mentions_reply" \ - --output /dev/null - echo "$http_code" + post_request --url "$instance_point"/statuses \ + --data-urlencode "status@$1" \ + --data-raw "content_type=$content_type" \ + --data-raw "visibility=$status_visibility" \ + --data-raw "in_reply_to_id=$replyto" \ + --data-raw "to[]=$mentions_reply" fi } @@ -768,7 +764,7 @@ write_status_menu() status_visibility="$default_visibility" replyto=$1 mediaattach= - http_code= + status_data_send= if [ -n "$sub_menu_lvl" ]; then sub_menu_lvl=2 level=2 @@ -793,13 +789,15 @@ write_status_menu() if [ -n "$mediaattach" ]; then echo "Attachments: $mediaattach" fi - if [ -n "$http_code" ]; then - echo "Send state: $http_code" + if [ -n "$(echo "$status_data_send" | jj id)" ]; then + echo 'Send state: OK' + elif [ -n "$(echo "$status_data_send" | jj error)" ]; then + echo "Send state: ERR: $(echo "$status_data_send" | jj error)" fi wrirepostmenu=$(echo "Edit\nSend\nAdd attach\nAdd recipient\nChange type\nVisiblity\nReset\nBack\nMain menu" | fzy) case $wrirepostmenu in "Edit") $EDITOR tmp_status.md ;; - "Send") http_code=$(write_api_status "$(cat tmp_status.md)") ;; + "Send") status_data_send=$(write_api_status tmp_status.md) ;; "Add attach") echo 'Input path to attach (ex. @image.png or @/full/path/to/attach.png)' read mediaattach