Merge df2f76dbe3 into d2f71d11d6

Update API URL to compatible with the latest version of ServerChan (#5227 )
WIP
2024-11-23 14:54:05 +00:00 · 2024-10-22 08:49:02 +00:00 · 2024-10-22 10:48:51 +02:00 · 2023-08-18 02:16:38 +08:00
2 changed files with 11 additions and 2 deletions
--- a/server/model/heartbeat.js
+++ b/server/model/heartbeat.js
@ -40,6 +40,14 @@ class Heartbeat extends BeanModel {
        };
    }

+    /**
+     * TODO: Find the msg from the `msg` table and get the msg_id
+     * @param value
+     */
+    set msg(value) {
+        throw new Error("Not implemented yet")
+    }
+
 }

 module.exports = Heartbeat;
--- 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
Louis Lam	1ef0c51783	Merge `df2f76dbe3` into `d2f71d11d6`	2024-10-22 08:49:02 +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
Louis Lam	df2f76dbe3	WIP	2023-08-18 02:16:38 +08:00