mirrors
/
uptime-kuma
mirror of https://github.com/louislam/uptime-kuma.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix indentation + typo

This commit is contained in:
DeeJayPee 2021-10-05 19:43:04 +02:00
parent 29d0db805d
commit f14a798b2c
2 changed files with 41 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
server/notification-providers/octopush.js
View File

@ -9,52 +9,50 @@ class Octopush extends NotificationProvider {
let okMsg = "Sent Successfully. "; let okMsg = "Sent Successfully. ";
try { try {
// Default - V2 // Default - V2
if (notification.octopushVersion == 2 || !notification.octopushVersion) if (notification.octopushVersion == 2 || !notification.octopushVersion) {
{ let config = {
let config = {
headers: { headers: {
"api-key": notification.octopushAPIKey, "api-key": notification.octopushAPIKey,
"api-login": notification.octopushLogin, "api-login": notification.octopushLogin,
"cache-control": "no-cache" "cache-control": "no-cache"
} }
}; };
let data = { let data = {
"recipients": [ "recipients": [
{ {
"phone_number": notification.octopushPhoneNumber "phone_number": notification.octopushPhoneNumber
} }
], ],
//octopush not supporting non ascii char //octopush not supporting non ascii char
"text": msg.replace(/[^\x00-\x7F]/g, ""), "text": msg.replace(/[^\x00-\x7F]/g, ""),
"type": notification.octopushSMSType, "type": notification.octopushSMSType,
"purpose": "alert", "purpose": "alert",
"sender": notification.octopushSenderName "sender": notification.octopushSenderName
}; };
await axios.post("https://api.octopush.com/v1/public/sms-campaign/send", data, config) await axios.post("https://api.octopush.com/v1/public/sms-campaign/send", data, config)
} } else if (notification.octopushVersion == 1) {
else if (notification.octopushVersion == 1) let data = {
{
let data = {
"user_login": notification.octopushDMLogin, "user_login": notification.octopushDMLogin,
"api_key": notification.octopushDMAPIKey, "api_key": notification.octopushDMAPIKey,
"sms_recipients" : notification.octopushDMPhoneNumber, "sms_recipients": notification.octopushDMPhoneNumber,
"sms_sender": notification.octopushDMSenderName, "sms_sender": notification.octopushDMSenderName,
"sms_type": (notification.octopushDMSMSType == 'sms_premium')?'FR':'XXX', "sms_type": (notification.octopushDMSMSType == "sms_premium") ? "FR" : "XXX",
"transactional": '1', "transactional": "1",
//octopush not supporting non ascii char //octopush not supporting non ascii char
"sms_text": msg.replace(/[^\x00-\x7F]/g, ""), "sms_text": msg.replace(/[^\x00-\x7F]/g, ""),
}; };
let config = { let config = {
headers: { headers: {
"cache-control": "no-cache" "cache-control": "no-cache"
}, },
params: data params: data
}; };
await axios.post("https://www.octopush-dm.com/api/sms/json", {}, config) await axios.post("https://www.octopush-dm.com/api/sms/json", {}, config)
} else } else {
throw new Error('Unknown Octopush version !'); throw new Error("Unknown Octopush version!");
}
return okMsg; return okMsg;
} catch (error) { } catch (error) {

18
src/components/NotificationDialog.vue
View File

@ -244,16 +244,16 @@
</template> </template>
<template v-if="notification.type === 'octopush'"> <template v-if="notification.type === 'octopush'">
<div class="mb-3"> <div class="mb-3">
<label for="octopush-version" class="form-label">Octopush API Version</label> <label for="octopush-version" class="form-label">Octopush API Version</label>
<select id="octopush-version" v-model="notification.octopushVersion" class="form-select"> <select id="octopush-version" v-model="notification.octopushVersion" class="form-select">
<option value="2">V2</option> <option value="2">V2</option>
<option value="1">V1 (Legacy Octopush-DM)</option> <option value="1">V1 (Legacy Octopush-DM)</option>
</select> </select>
<div class="form-text"> <div class="form-text">
Do you use the legacy version of Octopush (2011-2020) or the new version ? Do you use the legacy version of Octopush (2011-2020) or the new version ?
</div> </div>
</div> </div>
<div class="mb-3"> <div class="mb-3">
<label for="octopush-key" class="form-label">API KEY</label> <label for="octopush-key" class="form-label">API KEY</label>
<HiddenInput id="octopush-key" v-model="notification.octopushAPIKey" :required="true" autocomplete="one-time-code"></HiddenInput> <HiddenInput id="octopush-key" v-model="notification.octopushAPIKey" :required="true" autocomplete="one-time-code"></HiddenInput>