Several improvements to chat pre/post processing
This commit is contained in:
parent
12922658b9
commit
b9283607d6
10 changed files with 217 additions and 71 deletions
|
|
@ -19,6 +19,7 @@ const validator = require('validator');//No express here, so regular validator i
|
|||
|
||||
//Local Imports
|
||||
const tokebot = require('./tokebot');
|
||||
const linkUtils = require('../../utils/linkUtils');
|
||||
const permissionModel = require('../../schemas/permissionSchema');
|
||||
const channelModel = require('../../schemas/channel/channelSchema');
|
||||
|
||||
|
|
@ -39,6 +40,7 @@ module.exports = class commandPreprocessor{
|
|||
|
||||
//If we don't pass sanatization/validation turn this car around
|
||||
if(!this.sanatizeCommand()){
|
||||
console.log('test');
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -87,56 +89,14 @@ module.exports = class commandPreprocessor{
|
|||
}
|
||||
|
||||
async markLinks(){
|
||||
const maxSize = 4000000;
|
||||
//Empty out the links array
|
||||
this.links = [];
|
||||
|
||||
//For each link sent from the client
|
||||
//this.rawData.links.forEach((link) => {
|
||||
for (const link of this.rawData.links){
|
||||
//Set standard link type
|
||||
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
|
||||
try{
|
||||
//Pull content type
|
||||
var response = await fetch(link,{
|
||||
method: "HEAD",
|
||||
});
|
||||
|
||||
//Get file type from header
|
||||
const fileType = response.headers.get('content-type');
|
||||
const fileSize = response.headers.get('content-length');
|
||||
|
||||
//If they're reporting file types
|
||||
if(fileType != null){
|
||||
//If we have an image
|
||||
if(fileType.match('image/')){
|
||||
//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
|
||||
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
|
||||
type = 'video';
|
||||
}
|
||||
}
|
||||
}
|
||||
//Probably bad form but if something happens in here I'm blaming whoever hosted the link
|
||||
//maybe don't host a fucked up server and I wouldn't handle with an empty catch
|
||||
}catch{};
|
||||
|
||||
//Add a marked link object to our links array
|
||||
this.links.push({
|
||||
link,
|
||||
type
|
||||
});
|
||||
|
||||
this.links.push(await linkUtils.markLink(link));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue