Merge remote-tracking branch 'origin/master'

This commit is contained in:
LouisLam 2021-09-13 20:06:24 +08:00
commit 0e16e88fa8
2 changed files with 15 additions and 0 deletions

View file

@ -62,6 +62,11 @@ class Discord extends NotificationProvider {
], ],
}], }],
} }
if (notification.discordPrefixMessage) {
discorddowndata.content = notification.discordPrefixMessage;
}
await axios.post(notification.discordWebhookUrl, discorddowndata) await axios.post(notification.discordWebhookUrl, discorddowndata)
return okMsg; return okMsg;
@ -92,6 +97,11 @@ class Discord extends NotificationProvider {
], ],
}], }],
} }
if (notification.discordPrefixMessage) {
discordupdata.content = notification.discordPrefixMessage;
}
await axios.post(notification.discordWebhookUrl, discordupdata) await axios.post(notification.discordWebhookUrl, discordupdata)
return okMsg; return okMsg;
} }

View file

@ -80,6 +80,11 @@
<label for="discord-username" class="form-label">Bot Display Name</label> <label for="discord-username" class="form-label">Bot Display Name</label>
<input id="discord-username" v-model="notification.discordUsername" type="text" class="form-control" autocomplete="false" :placeholder="$root.appName"> <input id="discord-username" v-model="notification.discordUsername" type="text" class="form-control" autocomplete="false" :placeholder="$root.appName">
</div> </div>
<div class="mb-3">
<label for="discord-prefix-message" class="form-label">Prefix Custom Message</label>
<input id="discord-prefix-message" v-model="notification.discordPrefixMessage" type="text" class="form-control" autocomplete="false" placeholder="Hello @everyone is...">
</div>
</template> </template>
<template v-if="notification.type === 'signal'"> <template v-if="notification.type === 'signal'">