Verified Commit ec908b4a authored by Chocobozzz's avatar Chocobozzz
Browse files

Fix nodeinfo endpoint

parent 99cb53fd
...@@ -161,143 +161,144 @@ async function generateNodeinfo (req: express.Request, res: express.Response) { ...@@ -161,143 +161,144 @@ async function generateNodeinfo (req: express.Request, res: express.Response) {
const { totalLocalVideoComments } = await VideoCommentModel.getStats() const { totalLocalVideoComments } = await VideoCommentModel.getStats()
const { totalUsers, totalMonthlyActiveUsers, totalHalfYearActiveUsers } = await UserModel.getStats() const { totalUsers, totalMonthlyActiveUsers, totalHalfYearActiveUsers } = await UserModel.getStats()
if (req.params.version && (req.params.version === '2.0')) { if (!req.params.version || req.params.version !== '2.0') {
const json = { return res.fail({
version: '2.0', status: HttpStatusCode.NOT_FOUND_404,
software: { message: 'Nodeinfo schema version not handled'
name: 'peertube', })
version: PEERTUBE_VERSION }
const json = {
version: '2.0',
software: {
name: 'peertube',
version: PEERTUBE_VERSION
},
protocols: [
'activitypub'
],
services: {
inbound: [],
outbound: [
'atom1.0',
'rss2.0'
]
},
openRegistrations: CONFIG.SIGNUP.ENABLED,
usage: {
users: {
total: totalUsers,
activeMonth: totalMonthlyActiveUsers,
activeHalfyear: totalHalfYearActiveUsers
}, },
protocols: [ localPosts: totalVideos,
'activitypub' localComments: totalLocalVideoComments
], },
services: { metadata: {
inbound: [], taxonomy: {
outbound: [ postsName: 'Videos'
'atom1.0',
'rss2.0'
]
}, },
openRegistrations: CONFIG.SIGNUP.ENABLED, nodeName: CONFIG.INSTANCE.NAME,
usage: { nodeDescription: CONFIG.INSTANCE.SHORT_DESCRIPTION,
users: { nodeConfig: {
total: totalUsers, search: {
activeMonth: totalMonthlyActiveUsers, remoteUri: {
activeHalfyear: totalHalfYearActiveUsers users: CONFIG.SEARCH.REMOTE_URI.USERS,
anonymous: CONFIG.SEARCH.REMOTE_URI.ANONYMOUS
}
}, },
localPosts: totalVideos, plugin: {
localComments: totalLocalVideoComments registered: ServerConfigManager.Instance.getRegisteredPlugins()
},
metadata: {
taxonomy: {
postsName: 'Videos'
}, },
nodeName: CONFIG.INSTANCE.NAME, theme: {
nodeDescription: CONFIG.INSTANCE.SHORT_DESCRIPTION, registered: ServerConfigManager.Instance.getRegisteredThemes(),
nodeConfig: { default: getThemeOrDefault(CONFIG.THEME.DEFAULT, DEFAULT_THEME_NAME)
search: { },
remoteUri: { email: {
users: CONFIG.SEARCH.REMOTE_URI.USERS, enabled: isEmailEnabled()
anonymous: CONFIG.SEARCH.REMOTE_URI.ANONYMOUS },
} contactForm: {
}, enabled: CONFIG.CONTACT_FORM.ENABLED
plugin: { },
registered: ServerConfigManager.Instance.getRegisteredPlugins() transcoding: {
}, hls: {
theme: { enabled: CONFIG.TRANSCODING.HLS.ENABLED
registered: ServerConfigManager.Instance.getRegisteredThemes(),
default: getThemeOrDefault(CONFIG.THEME.DEFAULT, DEFAULT_THEME_NAME)
},
email: {
enabled: isEmailEnabled()
}, },
contactForm: { webtorrent: {
enabled: CONFIG.CONTACT_FORM.ENABLED enabled: CONFIG.TRANSCODING.WEBTORRENT.ENABLED
}, },
enabledResolutions: ServerConfigManager.Instance.getEnabledResolutions('vod')
},
live: {
enabled: CONFIG.LIVE.ENABLED,
transcoding: { transcoding: {
hls: { enabled: CONFIG.LIVE.TRANSCODING.ENABLED,
enabled: CONFIG.TRANSCODING.HLS.ENABLED enabledResolutions: ServerConfigManager.Instance.getEnabledResolutions('live')
}, }
webtorrent: { },
enabled: CONFIG.TRANSCODING.WEBTORRENT.ENABLED import: {
videos: {
http: {
enabled: CONFIG.IMPORT.VIDEOS.HTTP.ENABLED
}, },
enabledResolutions: ServerConfigManager.Instance.getEnabledResolutions('vod') torrent: {
}, enabled: CONFIG.IMPORT.VIDEOS.TORRENT.ENABLED
live: {
enabled: CONFIG.LIVE.ENABLED,
transcoding: {
enabled: CONFIG.LIVE.TRANSCODING.ENABLED,
enabledResolutions: ServerConfigManager.Instance.getEnabledResolutions('live')
}
},
import: {
videos: {
http: {
enabled: CONFIG.IMPORT.VIDEOS.HTTP.ENABLED
},
torrent: {
enabled: CONFIG.IMPORT.VIDEOS.TORRENT.ENABLED
}
}
},
autoBlacklist: {
videos: {
ofUsers: {
enabled: CONFIG.AUTO_BLACKLIST.VIDEOS.OF_USERS.ENABLED
}
} }
}, }
avatar: { },
file: { autoBlacklist: {
size: { videos: {
max: CONSTRAINTS_FIELDS.ACTORS.IMAGE.FILE_SIZE.max ofUsers: {
}, enabled: CONFIG.AUTO_BLACKLIST.VIDEOS.OF_USERS.ENABLED
extensions: CONSTRAINTS_FIELDS.ACTORS.IMAGE.EXTNAME
} }
}, }
video: { },
image: { avatar: {
extensions: CONSTRAINTS_FIELDS.VIDEOS.IMAGE.EXTNAME, file: {
size: { size: {
max: CONSTRAINTS_FIELDS.VIDEOS.IMAGE.FILE_SIZE.max max: CONSTRAINTS_FIELDS.ACTORS.IMAGE.FILE_SIZE.max
}
}, },
file: { extensions: CONSTRAINTS_FIELDS.ACTORS.IMAGE.EXTNAME
extensions: CONSTRAINTS_FIELDS.VIDEOS.EXTNAME }
} },
}, video: {
videoCaption: { image: {
file: { extensions: CONSTRAINTS_FIELDS.VIDEOS.IMAGE.EXTNAME,
size: { size: {
max: CONSTRAINTS_FIELDS.VIDEO_CAPTIONS.CAPTION_FILE.FILE_SIZE.max max: CONSTRAINTS_FIELDS.VIDEOS.IMAGE.FILE_SIZE.max
},
extensions: CONSTRAINTS_FIELDS.VIDEO_CAPTIONS.CAPTION_FILE.EXTNAME
}
},
user: {
videoQuota: CONFIG.USER.VIDEO_QUOTA,
videoQuotaDaily: CONFIG.USER.VIDEO_QUOTA_DAILY
},
trending: {
videos: {
intervalDays: CONFIG.TRENDING.VIDEOS.INTERVAL_DAYS
} }
}, },
tracker: { file: {
enabled: CONFIG.TRACKER.ENABLED extensions: CONSTRAINTS_FIELDS.VIDEOS.EXTNAME
}
},
videoCaption: {
file: {
size: {
max: CONSTRAINTS_FIELDS.VIDEO_CAPTIONS.CAPTION_FILE.FILE_SIZE.max
},
extensions: CONSTRAINTS_FIELDS.VIDEO_CAPTIONS.CAPTION_FILE.EXTNAME
} }
},
user: {
videoQuota: CONFIG.USER.VIDEO_QUOTA,
videoQuotaDaily: CONFIG.USER.VIDEO_QUOTA_DAILY
},
trending: {
videos: {
intervalDays: CONFIG.TRENDING.VIDEOS.INTERVAL_DAYS
}
},
tracker: {
enabled: CONFIG.TRACKER.ENABLED
} }
} }
} as HttpNodeinfoDiasporaSoftwareNsSchema20 }
res.contentType('application/json; profile="http://nodeinfo.diaspora.software/ns/schema/2.0#"') } as HttpNodeinfoDiasporaSoftwareNsSchema20
.send(json)
.end()
}
return res.fail({ res.contentType('application/json; profile="http://nodeinfo.diaspora.software/ns/schema/2.0#"')
status: HttpStatusCode.NOT_FOUND_404, .send(json)
message: 'Nodeinfo schema version not handled' .end()
})
} }
function getCup (req: express.Request, res: express.Response, next: express.NextFunction) { function getCup (req: express.Request, res: express.Response, next: express.NextFunction) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment