Migrated user related sechamas to src/schemas/user/

src/app/channel/channelManager.js

@@ -17,7 +17,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.*/
 //Local Imports
 const channelModel = require('../../schemas/channel/channelSchema');
 const emoteModel = require('../../schemas/emoteSchema');
-const {userModel} = require('../../schemas/userSchema');
+const {userModel} = require('../../schemas/user/userSchema');
 const loggerUtils = require('../../utils/loggerUtils');
 const activeChannel = require('./activeChannel');
 const chatHandler = require('./chatHandler');

src/app/channel/chatHandler.js

@@ -19,7 +19,7 @@ const commandPreprocessor = require('./commandPreprocessor');
 const loggerUtils = require('../../utils/loggerUtils');
 const linkUtils = require('../../utils/linkUtils');
 const emoteValidator = require('../../validators/emoteValidator');
-const {userModel} = require('../../schemas/userSchema');
+const {userModel} = require('../../schemas/user/userSchema');
 
 module.exports = class{
     constructor(server){

src/app/channel/connectedUser.js

@@ -19,7 +19,7 @@ const channelModel = require('../../schemas/channel/channelSchema');
 const permissionModel = require('../../schemas/permissionSchema');
 const flairModel = require('../../schemas/flairSchema');
 const emoteModel = require('../../schemas/emoteSchema');
-const { userModel } = require('../../schemas/userSchema');
+const { userModel } = require('../../schemas/user/userSchema');
 
 module.exports = class{
     constructor(userDB, chanRank, channel, socket){

src/app/channel/tokebot.js

@@ -16,7 +16,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.*/
 
 //Local Imports
 const tokeCommandModel = require('../../schemas/tokebot/tokeCommandSchema');
-const {userModel} = require('../../schemas/userSchema');
+const {userModel} = require('../../schemas/user/userSchema');
 const statModel = require('../../schemas/statSchema');
 const statSchema = require('../../schemas/statSchema');
 

src/controllers/adminPanelController.js

@@ -16,7 +16,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.*/
 
 //Config
 const config = require('../../config.json');
-const {userModel} = require('../schemas/userSchema');
+const {userModel} = require('../schemas/user/userSchema');
 const permissionModel = require('../schemas/permissionSchema');
 const channelModel = require('../schemas/channel/channelSchema');
 const {exceptionHandler, errorHandler} = require("../utils/loggerUtils");

src/controllers/api/account/deleteController.js

@@ -18,7 +18,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.*/
 const {validationResult, matchedData} = require('express-validator');
 
 //local imports
-const {userModel} = require('../../../schemas/userSchema');
+const {userModel} = require('../../../schemas/user/userSchema');
 const accountUtils = require('../../../utils/sessionUtils');
 const {exceptionHandler, errorHandler} = require('../../../utils/loggerUtils');
 

src/controllers/api/account/passwordResetController.js

@@ -18,7 +18,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.*/
 const {validationResult, matchedData} = require('express-validator');
 
 //local imports
-const passwordResetModel = require('../../../schemas/passwordResetSchema');
+const passwordResetModel = require('../../../schemas/user/passwordResetSchema');
 const sessionUtils = require('../../../utils/sessionUtils');
 const altchaUtils = require('../../../utils/altchaUtils');
 const {exceptionHandler, errorHandler} = require('../../../utils/loggerUtils');

src/controllers/api/account/passwordResetRequestController.js

@@ -21,8 +21,8 @@ const config = require('../../../../config.json');
 const {validationResult, matchedData} = require('express-validator');
 
 //local imports
-const {userModel} = require('../../../schemas/userSchema');
-const passwordResetModel = require('../../../schemas/passwordResetSchema');
+const {userModel} = require('../../../schemas/user/userSchema');
+const passwordResetModel = require('../../../schemas/user/passwordResetSchema');
 const mailUtils = require('../../../utils/mailUtils');
 const altchaUtils = require('../../../utils/altchaUtils');
 const {exceptionHandler, errorHandler} = require('../../../utils/loggerUtils');

src/controllers/api/account/registerController.js

@@ -21,8 +21,8 @@ const config = require('../../../../config.json');
 const {validationResult, matchedData} = require('express-validator');
 
 //local imports
-const {userModel} = require('../../../schemas/userSchema');
-const userBanModel = require('../../../schemas/userBanSchema');
+const {userModel} = require('../../../schemas/user/userSchema');
+const userBanModel = require('../../../schemas/user/userBanSchema');
 const altchaUtils = require('../../../utils/altchaUtils');
 const {exceptionHandler, errorHandler} = require('../../../utils/loggerUtils');
 

src/controllers/api/account/updateController.js

@@ -18,7 +18,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.*/
 const {validationResult, matchedData} = require('express-validator');
 
 //local imports
-const {userModel} = require('../../../schemas/userSchema');
+const {userModel} = require('../../../schemas/user/userSchema');
 const accountUtils = require('../../../utils/sessionUtils');
 const {exceptionHandler, errorHandler} = require('../../../utils/loggerUtils');
 

src/controllers/api/admin/banController.js

@@ -18,9 +18,9 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.*/
 const {validationResult, matchedData} = require('express-validator');
 
 //local imports
-const banModel = require('../../../schemas/userBanSchema');
+const banModel = require('../../../schemas/user/userBanSchema');
 const permissionModel = require('../../../schemas/permissionSchema');
-const {userModel} = require('../../../schemas/userSchema');
+const {userModel} = require('../../../schemas/user/userSchema');
 const {exceptionHandler, errorHandler} = require('../../../utils/loggerUtils');
 
 module.exports.get = async function(req, res){

src/controllers/api/admin/changeRankController.js

@@ -20,7 +20,7 @@ const {validationResult, matchedData} = require('express-validator');
 //local imports
 const {exceptionHandler, errorHandler} = require('../../../utils/loggerUtils');
 const permissionModel = require('../../../schemas/permissionSchema');
-const {userModel} = require('../../../schemas/userSchema');
+const {userModel} = require('../../../schemas/user/userSchema');
 
 //api change rank functions
 module.exports.post = async function(req, res){

src/controllers/api/admin/listUsersController.js

@@ -16,7 +16,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.*/
 
 //local imports
 const {exceptionHandler, errorHandler} = require('../../../utils/loggerUtils');
-const {userModel} = require('../../../schemas/userSchema');
+const {userModel} = require('../../../schemas/user/userSchema');
 
 //api list account functions
 module.exports.get = async function(req, res){

src/controllers/api/admin/passwordResetController.js

@@ -18,8 +18,8 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.*/
 const {validationResult, matchedData} = require('express-validator');
 
 //local imports
-const {userModel} = require('../../../schemas/userSchema');
-const passwordResetModel = require("../../../schemas/passwordResetSchema");
+const {userModel} = require('../../../schemas/user/userSchema');
+const passwordResetModel = require("../../../schemas/user/passwordResetSchema");
 const {exceptionHandler, errorHandler} = require('../../../utils/loggerUtils');
 
 module.exports.post = async function(req, res){

src/controllers/api/channel/banController.js

@@ -19,7 +19,7 @@ const {validationResult, matchedData} = require('express-validator');
 
 //local imports
 const {exceptionHandler, errorHandler} = require('../../../utils/loggerUtils');
-const {userModel} = require('../../../schemas/userSchema');
+const {userModel} = require('../../../schemas/user/userSchema');
 const channelModel = require('../../../schemas/channel/channelSchema');
 const permissionModel = require('../../../schemas/permissionSchema')
 

src/controllers/api/channel/rankController.js

@@ -20,7 +20,7 @@ const {validationResult, matchedData} = require('express-validator');
 //local imports
 const {exceptionHandler, errorHandler} = require('../../../utils/loggerUtils');
 const permissionModel = require('../../../schemas/permissionSchema');
-const {userModel} = require('../../../schemas/userSchema');
+const {userModel} = require('../../../schemas/user/userSchema');
 const channelModel = require('../../../schemas/channel/channelSchema');
 
 //api channel rank functions

src/controllers/api/channel/registerController.js

@@ -19,7 +19,7 @@ const {validationResult, matchedData} = require('express-validator');
 
 //local imports
 const {exceptionHandler, errorHandler} = require('../../../utils/loggerUtils');
-const {userModel} = require('../../../schemas/userSchema');
+const {userModel} = require('../../../schemas/user/userSchema');
 const altchaUtils = require('../../../utils/altchaUtils');
 const channelModel = require('../../../schemas/channel/channelSchema');
 

src/controllers/profileController.js

@@ -15,7 +15,7 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.*/
 
 //Local Imports
-const {userModel} = require('../schemas/userSchema');
+const {userModel} = require('../schemas/user/userSchema');
 const {exceptionHandler, errorHandler} = require('../utils/loggerUtils');
 
 //Config

src/controllers/tooltip/altListController.js

@@ -18,7 +18,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.*/
 const {validationResult, matchedData} = require('express-validator');
 
 //local imports
-const {userModel} = require('../../schemas/userSchema');
+const {userModel} = require('../../schemas/user/userSchema');
 const {exceptionHandler, errorHandler} = require('../../utils/loggerUtils');
 
 //root index functions

src/schemas/channel/channelSchema.js

@@ -23,7 +23,7 @@ const {validationResult, matchedData} = require('express-validator');
 const server = require('../../server');
 //DB Models
 const statModel = require('../statSchema');
-const {userModel} = require('../userSchema');
+const {userModel} = require('../user/userSchema');
 const permissionModel = require('../permissionSchema');
 const emoteModel = require('../emoteSchema');
 //DB Schemas

src/schemas/permissionSchema.js

@@ -18,7 +18,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.*/
 const {mongoose} = require('mongoose');
 
 //Local Imports
-const userModel = require('./userSchema');
+const userModel = require('./user/userSchema');
 const channelPermissionSchema = require('./channel/channelPermissionSchema');
 const {errorHandler} = require('../utils/loggerUtils');
 

src/schemas/user/passwordResetSchema.js

@@ -18,7 +18,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.*/
 //However, this is so rarely used the preformance benefits aren't worth the extra clutter
 
 //Config
-const config = require('../../config.json');
+const config = require('../../../config.json');
 
 //Node Imports
 const crypto = require("node:crypto");
@@ -27,7 +27,7 @@ const crypto = require("node:crypto");
 const {mongoose} = require('mongoose');
 
 //Local Imports
-const hashUtil = require('../utils/hashUtils');
+const hashUtil = require('../../utils/hashUtils');
 
 const daysToExpire = 7;
 

src/schemas/user/userSchema.js

@@ -14,20 +14,22 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.*/
 
+//Node Imports
+const { profile } = require('console');
+
 //NPM Imports
 const {mongoose} = require('mongoose');
 
 //local imports
 //server
-const server = require('../server');
+const server = require('../../server');
 //DB Models
-const statModel = require('./statSchema');
-const flairModel = require('./flairSchema');
-const permissionModel = require('./permissionSchema');
-const emoteModel = require('./emoteSchema');
+const statModel = require('../statSchema');
+const flairModel = require('../flairSchema');
+const permissionModel = require('../permissionSchema');
+const emoteModel = require('../emoteSchema');
 //Utils
-const hashUtil = require('../utils/hashUtils');
-const { profile } = require('console');
+const hashUtil = require('../../utils/hashUtils');
 
 
 const userSchema = new mongoose.Schema({

src/utils/scheduler.js

@@ -18,9 +18,9 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.*/
 const cron = require('node-cron');
 
 //Local Imports
-const {userModel} = require('../schemas/userSchema');
-const userBanModel = require('../schemas/userBanSchema');
-const passwordResetModel = require('../schemas/passwordResetSchema');
+const {userModel} = require('../schemas/user/userSchema');
+const userBanModel = require('../schemas/user/userBanSchema');
+const passwordResetModel = require('../schemas/user/passwordResetSchema');
 const channelModel = require('../schemas/channel/channelSchema');
 const sessionUtils = require('./sessionUtils');
 

src/utils/sessionUtils.js

@@ -15,8 +15,8 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.*/
 
 //local imports
-const {userModel} = require('../schemas/userSchema');
-const userBanModel = require('../schemas/userBanSchema')
+const {userModel} = require('../schemas/user/userSchema');
+const userBanModel = require('../schemas/user/userBanSchema')
 const altchaUtils = require('../utils/altchaUtils');
 
 //Create failed sign-in cache since it's easier and more preformant to implement it this way than adding extra burdon to the database