Merge branch 'develop'

1 files changed, 38 insertions, 2 deletions

diff --git a/src/server/nodeinfo.ts b/src/server/nodeinfo.ts
index a783eea90b..686412383e 100644
--- a/src/server/nodeinfo.ts
+++ b/src/server/nodeinfo.ts
@@ -20,7 +20,24 @@ export const links = [/* (awaiting release) {
 
 const nodeinfo2 = async () => {
 	const [
-		{ name, description, maintainer, langs, announcements, disableRegistration, disableLocalTimeline, disableGlobalTimeline, enableRecaptcha, maxNoteTextLength, enableTwitterIntegration, enableGithubIntegration, enableDiscordIntegration, enableEmail, enableServiceWorker },
+		{
+			name,
+			description,
+			maintainerName,
+			maintainerEmail,
+			langs,
+			announcements,
+			disableRegistration,
+			disableLocalTimeline,
+			disableGlobalTimeline,
+			enableRecaptcha,
+			maxNoteTextLength,
+			enableTwitterIntegration,
+			enableGithubIntegration,
+			enableDiscordIntegration,
+			enableEmail,
+			enableServiceWorker
+		},
 		// total,
 		// activeHalfyear,
 		// activeMonth,
@@ -52,7 +69,26 @@ const nodeinfo2 = async () => {
 			// localPosts,
 			// localComments
 		},
-		metadata: { name, description, maintainer, langs, announcements, disableRegistration, disableLocalTimeline, disableGlobalTimeline, enableRecaptcha, maxNoteTextLength, enableTwitterIntegration, enableGithubIntegration, enableDiscordIntegration, enableEmail, enableServiceWorker }
+		metadata: {
+			name,
+			description,
+			maintainer: {
+				name: maintainerName,
+				email: maintainerEmail
+			},
+			langs,
+			announcements,
+			disableRegistration,
+			disableLocalTimeline,
+			disableGlobalTimeline,
+			enableRecaptcha,
+			maxNoteTextLength,
+			enableTwitterIntegration,
+			enableGithubIntegration,
+			enableDiscordIntegration,
+			enableEmail,
+			enableServiceWorker
+		}
 	};
 };