ratatoskr.sh

@@ -232,7 +232,7 @@ done
 bgLoop=0
 while : ; do
    if [[ -n "${since_id}" ]]; then
-        result="$(curl -sS --oauth2-bearer "${oauth_token}" "${instanceURL}/api/v1/timelines/${timeline:-home}" -d "since_id=${since_id}")"
+        result="$(curl -sS --oauth2-bearer "${oauth_token}" "${instanceURL}/api/va/timelines/${timeline:-home}?since_id=${since_id}")"
     else
         result="$(curl -sS --oauth2-bearer "${oauth_token}" "${instanceURL}/api/v1/timelines/${timeline:-home}")"
     fi
@@ -255,18 +255,14 @@ while : ; do
     fi
                                                                                                                                                                 
    # process the response to get the latest event id
-    latest_id="$(jq -r '.[].id' <<< "$result")"
+    latest_id="$(jq -r '.data[0].id' <<< "$result")"
     if [[ "${since_id}" != "${latest_id}" ]]; then
         # handle new events
-        events="$(jq -r '.[].content' <<< "$result")"
-        stripped_events="$(echo "$events" | sed -E 's/<[^>]+>//g')"
-        usernames="$(jq -r '.[].account.username' <<< "$result")"
-        echo -e "$usernames" | while read -r username; do
-            echo "$username: $(echo "$stripped_events" | head -n 1)"
-            stripped_events="$(echo "$stripped_events" | tail -n +2)"
+        events="$(jq -r '.data[] | "\(.account.username): \(.content)"' <<< "$result")"
+        echo -e "$events" | while read -r event; do
+            echo "$event"
             echo
         done
-        play_sound new_${timeline}
         since_id="$latest_id"
     fi
                                                                                                                                                                 
@@ -277,7 +273,7 @@ done &
 # Handle commands
 while : ; do
     # Command prompt:
-    read -er command
+    read -er -p  "<${softwareName}> " command
     if [[ ! "${command}" =~ ^/ ]]; then
         post_status "${command}"
         continue
@@ -287,7 +283,7 @@ while : ; do
             exit 0
         ;;
         *)
-            echo "Error: '${command}' is not a valid command."
+            systemMessage="Error: '${command}' is not a valid command."
             play_sound error
         ;;
     esac