plantroon/acme.sh
1
0
Fork 0
mirror of https://github.com/plantroon/acme.sh.git synced 2024-12-25 14:41:40 +00:00
Code Issues Projects Releases Wiki Activity

fix notify message

Browse Source
This commit is contained in:
neilpang 2019-08-05 22:03:56 +08:00
parent d74dfb1f5c
commit 143eac092c
4 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
acme.sh
View File

@ -5932,7 +5932,8 @@ _send_notify() {
_send_err=0 _send_err=0
for _n_hook in $(echo "$_nhooks" | tr ',' " "); do for _n_hook in $(echo "$_nhooks" | tr ',' " "); do
_n_hook_file="$(_findHook "" $_SUB_FOLDER_NOTIFY "$_n_hook")" _n_hook_file="$(_findHook "" $_SUB_FOLDER_NOTIFY "$_n_hook")"
_info "Found $_n_hook_file for $_n_hook" _info "Sending via: $_n_hook"
_debug "Found $_n_hook_file for $_n_hook"
if [ -z "$_n_hook_file" ]; then if [ -z "$_n_hook_file" ]; then
_err "Can not find the hook file for $_n_hook" _err "Can not find the hook file for $_n_hook"
continue continue
@ -5971,7 +5972,7 @@ _set_notify_hook() {
_nhooks="$1" _nhooks="$1"
_test_subject="Hello, this is notification from $PROJECT_NAME" _test_subject="Hello, this is notification from $PROJECT_NAME"
_test_content="If you receive this email, your notification works." _test_content="If you receive this message, your notification works."
_send_notify "$_test_subject" "$_test_content" "$_nhooks" 0 _send_notify "$_test_subject" "$_test_content" "$_nhooks" 0

12
notify/ifttt.sh
View File

@ -73,13 +73,13 @@ ifttt_send() {
_subject=$(echo "$_subject" | _json_encode) _subject=$(echo "$_subject" | _json_encode)
_data="{\"$IFTTT_SUBJECT_KEY\": \"$_subject\", \"$IFTTT_CONTENT_KEY\": \"$_content\"}" _data="{\"$IFTTT_SUBJECT_KEY\": \"$_subject\", \"$IFTTT_CONTENT_KEY\": \"$_content\"}"
response="" #just make shellcheck happy response="$(_post "$_data" "$IFTTT_API_URL" "" "POST" "application/json")"
if _post "$_data" "$IFTTT_API_URL" "" "POST" "application/json"; then
if _contains "$response" "Congratulations"; then if [ "$?" = "0" ] && _contains "$response" "Congratulations"; then
_info "IFTTT webhooks event fired success." _info "IFTTT webhooks event fired success."
return 0 return 0
fi
fi fi
_err "IFTTT webhooks event fired error." _err "IFTTT webhooks event fired error."
_err "$response" _err "$response"
return 1 return 1

12
notify/pushover.sh
View File

@ -50,13 +50,13 @@ pushover_send() {
_subject="$(printf "*%s*\n" "$_subject" | _json_encode)" _subject="$(printf "*%s*\n" "$_subject" | _json_encode)"
_data="{\"token\": \"$PUSHOVER_TOKEN\",\"user\": \"$PUSHOVER_USER\",\"title\": \"$_subject\",\"message\": \"$_content\",\"sound\": \"$PUSHOVER_SOUND\", \"device\": \"$PUSHOVER_DEVICE\", \"priority\": \"$PUSHOVER_PRIORITY\"}" _data="{\"token\": \"$PUSHOVER_TOKEN\",\"user\": \"$PUSHOVER_USER\",\"title\": \"$_subject\",\"message\": \"$_content\",\"sound\": \"$PUSHOVER_SOUND\", \"device\": \"$PUSHOVER_DEVICE\", \"priority\": \"$PUSHOVER_PRIORITY\"}"
response="" #just make shellcheck happy response="$(_post "$_data" "$PUSHOVER_URI")"
if _post "$_data" "$PUSHOVER_URI"; then
if _contains "$response" "{\"status\":1"; then if [ "$?" = "0" ] && _contains "$response" "{\"status\":1"; then
_info "PUSHOVER send success." _info "PUSHOVER send success."
return 0 return 0
fi
fi fi
_err "PUSHOVER send error." _err "PUSHOVER send error."
_err "$response" _err "$response"
return 1 return 1

12
notify/sendgrid.sh
View File

@ -42,13 +42,13 @@ sendgrid_send() {
_content="$(echo "$_content" | _json_encode)" _content="$(echo "$_content" | _json_encode)"
_data="{\"personalizations\": [{\"to\": [{\"email\": \"$SENDGRID_TO\"}]}],\"from\": {\"email\": \"$SENDGRID_FROM\"},\"subject\": \"$_subject\",\"content\": [{\"type\": \"text/plain\", \"value\": \"$_content\"}]}" _data="{\"personalizations\": [{\"to\": [{\"email\": \"$SENDGRID_TO\"}]}],\"from\": {\"email\": \"$SENDGRID_FROM\"},\"subject\": \"$_subject\",\"content\": [{\"type\": \"text/plain\", \"value\": \"$_content\"}]}"
response="" #just make shellcheck happy response="$(_post "$_data" "https://api.sendgrid.com/v3/mail/send")"
if _post "$_data" "https://api.sendgrid.com/v3/mail/send"; then
if [ -z "$response" ]; then if [ "$?" = "0" ] && [ -z "$response" ]; then
_info "sendgrid send sccess." _info "sendgrid send sccess."
return 0 return 0
fi
fi fi
_err "sendgrid send error." _err "sendgrid send error."
_err "$response" _err "$response"
return 1 return 1