Started work on emotes schema and administration endpoints. Improvements to Link/Media embeds in chat.

src/app/channel/commandPreprocessor.js

@@ -95,7 +95,7 @@ module.exports = class commandPreprocessor{
         //this.rawData.links.forEach((link) => {
         for (const link of this.rawData.links){
             //Set standard link type
-            var linkType = 'link';
+            var type = 'link';
 
             //Don't try this at home, we're what you call "Experts"
             //TODO: Handle this shit simultaneously and send the chat before its done, then send updated types for each link as they're pulled individually
@@ -116,14 +116,14 @@ module.exports = class commandPreprocessor{
                         //If the file size is unreported OR it's smaller than 4MB (not all servers report this and images that big are pretty rare)
                         if(fileSize == null || fileSize <= maxSize){
                             //Mark link as an image
-                            linkType = 'image';
+                            type = 'image';
                         }
                     //If it's a video
                     }else if(fileType.match('video/mp4' || 'video/webm')){
                         //If the server is reporting file-size and it's reporting under 4MB (Reject unreported sizes to be on the safe side is video is huge)
                         if(fileSize != null && fileSize <= maxSize){
                             //mark link as a video
-                            linkType = 'video';
+                            type = 'video';
                         }
                     }
                 }
@@ -134,7 +134,7 @@ module.exports = class commandPreprocessor{
             //Add a marked link object to our links array
             this.links.push({
                 link,
-                type: linkType
+                type
             });
 
         }

src/controllers/api/admin/emoteController.js

@@ -0,0 +1,96 @@
+/*Canopy - The next generation of stoner streaming software
+Copyright (C) 2024  Rainbownapkin and the TTN Community
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+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/>.*/
+
+//npm imports
+const {validationResult, matchedData} = require('express-validator');
+
+//local imports
+const {exceptionHandler, errorHandler} = require('../../../utils/loggerUtils');
+const emoteModel = require('../../../schemas/emoteSchema');
+
+module.exports.get = async function(req, res){
+    try{
+        const emoteList = await emoteModel.getEmotes();
+
+        res.status(200);
+        return res.send(emoteList);
+    }catch(err){
+        return exceptionHandler(res, err);
+    }
+}
+
+module.exports.post = async function(req, res){
+    try{
+        //get validation error results
+        const validResult = validationResult(req);
+
+        //if they're empty
+        if(validResult.isEmpty()){
+            /*
+            const {command} = matchedData(req);
+            const tokeDB = await tokeCommandModel.findOne({command});
+
+            if(tokeDB != null){
+                return errorHandler(res, `Toke command '!${command}' already exists!`);
+            }
+
+            //Add the toke
+            await tokeCommandModel.create({command});
+
+            //Return the updated command list
+            res.status(200);
+            return res.send(await tokeCommandModel.getCommandStrings());
+            */
+        }else{
+            //otherwise scream
+            res.status(400);
+            return res.send({errors: validResult.array()})
+        }
+    }catch(err){
+        return exceptionHandler(res, err);
+    }
+}
+
+module.exports.delete = async function(req, res){
+    try{
+        //get validation error results
+        const validResult = validationResult(req);
+
+        //if they're empty
+        if(validResult.isEmpty()){
+            /*
+            const {command} = matchedData(req);
+            const tokeDB = await tokeCommandModel.findOne({command});
+
+            if(tokeDB == null){
+                return errorHandler(res, `Cannot delete non-existant toke command '!${command}'!`);
+            }
+
+            await tokeDB.deleteOne();
+
+            //Return the updated command list
+            res.status(200);
+            return res.send(await tokeCommandModel.getCommandStrings());
+            */
+        }else{
+            //otherwise scream
+            res.status(400);
+            return res.send({errors: validResult.array()})
+        }
+    }catch(err){
+        return exceptionHandler(res, err);
+    }
+}

src/routers/api/adminRouter.js

@@ -30,22 +30,31 @@ const changeRankController = require("../../controllers/api/admin/changeRankCont
 const permissionsController = require("../../controllers/api/admin/permissionsController");
 const banController = require("../../controllers/api/admin/banController");
 const tokeCommandController = require('../../controllers/api/admin/tokeCommandController');
+const emoteController = require('../../controllers/api/admin/emoteController');
 
 //globals
 const router = Router();
 
 //routing functions
+//listUsers
 router.get('/listUsers', permissionSchema.reqPermCheck("adminPanel"), listUsersController.get);
+//listChannels
 router.get('/listChannels', permissionSchema.reqPermCheck("adminPanel"),  listChannelsController.get);
+//permissions
 router.get('/permissions', permissionSchema.reqPermCheck("adminPanel"),  permissionsController.get);
 router.post('/permissions', permissionSchema.reqPermCheck("changePerms"), checkExact([permissionsValidator.permissionsMap(), channelPermissionValidator.channelPermissionsMap()]), permissionsController.post);
+//changeRank
 router.post('/changeRank', permissionSchema.reqPermCheck("changeRank"),  accountValidator.user(), accountValidator.rank(), changeRankController.post);
+//Ban
 router.get('/ban', permissionSchema.reqPermCheck("adminPanel"),  banController.get);
 //Sometimes they're so simple you don't need to put your validators in their own special place :P
 router.post('/ban', permissionSchema.reqPermCheck("banUser"),  accountValidator.user(), body("permanent").isBoolean(), body("expirationDays").isInt(), banController.post);
 router.delete('/ban', permissionSchema.reqPermCheck("banUser"),  accountValidator.user(), banController.delete);
+//TokeCommands
 router.get('/tokeCommands', permissionSchema.reqPermCheck("adminPanel"), tokeCommandController.get);
 router.post('/tokeCommands', permissionSchema.reqPermCheck("editTokeCommands"), tokebotValidator.command(), tokeCommandController.post);
 router.delete('/tokeCommands', permissionSchema.reqPermCheck("editTokeCommands"), tokebotValidator.command(), tokeCommandController.delete);
+//emote
+router.get('/emote', permissionSchema.reqPermCheck('adminPanel'), emoteController.get);
 
 module.exports = router;

src/schemas/emoteSchema.js

@@ -0,0 +1,92 @@
+/*Canopy - The next generation of stoner streaming software
+Copyright (C) 2024  Rainbownapkin and the TTN Community
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+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/>.*/
+
+//NPM Imports
+const {mongoose} = require('mongoose');
+
+//Local Imports
+const defaultEmote = require("../../defaultEmotes.json");
+
+const typeEnum = ["image", "video"];
+
+const emoteSchema = new mongoose.Schema({
+    name:{
+        type: mongoose.SchemaTypes.String,
+        required: true
+    },
+    link:{
+        type: mongoose.SchemaTypes.String,
+        required: true
+    },
+    type:{
+        type: mongoose.SchemaTypes.String,
+        required: true,
+        enum: typeEnum,
+        default: typeEnum[0]
+    }
+});
+
+emoteSchema.statics.loadDefaults = async function(){
+    //Make sure registerEmote function is happy
+    const _this = this;
+
+    //Ensure default comes first (.bind(this) doesn't seem to work here...)
+    await registerEmote(defaultEmote.default);
+    //For each entry in the defaultEmote.json file
+    defaultEmote.array.forEach(registerEmote);
+
+    async function registerEmote(emote){
+        try{
+            //Look for emote matching the one from our file
+            const foundEmote = await _this.findOne({name: emote.name});
+
+            //if the emote doesn't exist
+            if(!foundEmote){
+                const emoteDB = await _this.create(emote);
+                console.log(`Loading default emote '${emote.name}' into DB from defaultEmote.json`);
+            }
+
+        }catch(err){
+            if(emote != null){
+                console.log(err);
+                console.log(`Error loading emote '${emote.name}':`);
+            }else{
+                console.log("Error, null emote:");
+            }
+        }
+    }
+}
+
+emoteSchema.statics.getEmotes = async function(){
+    //Create an empty array to hold our emote list
+    const emoteList = [];
+    //Pull emotes from database
+    const emoteDB = await this.find({});
+
+    emoteDB.forEach((emote) => { 
+        emoteList.push({
+            name: emote.name,
+            link: emote.link,
+            type: emote.type
+        });
+    });
+
+    return emoteList;
+}
+
+emoteSchema.statics.typeEnum = typeEnum;
+
+module.exports = mongoose.model("emote", emoteSchema);

src/server.js

@@ -28,6 +28,7 @@ const channelManager = require('./app/channel/channelManager');
 const scheduler = require('./utils/scheduler');
 const statModel = require('./schemas/statSchema');
 const flairModel = require('./schemas/flairSchema');
+const emoteModel = require('./schemas/emoteSchema');
 const tokeCommandModel = require('./schemas/tokebot/tokeCommandSchema');
 const indexRouter = require('./routers/indexRouter');
 const registerRouter = require('./routers/registerRouter');
@@ -114,6 +115,9 @@ statModel.incrementLaunchCount();
 //Load default flairs
 flairModel.loadDefaults();
 
+//Load default emots
+emoteModel.loadDefaults();
+
 //Load default toke commands
 tokeCommandModel.loadDefaults();