storm/ratatoskr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updates to the music function so that it now uses the post_status function to do the actual work of posting. Fixed problems of visibility not respecting the setting.

Browse Source
This commit is contained in:
Storm Dragon 2024-05-12 17:33:49 -04:00
parent 220d5c3d30
commit 5eff83b3ca
1 changed files with 10 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
ratatoskr.sh
View File

@ -63,7 +63,7 @@ play_sound() {
declare -A sounds=( declare -A sounds=(
[error]="|sox -n -p synth saw E2 fade 0 0.25 0.05 repeat norm -7" [error]="|sox -n -p synth saw E2 fade 0 0.25 0.05 repeat norm -7"
[music]="|sox -np synth pl E2 pl B2 overdrive 100 remix - overdrive 100 fade h .25 1 .25 norm -11" [music]="|sox -np synth pl E2 pl B2 overdrive 100 remix - overdrive 100 fade h .25 1 .25 norm -11"
[post]='|sox -np synth .05 tri C2:C7' [status]='|sox -np synth .05 tri C2:C7'
) )
if [[ -n "${sounds[${soundName}]}" ]]; then if [[ -n "${sounds[${soundName}]}" ]]; then
sox -qV0 "${sounds[${soundName}]}" -d gain -9 &> /dev/null & sox -qV0 "${sounds[${soundName}]}" -d gain -9 &> /dev/null &
@ -113,25 +113,9 @@ post_music() {
if [[ "${link}" =~ ^file:// ]]; then if [[ "${link}" =~ ^file:// ]]; then
link="https://www.youtube.com/results?search_query=$(playerctl metadata -f '{{artist}} {{title}}' | urlencode -b)" link="https://www.youtube.com/results?search_query=$(playerctl metadata -f '{{artist}} {{title}}' | urlencode -b)"
fi fi
local json=$(jq -n --arg status "[${text}](${link})" --arg spoiler_text "Music" --arg content_type "text/markdown" '{status: $status, spoiler_text: $spoiler_text, content_type: $content_type}') statusSpoiler_text="Music"
local result postType="music"
result="$(curl -sS --oauth2-bearer "${oauth_token}" -H "Content-Type: application/json" \ post_status "[${text}](${link})"
-d "$json" \
"${instanceURL}/api/v1/statuses")"
# Check for errors
if [[ $? -ne 0 ]]; then
echo "there was a problem contacting the server"
play_sound error
exit 1
fi
local error="$(echo "$result" | jq -r '.error')"
if [[ "$error" != "null" ]]; then
echo "Error: $error"
play_sound error
exit 1
fi
echo "Music posted!"
play_sound music
} }
@ -140,10 +124,10 @@ post_status() {
if [[ "${*}" == "" ]]; then if [[ "${*}" == "" ]]; then
return return
fi fi
postType="${postType:-status}"
local statusText="$*" local statusText="$*"
local statusVisibility="${statusVisibility:-public}" statusVisibility="${statusVisibility:-public}"
local statusContent_type="${statusContent_type:-text/markdown}" statusContent_type="${statusContent_type:-text/markdown}"
local statusSpoiler_text=""
local statusJson="$(jq -n --arg status "$statusText" \ local statusJson="$(jq -n --arg status "$statusText" \
--arg spoiler_text "$statusSpoiler_text" \ --arg spoiler_text "$statusSpoiler_text" \
--arg visibility "$statusVisibility" \ --arg visibility "$statusVisibility" \
@ -164,8 +148,8 @@ post_status() {
play_sound error play_sound error
exit 1 exit 1
fi fi
echo "Status posted!" echo "${postType^} posted!"
play_sound post play_sound "${postType}"
} }
@ -224,9 +208,6 @@ eval set -- "$options"
while [[ $# -gt 0 ]]; do while [[ $# -gt 0 ]]; do
case $1 in case $1 in
--)
shift
break;;
-C) -C)
get_oauth_token get_oauth_token
shift;; shift;;
@ -244,7 +225,7 @@ while [[ $# -gt 0 ]]; do
post_status "$(cat)" post_status "$(cat)"
else else
shift 3 shift 3
#post_status "$@" post_status "$@"
fi fi
exit 0;; exit 0;;
-S) -S)