Support activeMonth and activeHalfyear in nodeinfo

This commit is contained in:
Chocobozzz 2020-12-30 11:41:36 +01:00
parent a046453549
commit 47d8e266f1
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
3 changed files with 9 additions and 3 deletions

View File

@ -206,7 +206,7 @@ export {
async function generateNodeinfo (req: express.Request, res: express.Response) {
const { totalVideos } = await VideoModel.getStats()
const { totalLocalVideoComments } = await VideoCommentModel.getStats()
const { totalUsers } = await UserModel.getStats()
const { totalUsers, totalMonthlyActiveUsers, totalHalfYearActiveUsers } = await UserModel.getStats()
let json = {}
if (req.params.version && (req.params.version === '2.0')) {
@ -229,7 +229,9 @@ async function generateNodeinfo (req: express.Request, res: express.Response) {
openRegistrations: CONFIG.SIGNUP.ENABLED,
usage: {
users: {
total: totalUsers
total: totalUsers,
activeMonth: totalMonthlyActiveUsers,
activeHalfyear: totalHalfYearActiveUsers
},
localPosts: totalVideos,
localComments: totalLocalVideoComments

View File

@ -794,12 +794,14 @@ export class UserModel extends Model {
const totalDailyActiveUsers = await getActiveUsers(1)
const totalWeeklyActiveUsers = await getActiveUsers(7)
const totalMonthlyActiveUsers = await getActiveUsers(30)
const totalHalfYearActiveUsers = await getActiveUsers(180)
return {
totalUsers,
totalDailyActiveUsers,
totalWeeklyActiveUsers,
totalMonthlyActiveUsers
totalMonthlyActiveUsers,
totalHalfYearActiveUsers
}
}

View File

@ -110,6 +110,8 @@ describe('Test misc endpoints', function () {
})
expect(res.body.software.name).to.equal('peertube')
expect(res.body.usage.users.activeMonth).to.equal(1)
expect(res.body.usage.users.activeHalfyear).to.equal(1)
})
})