1 files changed, 124 insertions, 123 deletions

diff --git a/server/controllers/static.ts b/server/controllers/static.ts
index 8d9003a3e..35e024dda 100644
--- a/server/controllers/static.ts
+++ b/server/controllers/static.ts
@@ -2,9 +2,9 @@ import * as cors from 'cors'
 import * as express from 'express'
 import { join } from 'path'
 import { serveIndexHTML } from '@server/lib/client-html'
-import { getRegisteredPlugins, getRegisteredThemes } from '@server/lib/config'
+import { ServerConfigManager } from '@server/lib/server-config-manager'
 import { HttpStatusCode } from '@shared/core-utils/miscs/http-error-codes'
-import { HttpNodeinfoDiasporaSoftwareNsSchema20 } from '../../shared/models/nodeinfo'
+import { HttpNodeinfoDiasporaSoftwareNsSchema20 } from '../../shared/models/nodeinfo/nodeinfo.model'
 import { root } from '../helpers/core-utils'
 import { CONFIG, isEmailEnabled } from '../initializers/config'
 import {
@@ -18,10 +18,9 @@ import {
   WEBSERVER
 } from '../initializers/constants'
 import { getThemeOrDefault } from '../lib/plugins/theme-utils'
-import { getEnabledResolutions } from '../lib/video-transcoding'
 import { asyncMiddleware } from '../middlewares'
 import { cacheRoute } from '../middlewares/cache'
-import { UserModel } from '../models/account/user'
+import { UserModel } from '../models/user/user'
 import { VideoModel } from '../models/video/video'
 import { VideoCommentModel } from '../models/video/video-comment'
 
@@ -161,143 +160,145 @@ async function generateNodeinfo (req: express.Request, res: express.Response) {
   const { totalVideos } = await VideoModel.getStats()
   const { totalLocalVideoComments } = await VideoCommentModel.getStats()
   const { totalUsers, totalMonthlyActiveUsers, totalHalfYearActiveUsers } = await UserModel.getStats()
-  let json = {}
 
-  if (req.params.version && (req.params.version === '2.0')) {
-    json = {
-      version: '2.0',
-      software: {
-        name: 'peertube',
-        version: PEERTUBE_VERSION
+  if (!req.params.version || req.params.version !== '2.0') {
+    return res.fail({
+      status: HttpStatusCode.NOT_FOUND_404,
+      message: 'Nodeinfo schema version not handled'
+    })
+  }
+
+  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: [
-        'activitypub'
-      ],
-      services: {
-        inbound: [],
-        outbound: [
-          'atom1.0',
-          'rss2.0'
-        ]
+      localPosts: totalVideos,
+      localComments: totalLocalVideoComments
+    },
+    metadata: {
+      taxonomy: {
+        postsName: 'Videos'
       },
-      openRegistrations: CONFIG.SIGNUP.ENABLED,
-      usage: {
-        users: {
-          total: totalUsers,
-          activeMonth: totalMonthlyActiveUsers,
-          activeHalfyear: totalHalfYearActiveUsers
+      nodeName: CONFIG.INSTANCE.NAME,
+      nodeDescription: CONFIG.INSTANCE.SHORT_DESCRIPTION,
+      nodeConfig: {
+        search: {
+          remoteUri: {
+            users: CONFIG.SEARCH.REMOTE_URI.USERS,
+            anonymous: CONFIG.SEARCH.REMOTE_URI.ANONYMOUS
+          }
         },
-        localPosts: totalVideos,
-        localComments: totalLocalVideoComments
-      },
-      metadata: {
-        taxonomy: {
-          postsName: 'Videos'
+        plugin: {
+          registered: ServerConfigManager.Instance.getRegisteredPlugins()
         },
-        nodeName: CONFIG.INSTANCE.NAME,
-        nodeDescription: CONFIG.INSTANCE.SHORT_DESCRIPTION,
-        nodeConfig: {
-          search: {
-            remoteUri: {
-              users: CONFIG.SEARCH.REMOTE_URI.USERS,
-              anonymous: CONFIG.SEARCH.REMOTE_URI.ANONYMOUS
-            }
-          },
-          plugin: {
-            registered: getRegisteredPlugins()
-          },
-          theme: {
-            registered: getRegisteredThemes(),
-            default: getThemeOrDefault(CONFIG.THEME.DEFAULT, DEFAULT_THEME_NAME)
-          },
-          email: {
-            enabled: isEmailEnabled()
+        theme: {
+          registered: ServerConfigManager.Instance.getRegisteredThemes(),
+          default: getThemeOrDefault(CONFIG.THEME.DEFAULT, DEFAULT_THEME_NAME)
+        },
+        email: {
+          enabled: isEmailEnabled()
+        },
+        contactForm: {
+          enabled: CONFIG.CONTACT_FORM.ENABLED
+        },
+        transcoding: {
+          hls: {
+            enabled: CONFIG.TRANSCODING.HLS.ENABLED
           },
-          contactForm: {
-            enabled: CONFIG.CONTACT_FORM.ENABLED
+          webtorrent: {
+            enabled: CONFIG.TRANSCODING.WEBTORRENT.ENABLED
           },
+          enabledResolutions: ServerConfigManager.Instance.getEnabledResolutions('vod')
+        },
+        live: {
+          enabled: CONFIG.LIVE.ENABLED,
           transcoding: {
-            hls: {
-              enabled: CONFIG.TRANSCODING.HLS.ENABLED
-            },
-            webtorrent: {
-              enabled: CONFIG.TRANSCODING.WEBTORRENT.ENABLED
+            enabled: CONFIG.LIVE.TRANSCODING.ENABLED,
+            enabledResolutions: ServerConfigManager.Instance.getEnabledResolutions('live')
+          }
+        },
+        import: {
+          videos: {
+            http: {
+              enabled: CONFIG.IMPORT.VIDEOS.HTTP.ENABLED
             },
-            enabledResolutions: getEnabledResolutions('vod')
-          },
-          live: {
-            enabled: CONFIG.LIVE.ENABLED,
-            transcoding: {
-              enabled: CONFIG.LIVE.TRANSCODING.ENABLED,
-              enabledResolutions: 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
-              }
+            torrent: {
+              enabled: CONFIG.IMPORT.VIDEOS.TORRENT.ENABLED
             }
-          },
-          avatar: {
-            file: {
-              size: {
-                max: CONSTRAINTS_FIELDS.ACTORS.IMAGE.FILE_SIZE.max
-              },
-              extensions: CONSTRAINTS_FIELDS.ACTORS.IMAGE.EXTNAME
+          }
+        },
+        autoBlacklist: {
+          videos: {
+            ofUsers: {
+              enabled: CONFIG.AUTO_BLACKLIST.VIDEOS.OF_USERS.ENABLED
             }
-          },
-          video: {
-            image: {
-              extensions: CONSTRAINTS_FIELDS.VIDEOS.IMAGE.EXTNAME,
-              size: {
-                max: CONSTRAINTS_FIELDS.VIDEOS.IMAGE.FILE_SIZE.max
-              }
+          }
+        },
+        avatar: {
+          file: {
+            size: {
+              max: CONSTRAINTS_FIELDS.ACTORS.IMAGE.FILE_SIZE.max
             },
-            file: {
-              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
+            extensions: CONSTRAINTS_FIELDS.ACTORS.IMAGE.EXTNAME
+          }
+        },
+        video: {
+          image: {
+            extensions: CONSTRAINTS_FIELDS.VIDEOS.IMAGE.EXTNAME,
+            size: {
+              max: CONSTRAINTS_FIELDS.VIDEOS.IMAGE.FILE_SIZE.max
             }
           },
-          tracker: {
-            enabled: CONFIG.TRACKER.ENABLED
+          file: {
+            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#"')
-  } else {
-    json = { error: 'Nodeinfo schema version not handled' }
-    res.status(HttpStatusCode.NOT_FOUND_404)
-  }
+    }
+  } as HttpNodeinfoDiasporaSoftwareNsSchema20
 
-  return res.send(json).end()
+  res.contentType('application/json; profile="http://nodeinfo.diaspora.software/ns/schema/2.0#"')
+      .send(json)
+      .end()
 }
 
 function getCup (req: express.Request, res: express.Response, next: express.NextFunction) {