Skip to content

ActivityPub-federated video streaming platform using P2P directly in your web browser

Add filter:notifier.notification.enabled.result

Chocobozzzca980134ea4c
diff --git a/packages/models/src/plugins/server/server-hook.model.ts b/packages/models/src/plugins/server/server-hook.model.ts
index 7139a01e67..d5f93ec7d4 100644
--- a/packages/models/src/plugins/server/server-hook.model.ts
+++ b/packages/models/src/plugins/server/server-hook.model.ts
@@ -154,8 +154,12 @@ export const serverFilterHookObject = {
'filter:email.subject.result': true,
'filter:email.template-path.result': true,
- // Peertube >= 8.1
- 'filter:feed.videos.list.result': true,
+ // Filter notifications enabled state
+ // Peertube >= 8.2
+ 'filter:notifier.notification.enabled.result': true,
+
+ // PeerTube >= 8.1
+ 'filter:feed.videos.list.result': true
}
export type ServerFilterHookName = keyof typeof serverFilterHookObject
@@ -239,5 +243,5 @@ export const serverHookObject = Object.assign({}, serverFilterHookObject, server
export type ServerHookName = keyof typeof serverHookObject
export interface ServerHook {
- runHook <T> (hookName: ServerHookName, result?: T, params?: any): Promise<T>
+ runHook<T>(hookName: ServerHookName, result?: T, params?: any): Promise<T>
}
diff --git a/packages/tests/fixtures/peertube-plugin-test/main.js b/packages/tests/fixtures/peertube-plugin-test/main.js
index 6d2252a6b6..47af044917 100644
--- a/packages/tests/fixtures/peertube-plugin-test/main.js
+++ b/packages/tests/fixtures/peertube-plugin-test/main.js
@@ -533,6 +533,8 @@ async function register ({ registerHook, registerSetting, settingsManager, stora
'filter:api.overviews.videos.list.params',
'filter:api.overviews.videos.list.result',
+ 'filter:notifier.notification.enabled.result',
+
'filter:job-queue.process.params',
'filter:job-queue.process.result'
]
diff --git a/packages/tests/src/plugins/filter-hooks.ts b/packages/tests/src/plugins/filter-hooks.ts
index 964054f2f4..211f70f6f8 100644
--- a/packages/tests/src/plugins/filter-hooks.ts
+++ b/packages/tests/src/plugins/filter-hooks.ts
@@ -988,6 +988,16 @@ describe('Test plugin filter hooks', function () {
})
})
+ describe('Notifications', function () {
+ it('Should run filter:notifier.notification.enabled.result', async function () {
+ await servers[0].videos.quickUpload({ name: 'notification hook video' })
+
+ await waitJobs(servers)
+
+ await servers[0].servers.waitUntilLog('Run hook filter:notifier.notification.enabled.result', 1, false)
+ })
+ })
+
after(async function () {
await MockSmtpServer.Instance.kill()
diff --git a/server/core/lib/notifier/notifier.ts b/server/core/lib/notifier/notifier.ts
index 6144fb60eb..826ca49bf4 100644
--- a/server/core/lib/notifier/notifier.ts
+++ b/server/core/lib/notifier/notifier.ts
@@ -442,10 +442,17 @@ class Notifier {
for (const user of users) {
const setting = object.getSetting(user)
- const webNotificationEnabled = this.isWebNotificationEnabled(setting)
- const emailNotificationEnabled = this.isEmailEnabled(user, setting)
const notification = object.createNotification(user)
+ const { webNotificationEnabled, emailNotificationEnabled } = await Hooks.wrapObject(
+ {
+ webNotificationEnabled: this.isWebNotificationEnabled(setting),
+ emailNotificationEnabled: this.isEmailEnabled(user, setting)
+ },
+ 'filter:notifier.notification.enabled.result',
+ { user, notification }
+ )
+
if (webNotificationEnabled) {
await notification.save()