Merge 79895d455a into d2f71d11d6

Update API URL to compatible with the latest version of ServerChan (#5227 )
fix(db): increase the DNS allowed response size
2024-11-23 14:54:05 +00:00 · 2024-10-22 08:49:03 +00:00 · 2024-10-22 10:48:51 +02:00 · 2024-07-11 13:35:09 +01:00
2 changed files with 4 additions and 3 deletions
--- a/db/knex_init_db.js
+++ b/db/knex_init_db.js
@ -86,7 +86,7 @@ async function createTables() {
        table.text("accepted_statuscodes_json").notNullable().defaultTo("[\"200-299\"]");
        table.string("dns_resolve_type", 5);
        table.string("dns_resolve_server", 255);
-        table.string("dns_last_result", 255);
+        table.string("dns_last_result", 2000);
        table.integer("retry_interval").notNullable().defaultTo(0);
        table.string("push_token", 20).defaultTo(null);
        table.text("method").notNullable().defaultTo("GET");
--- 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
Gustavo Valverde	269631d65b	Merge `79895d455a` 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
Gustavo Valverde	79895d455a	fix(db): increase the DNS allowed response size Some DNS servers might reply with several IP addresses. This avoids errors like the following: ``` Failing: UPDATE `monitor` SET dns_last_result = 'Records: X' WHERE id = 1 - Data too long for column 'dns_last_result' at row 1 ```	2024-07-11 13:35:09 +01:00