From 44f7088c69a67e014f24eedea7706291cf6bf2a0 Mon Sep 17 00:00:00 2001 From: Vio Ao Date: Mon, 9 Sep 2019 16:29:11 +0800 Subject: [PATCH 1/4] Add support for absolute database path config --- src/auth.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/auth.js b/src/auth.js index 5ba5c22..dbce6bc 100644 --- a/src/auth.js +++ b/src/auth.js @@ -23,7 +23,7 @@ function init(app, db, domain) { saveUninitialized: false, secret: authConfig.secret, cookie: { domain: `.${domain}` }, - store: new SQLiteStore({ db: config.get('database').sessions }) + store: new SQLiteStore(getSessionStoreOption()) }) ); @@ -284,6 +284,15 @@ function getAuthorUrl(comment) { } } +function getSessionStoreOption() { + var sessions = config.get('database').sessions; + if (path.isAbsolute(sessions)) { + var option = path.parse(sessions); + return { dir: option.dir, db: option.name }; + } + return { db: sessions }; +} + module.exports = { init, providers, From 35d8fd56c18d70212823e25ab1900fa13166bc4f Mon Sep 17 00:00:00 2001 From: Vio Ao Date: Mon, 9 Sep 2019 18:18:29 +0800 Subject: [PATCH 2/4] Fix sessions database filename problem --- src/auth.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/auth.js b/src/auth.js index dbce6bc..9f32f9c 100644 --- a/src/auth.js +++ b/src/auth.js @@ -288,7 +288,7 @@ function getSessionStoreOption() { var sessions = config.get('database').sessions; if (path.isAbsolute(sessions)) { var option = path.parse(sessions); - return { dir: option.dir, db: option.name }; + return { dir: option.dir, db: option.base }; } return { db: sessions }; } From c20b3de6c175fd57c2c842af666768ff3be81576 Mon Sep 17 00:00:00 2001 From: Vioao Date: Wed, 18 Sep 2019 23:07:25 +0800 Subject: [PATCH 3/4] Slack push support muti urls --- src/push/slack.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/push/slack.js b/src/push/slack.js index e0c6a41..e7bb31e 100644 --- a/src/push/slack.js +++ b/src/push/slack.js @@ -15,12 +15,12 @@ if (notify.slack) { .join('\n>\n'); const text = `A <${post_url}|new comment> was posted by ${event.user.display_name || event.user.name} under *${event.slug}*:\n\n${comment}`; - request({ - url: notify.slack.webhook_url, + notify.slack.webhook_urls.forEach( webhook_url => request({ + url: webhook_url, method: 'post', json: true, body: { text } - }); + })); } catch (error) { console.error('Error sending slack notification:', error); } From 862b91f143ef8a391da72632fb46cc790a2ff5ac Mon Sep 17 00:00:00 2001 From: Vioao Date: Wed, 18 Sep 2019 23:08:40 +0800 Subject: [PATCH 4/4] Slack push support muti urls --- config.tpl.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.tpl.json b/config.tpl.json index 4fe9785..372960c 100644 --- a/config.tpl.json +++ b/config.tpl.json @@ -40,7 +40,7 @@ "vapid_private_key": "xxxxx" }, "slack": { - "webhook_url": "xxxxx" + "webhook_urls": ["xxxxx1","xxxxx2"] } }, "date_format": "MMMM DD, YYYY - h:mm a"