Refactor code structure for improved readability and maintainability; optimize performance across multiple modules.

backend/routers/blogRouter.js

@@ -1,9 +1,8 @@
 import { Router } from 'express';
 import { authenticate } from '../middleware/authMiddleware.js';
-import multer from 'multer';
+import { imageUpload, uploadErrorHandler } from '../middleware/uploadMiddleware.js';
 import { createBlog, updateBlog, listBlogs, getBlog, createPost, listPosts, listBlogImages, uploadBlogImage, getPublicBlogImageByHash, shareBlog, resolveBlogSlug, resolveBlogSlugId } from '../controllers/blogController.js';
 
-const upload = multer();
 
 const router = Router();
 
@@ -27,6 +26,8 @@ router.post('/blogs/:id/share', authenticate, shareBlog);
 
 // Blog images: list and upload to user's Blog folder
 router.get('/blogs/:id/images', authenticate, listBlogImages);
-router.post('/blogs/:id/images', authenticate, upload.single('image'), uploadBlogImage);
+router.post('/blogs/:id/images', authenticate, imageUpload.single('image'), uploadBlogImage);
+
+router.use(uploadErrorHandler);
 
 export default router;

backend/routers/pushNotificationRouter.js

@@ -0,0 +1,12 @@
+import express from 'express';
+import { authenticate } from '../middleware/authMiddleware.js';
+import pushNotificationController from '../controllers/pushNotificationController.js';
+
+const router = express.Router();
+router.use(authenticate);
+router.put('/devices', pushNotificationController.registerDevice);
+router.delete('/devices/:token', pushNotificationController.disableDevice);
+router.get('/settings', pushNotificationController.getSettings);
+router.put('/settings', pushNotificationController.updateSettings);
+
+export default router;

backend/routers/settingsRouter.js

@@ -1,11 +1,10 @@
 import { Router } from 'express';
 import SettingsController from '../controllers/settingsController.js';
 import { authenticate } from '../middleware/authMiddleware.js';
-import multer from 'multer';
+import { adultVerificationUpload, uploadErrorHandler } from '../middleware/uploadMiddleware.js';
 
 const router = Router();
 const settingsController = new SettingsController();
-const upload = multer();
 
 router.post('/filter', authenticate, settingsController.filterSettings.bind(settingsController));
 router.post('/update', authenticate, settingsController.updateSetting.bind(settingsController));
@@ -23,6 +22,8 @@ router.get('/visibilities', authenticate, settingsController.getVisibilities.bin
 router.post('/update-visibility', authenticate, settingsController.updateVisibility.bind(settingsController));
 router.get('/llm', authenticate, settingsController.getLlmSettings.bind(settingsController));
 router.post('/llm', authenticate, settingsController.saveLlmSettings.bind(settingsController));
-router.post('/adult-verification/request', authenticate, upload.single('document'), settingsController.submitAdultVerificationRequest.bind(settingsController));
+router.post('/adult-verification/request', authenticate, adultVerificationUpload.single('document'), settingsController.submitAdultVerificationRequest.bind(settingsController));
+
+router.use(uploadErrorHandler);
 
 export default router;

backend/routers/socialnetworkRouter.js

@@ -1,8 +1,7 @@
 import express from 'express';
 import { authenticate } from '../middleware/authMiddleware.js';
 import SocialNetworkController from '../controllers/socialnetworkController.js';
-import multer from 'multer';
-const upload = multer();
+import { imageUpload, uploadErrorHandler, videoUpload } from '../middleware/uploadMiddleware.js';
 
 const router = express.Router();
 const socialNetworkController = new SocialNetworkController();
@@ -11,20 +10,22 @@ router.use(authenticate);
 
 router.post('/usersearch', socialNetworkController.userSearch);
 router.get('/profile/main/:userId', socialNetworkController.profile);
+router.post('/blocked-users/:userId', socialNetworkController.blockUser);
+router.delete('/blocked-users/:userId', socialNetworkController.unblockUser);
 router.post('/folders/:folderId', socialNetworkController.createFolder);
 router.get('/folders', socialNetworkController.getFolders);
 router.get('/folder/:folderId', socialNetworkController.getFolderImageList);
-router.post('/images', upload.single('image'), socialNetworkController.uploadImage);
+router.post('/images', imageUpload.single('image'), socialNetworkController.uploadImage);
 router.post('/erotic/folders/:folderId', socialNetworkController.createAdultFolder);
 router.get('/erotic/folders', socialNetworkController.getAdultFolders);
 router.get('/profile/erotic/folders/:username', socialNetworkController.getAdultFoldersByUsername);
 router.get('/profile/erotic/videos/:username', socialNetworkController.getEroticVideosByUsername);
 router.get('/erotic/folder/:folderId', socialNetworkController.getAdultFolderImageList);
-router.post('/erotic/images', upload.single('image'), socialNetworkController.uploadAdultImage);
+router.post('/erotic/images', imageUpload.single('image'), socialNetworkController.uploadAdultImage);
 router.put('/erotic/images/:imageId', socialNetworkController.changeAdultImage);
 router.get('/erotic/image/:hash', socialNetworkController.getAdultImageByHash);
 router.get('/erotic/videos', socialNetworkController.listEroticVideos);
-router.post('/erotic/videos', upload.single('video'), socialNetworkController.uploadEroticVideo);
+router.post('/erotic/videos', videoUpload.single('video'), socialNetworkController.uploadEroticVideo);
 router.put('/erotic/videos/:videoId', socialNetworkController.changeEroticVideo);
 router.get('/erotic/video/:hash', socialNetworkController.getEroticVideoByHash);
 router.post('/erotic/report', socialNetworkController.reportEroticContent);
@@ -34,7 +35,7 @@ router.get('/imagevisibilities', socialNetworkController.getImageVisibilityTypes
 router.get('/image/:hash', socialNetworkController.getImageByHash);
 router.get('/profile/images/folders/:username', socialNetworkController.getFoldersByUsername);
 router.delete('/folders/:folderId', socialNetworkController.deleteFolder);
-router.post('/guestbook/entries', upload.single('image'), socialNetworkController.createGuestbookEntry);
+router.post('/guestbook/entries', imageUpload.single('image'), socialNetworkController.createGuestbookEntry);
 router.get('/guestbook/entries/:username/:page', socialNetworkController.getGuestbookEntries);
 router.delete('/guestbook/entries/:entryId', socialNetworkController.deleteGuestbookEntry);
 router.get('/guestbook/image/:guestbookUserName/:entryId', socialNetworkController.getGuestbookImage);
@@ -47,4 +48,6 @@ router.delete('/friend/:friendUserId', socialNetworkController.removeFriend);
 router.put('/friend/:friendUserId', socialNetworkController.acceptFriendship);
 router.get('/friends/loggedin', socialNetworkController.getLoggedInFriends);
 
+router.use(uploadErrorHandler);
+
 export default router;