Merge branch 'master' into master

2 months ago · e22b22ab49
parent 6e93ed1392 d2f71d11d6
commit e22b22ab49
1 changed files with 3 additions and 2 deletions
--- a/server/notification-providers/serverchan.js
+++ b/server/notification-providers/serverchan.js
@ -12,8 +12,9 @@ class ServerChan extends NotificationProvider {
        const okMsg = "Sent Successfully.";

        // serverchan3 requires sending via ft07.com
-        const url = String(notification.serverChanSendKey).startsWith("sctp")
-            ? `https://${notification.serverChanSendKey}.push.ft07.com/send`
+        const matchResult = String(notification.serverChanSendKey).match(/^sctp(\d+)t/i);
+        const url = matchResult && matchResult[1]
+            ? `https://${matchResult[1]}.push.ft07.com/send/${notification.serverChanSendKey}.send`
            : `https://sctapi.ftqq.com/${notification.serverChanSendKey}.send`;

        try {