Merge remote-tracking branch 'upstream/dev/0.15.0' into dev/0.15.0

backend/ratelimit.ts

@@ -38,7 +38,7 @@ export const setRateLimiter = (group: string, config: EndpointRateLimitConfigura
  * creates middleware for rate limiting
  */
 export const rateLimiterMiddleware = (group: string, config: EndpointRateLimitConfiguration | undefined): (req: Request, res: Response, next: NextFunction) => void => {
-    if (rateLimiterGroups.has(group)) setRateLimiter(group, config);
+    if (!rateLimiterGroups.has(group)) setRateLimiter(group, config);
 
     return (req, res, next) => {
         return rateLimiterGroups.get(group)!(req, res, next);

backend/routers/api.ts

@@ -35,6 +35,11 @@ router.post('/setup', BodyParserJson(), async (req, res) => {
 		if (UserConfig.config.rateLimit?.login)  setRateLimiter('login',  UserConfig.config.rateLimit.login);
 		if (UserConfig.config.rateLimit?.upload) setRateLimiter('upload', UserConfig.config.rateLimit.upload);
 
+		// set rate limits
+		if (UserConfig.config.rateLimit?.api)    setRateLimiter('api',    UserConfig.config.rateLimit.api);
+		if (UserConfig.config.rateLimit?.login)  setRateLimiter('login',  UserConfig.config.rateLimit.login);
+		if (UserConfig.config.rateLimit?.upload) setRateLimiter('upload', UserConfig.config.rateLimit.upload);
+
 		log.success('Setup', 'completed');
 
 		return res.json({ success: true });