Merge 64f528456d into d2f71d11d6

Update API URL to compatible with the latest version of ServerChan (#5227 )
2024-11-27 16:54:04 +00:00 · 2024-10-22 08:49:03 +00:00 · 2024-10-22 10:48:51 +02:00
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 {
Author	SHA1	Message	Date
Dj Isaac	3d5c497f5a	Merge `64f528456d` into `d2f71d11d6`	2024-10-22 08:49:03 +00:00
Easy	d2f71d11d6	Update API URL to compatible with the latest version of ServerChan (#5227 ) Some checks are pending Auto Test / auto-test (18, ARM64) (push) Blocked by required conditions Details Auto Test / auto-test (18, macos-latest) (push) Blocked by required conditions Details Auto Test / auto-test (18, ubuntu-latest) (push) Blocked by required conditions Details Auto Test / auto-test (18, windows-latest) (push) Blocked by required conditions Details Auto Test / auto-test (20, ARM64) (push) Blocked by required conditions Details Auto Test / auto-test (20, macos-latest) (push) Blocked by required conditions Details Auto Test / auto-test (20, ubuntu-latest) (push) Blocked by required conditions Details Auto Test / auto-test (20, windows-latest) (push) Blocked by required conditions Details Auto Test / armv7-simple-test (18, ARMv7) (push) Waiting to run Details Auto Test / armv7-simple-test (20, ARMv7) (push) Waiting to run Details Auto Test / check-linters (push) Waiting to run Details Auto Test / e2e-test (push) Waiting to run Details CodeQL / Analyze (push) Waiting to run Details Merge Conflict Labeler / Labeling (push) Waiting to run Details json-yaml-validate / json-yaml-validate (push) Waiting to run Details	2024-10-22 10:48:51 +02:00