diff --git a/main.js b/main.js index 1662adf..9ed9dd3 100644 --- a/main.js +++ b/main.js @@ -1,14 +1,6 @@ -async function register ({ - registerHook, - registerSetting, - settingsManager, - storageManager, - videoCategoryManager, - videoLicenceManager, - videoLanguageManager, -}) { +async function register({ registerHook }) { registerHook({ - target: 'filter:api.server.stats.get.result', + target: "filter:api.server.stats.get.result", handler: (data) => { if (!data) return {}; @@ -17,26 +9,47 @@ async function register ({ totalDailyActiveUsers, totalWeeklyActiveUsers, totalMonthlyActiveUsers, + totalModerators, + totalAdmins, } = data; + // Remove one from total users if there are more than one if (totalUsers > 1) { totalUsers = totalUsers - 1; } + // Remove one from the moderator count if there are more than one + if (totalModerators > 1) { + totalModerators = totalModerators - 1; + } + + // Remove one from the admin count if there are more than one + if (totalAdmins > 1) { + totalAdmins = totalAdmins - 1; + } + + // Adjust daily active user count if there are more listed than there + // are total users. if (totalDailyActiveUsers > totalUsers) { totalDailyActiveUsers = totalUsers; } + // Adjust weekly active user count if there are more listed than there + // are total users. if (totalWeeklyActiveUsers > totalUsers) { totalWeeklyActiveUsers = totalUsers; } + // Adjust monthly active user count if there are more listed than there + // are total users. if (totalMonthlyActiveUsers > totalUsers) { totalMonthlyActiveUsers = totalUsers; } return { ...data, + totalAdmins, + totalModerators, totalUsers, totalDailyActiveUsers, totalWeeklyActiveUsers, @@ -46,7 +59,7 @@ async function register ({ }); } -async function unregister () { +async function unregister() { return; } diff --git a/package-lock.json b/package-lock.json index 5e6a4b2..3fceda4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,13 @@ { "name": "peertube-plugin-hide-root-user", - "version": "0.5.0", + "version": "0.6.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "peertube-plugin-hide-root-user", - "version": "0.5.0" + "version": "0.6.0", + "license": "AGPL-3.0-or-later" } } } diff --git a/package.json b/package.json index 4b94e10..815ae98 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "peertube-plugin-hide-root-user", "description": "Prevents the \"root\" user from showing up in your PeerTube server's public-facing stats. Useful only when the root account isn't actually being used on your instance.", - "version": "0.5.0", + "version": "0.6.0", "license": "AGPL-3.0-or-later", "author": { "name": "Dave Jansen", @@ -10,7 +10,7 @@ }, "bugs": "https://git.davejansen.com/davejansen/peertube-plugin-hide-root-user/issues", "engine": { - "peertube": ">=6.0.0" + "peertube": ">=7.0.0" }, "homepage": "https://git.davejansen.com/davejansen/peertube-plugin-hide-root-user", "keywords": [ @@ -18,7 +18,6 @@ "plugin" ], "library": "./main.js", - "css": [], "clientScripts": [], "staticDirs": {},