notwa/rc
1
0
Fork 0
mirror of https://github.com/notwa/rc synced 2025-02-05 07:43:22 -08:00
Code Issues Releases Wiki Activity

finish discord and .conf file support in notice

Browse source
This commit is contained in:
Connor Olding 2024-07-09 07:51:31 -07:00
parent 2e576ee514
commit 16f38ef1e4
1 changed files with 26 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
sh/notice
View file

@ -315,16 +315,32 @@ __notice_upload() {
return 0 return 0
} }
__notice_read_conf() {
# TODO: ensure conf file is unreadable by others?
while read -r line; do
line="${line%%#*}" # strip comments
line="${line#"${line%%[! ]*}"}" # strip left
line="${line%"${line##*[! ]}"}" # strip right
if [ "${line#gotify=}" != "$line" ]; then
__notice_push_to_gotify "${line#*=}"
elif [ "${line#discord=}" != "$line" ]; then
__notice_push_to_discord "${line#*=}"
elif [ -n "$line" ]; then
__notice_warn "warning: ignoring line: $line"
fi
done < "$1"
}
__notice() { __notice() {
unset LC_ALL REPLY aux code extras message normal title token url unset LC_ALL REPLY aux code conf extras line message normal title token url
export LC_ALL=C export LC_ALL=C
: "${XDG_CONFIG_HOME:="$HOME/.config"}" conf="${XDG_CONFIG_HOME:-"$HOME/.config"}/notice.conf"
lament() { printf >&2 %s\\n "$@"; } lament() { printf >&2 %s\\n "$@"; }
url='https://eaguru.guru/gotify/message?token=' url='https://eaguru.guru/gotify/message?token='
if [ -e ~/.gotify.secret ]; then if ! [ -e "$conf" ] && [ -e ~/.gotify.secret ]; then
lament 'notice: warning: ~/.gotify.secret is being phased out in favor of' lament 'notice: warning: ~/.gotify.secret is being phased out in favor of'
lament ' '"$XDG_CONFIG_HOME"'/notice.conf containing a list of URLs:' lament ' '"$conf"' containing a list of URLs:'
lament ' gotify=https://example.com/gotify/message?token=secret' lament ' gotify=https://example.com/gotify/message?token=secret'
read -r token <~/.gotify.secret read -r token <~/.gotify.secret
fi fi
@ -342,7 +358,11 @@ __notice() {
lament "$normal" lament "$normal"
fi fi
[ -z "$token" ] || __notice_push_to_gotify "$url$token" if [ -e "$conf" ]; then
__notice_read_conf "$conf"
elif [ -n "$token" ]; then
__notice_push_to_gotify "$url$token"
fi
} }
__notice_push_to_gotify() { __notice_push_to_gotify() {
@ -372,7 +392,6 @@ __notice_push_to_discord() {
set -- -qLo /dev/null -w '%{http_code}' "$@" set -- -qLo /dev/null -w '%{http_code}' "$@"
if [ -n "$REPLY" ]; then if [ -n "$REPLY" ]; then
set -- "$@" --data '{"content": "# New file uploaded\n\n'"$REPLY"'", "flags": 2}' set -- "$@" --data '{"content": "# New file uploaded\n\n'"$REPLY"'", "flags": 2}'
set -- "$@" -H 'Content-Type: application/json'
elif [ -z "$title" ]; then elif [ -z "$title" ]; then
set -- "$@" --data '{"content": "'"$message"'", "flags": 2}' set -- "$@" --data '{"content": "'"$message"'", "flags": 2}'
elif [ -z "$message" ]; then elif [ -z "$message" ]; then
@ -380,6 +399,7 @@ __notice_push_to_discord() {
else else
set -- "$@" --data '{"content": "# '"$title"'\n\n'"$message"'", "flags": 2}' set -- "$@" --data '{"content": "# '"$title"'\n\n'"$message"'", "flags": 2}'
fi fi
set -- "$@" -H 'Content-Type: application/json'
set -- "$@" -H "Accept: application/json" set -- "$@" -H "Accept: application/json"
if code="$(__notice_curl "$@")" && { [ "$code" = 200 ] || [ "$code" = 204 ]; }; then if code="$(__notice_curl "$@")" && { [ "$code" = 200 ] || [ "$code" = 204 ]; }; then