Skip to content
Snippets Groups Projects
Unverified Commit 054ba3fe authored by xtex's avatar xtex Committed by GitHub
Browse files

feat: nodeinfo 2.1 (#11805)


* feat: enable nodeinfo 2.1

Since 9dd06a76, nodeinfo 2.1 has been released.

Signed-off-by: default avatarxtex <xtexchooser@duck.com>

* feat: only add software.repository to nodeinfo 2.1

https://github.com/jhass/nodeinfo/commit/e54c48e171b6f6bed6fbe2b6c0bdd8d3c16f7909


Signed-off-by: default avatarxtex <xtexchooser@duck.com>

* feat: add software.homepage url to nodeinfo 2.1

https://github.com/jhass/nodeinfo/commit/507822cb3c16d84dac884d878e32825ade54028d


Signed-off-by: default avatarxtex <xtexchooser@duck.com>

* fix: set proper Content-Type for nodeinfo

Signed-off-by: default avatarxtex <xtexchooser@duck.com>

* style: fix lint warnings

Signed-off-by: default avatarxtex <xtexchooser@duck.com>

---------

Signed-off-by: default avatarxtex <xtexchooser@duck.com>
parent 87497167
No related branches found
Tags 2023.9.0-beta.7
No related merge requests found
......@@ -35,10 +35,10 @@ export class NodeinfoServerService {
@bindThis
public getLinks() {
return [/* (awaiting release) {
rel: 'http://nodeinfo.diaspora.software/ns/schema/2.1',
href: config.url + nodeinfo2_1path
}, */{
return [{
rel: 'http://nodeinfo.diaspora.software/ns/schema/2.1',
href: this.config.url + nodeinfo2_1path
}, {
rel: 'http://nodeinfo.diaspora.software/ns/schema/2.0',
href: this.config.url + nodeinfo2_0path,
}];
......@@ -46,7 +46,7 @@ export class NodeinfoServerService {
@bindThis
public createServer(fastify: FastifyInstance, options: FastifyPluginOptions, done: (err?: Error) => void) {
const nodeinfo2 = async () => {
const nodeinfo2 = async (version: number) => {
const now = Date.now();
const notesChart = await this.notesChart.getChart('hour', 1, null);
......@@ -73,11 +73,11 @@ export class NodeinfoServerService {
const basePolicies = { ...DEFAULT_POLICIES, ...meta.policies };
return {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const document: any = {
software: {
name: 'misskey',
version: this.config.version,
repository: meta.repositoryUrl,
},
protocols: ['activitypub'],
services: {
......@@ -114,23 +114,36 @@ export class NodeinfoServerService {
themeColor: meta.themeColor ?? '#86b300',
},
};
if (version >= 21) {
document.software.repository = meta.repositoryUrl;
document.software.homepage = meta.repositoryUrl;
}
return document;
};
const cache = new MemorySingleCache<Awaited<ReturnType<typeof nodeinfo2>>>(1000 * 60 * 10);
fastify.get(nodeinfo2_1path, async (request, reply) => {
const base = await cache.fetch(() => nodeinfo2());
const base = await cache.fetch(() => nodeinfo2(21));
reply.header('Cache-Control', 'public, max-age=600');
reply
.type(
'application/json; profile="http://nodeinfo.diaspora.software/ns/schema/2.1#"',
)
.header('Cache-Control', 'public, max-age=600');
return { version: '2.1', ...base };
});
fastify.get(nodeinfo2_0path, async (request, reply) => {
const base = await cache.fetch(() => nodeinfo2());
const base = await cache.fetch(() => nodeinfo2(20));
delete (base as any).software.repository;
reply.header('Cache-Control', 'public, max-age=600');
reply
.type(
'application/json; profile="http://nodeinfo.diaspora.software/ns/schema/2.0#"',
)
.header('Cache-Control', 'public, max-age=600');
return { version: '2.0', ...base };
});
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment