diff --git a/README.md b/README.md index b333dfb..a61d209 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Canopy -0.1-Alpha (Panama Red) - Hotfix 2 +0.1-Alpha (Panama Red) - Hotfix 3 ========= Canopy - /ˈkæ.nə.pi/: diff --git a/config.example.json b/config.example.json index 5d8f957..7b869b3 100644 --- a/config.example.json +++ b/config.example.json @@ -34,5 +34,10 @@ "address": "toke@42069.weed", "pass": "CHANGE_ME" }, + "links":{ + "About": "/about", + "Code": "https://git.ourfore.st/rainbownapkin/canopy", + "HRT": "/hrt" + }, "aboutText":"ourfore.st is the one and only original canopy instance. Setup, ran, and administered by rainbownapkin herself. This site exists to provide a featureful, preformant, and comfy replacement for the TTN community." } \ No newline at end of file diff --git a/config.example.jsonc b/config.example.jsonc index f315d9a..3669d09 100644 --- a/config.example.jsonc +++ b/config.example.jsonc @@ -65,6 +65,12 @@ "address": "toke@42069.weed", "pass": "CHANGE_ME" }, + //Provides customizable links for navbar + "links":{ + "About": "/about", + "Code": "https://git.ourfore.st/rainbownapkin/canopy", + "HRT": "/hrt" + }, //Fills the 'about ${instanceName}' section on the /about page, lets users know about your specific instance "aboutText":"ourfore.st is the one and only original canopy instance. Setup, ran, and administered by rainbownapkin herself. This site exists to provide a featureful, preformant, and comfy replacement for the TTN community." } \ No newline at end of file diff --git a/package.json b/package.json index ee1cb25..54af4f0 100644 --- a/package.json +++ b/package.json @@ -1,14 +1,14 @@ { "name": "canopy-of-alpha", - "version": "0.1.2", - "canopyDisplayVersion": "0.1-Alpha (Panama Red) - Hotfix 2", + "version": "0.1.3", + "canopyDisplayVersion": "0.1-Alpha (Panama Red) - Hotfix 3", "license": "AGPL-3.0-only", "dependencies": { "@braintree/sanitize-url": "^7.1.1", - "altcha": "^1.0.7", + "altcha": "^2.3.0", "altcha-lib": "^1.2.0", "argon2": "^0.44.0", - "bcrypt": "^5.1.1", + "bcrypt": "^6.0.0", "bootstrap-icons": "^1.11.3", "connect-mongo": "^5.1.0", "cookie-parser": "^1.4.7", @@ -20,8 +20,8 @@ "hls.js": "^1.6.2", "mongoose": "^8.4.3", "node-cron": "^3.0.3", - "nodemailer": "^7.0.9", - "socket.io": "^4.8.1", + "nodemailer": "^8.0.7", + "socket.io": "^4.2.0", "youtube-dl-exec": "^3.0.20" }, "scripts": { diff --git a/src/app/chatPreprocessor.js b/src/app/chatPreprocessor.js index a4331ab..dc3d4bd 100644 --- a/src/app/chatPreprocessor.js +++ b/src/app/chatPreprocessor.js @@ -57,7 +57,7 @@ class chatPreprocessor{ //If we don't pass sanatization/validation turn this car around if(!this.sanatizeCommand(commandObj)){ - return; + return false; } //split the command diff --git a/src/controllers/404Controller.js b/src/controllers/404Controller.js index 471ea16..3e7a4e0 100644 --- a/src/controllers/404Controller.js +++ b/src/controllers/404Controller.js @@ -26,5 +26,5 @@ module.exports = async function(req, res){ res.status(404); //Render page - return res.render('404', {instance: config.instanceName, user: req.session.user, csrfToken: csrfUtils.generateToken(req)}); + return res.render('404', {instance: config.instanceName, links: config.links, user: req.session.user, csrfToken: csrfUtils.generateToken(req)}); } \ No newline at end of file diff --git a/src/controllers/aboutController.js b/src/controllers/aboutController.js index 187157b..249e931 100644 --- a/src/controllers/aboutController.js +++ b/src/controllers/aboutController.js @@ -24,5 +24,5 @@ const csrfUtils = require('../utils/csrfUtils'); //register page functions module.exports.get = async function(req, res){ //Render page - return res.render('about', {aboutText: config.aboutText, instance: config.instanceName, user: req.session.user, version: package.canopyDisplayVersion, csrfToken: csrfUtils.generateToken(req)}); + return res.render('about', {aboutText: config.aboutText, instance: config.instanceName, links: config.links, user: req.session.user, version: package.canopyDisplayVersion, csrfToken: csrfUtils.generateToken(req)}); } \ No newline at end of file diff --git a/src/controllers/adminPanelController.js b/src/controllers/adminPanelController.js index ca1a74c..6ecdaee 100644 --- a/src/controllers/adminPanelController.js +++ b/src/controllers/adminPanelController.js @@ -42,7 +42,7 @@ module.exports.get = async function(req, res){ //Render out the page return res.render('adminPanel', { - instance: config.instanceName, + instance: config.instanceName, links: config.links, user: req.session.user, rankEnum: permissionModel.rankEnum, chanGuide: chanGuide, diff --git a/src/controllers/channelController.js b/src/controllers/channelController.js index dd27fcd..fef37a7 100644 --- a/src/controllers/channelController.js +++ b/src/controllers/channelController.js @@ -22,5 +22,5 @@ const csrfUtils = require('../utils/csrfUtils'); //channel functions module.exports.get = function(req, res){ - res.render('channel', {instance: config.instanceName, user: req.session.user, csrfToken: csrfUtils.generateToken(req)}); + res.render('channel', {instance: config.instanceName, links: config.links, user: req.session.user, csrfToken: csrfUtils.generateToken(req)}); } \ No newline at end of file diff --git a/src/controllers/channelSettingsController.js b/src/controllers/channelSettingsController.js index e310773..3559503 100644 --- a/src/controllers/channelSettingsController.js +++ b/src/controllers/channelSettingsController.js @@ -42,7 +42,7 @@ module.exports.get = async function(req, res){ throw loggerUtils.exceptionSmith("Channel not found.", "queue"); } - return res.render('channelSettings', {instance: config.instanceName, user: req.session.user, channel: chanDB, reqRank, rankEnum: permissionModel.rankEnum, csrfToken: csrfUtils.generateToken(req), unescape: validator.unescape}); + return res.render('channelSettings', {instance: config.instanceName, links: config.links, user: req.session.user, channel: chanDB, reqRank, rankEnum: permissionModel.rankEnum, csrfToken: csrfUtils.generateToken(req), unescape: validator.unescape}); }catch(err){ return exceptionHandler(res, err); } diff --git a/src/controllers/emailChangeController.js b/src/controllers/emailChangeController.js index fb9cabd..6b0b99d 100644 --- a/src/controllers/emailChangeController.js +++ b/src/controllers/emailChangeController.js @@ -40,18 +40,18 @@ module.exports.get = async function(req, res){ //If we have an invalid request if(requestDB == null){ - return res.render('emailChange', {instance: config.instanceName, user: req.session.user, csrfToken: csrfUtils.generateToken(req), valid: false}); + return res.render('emailChange', {instance: config.instanceName, links: config.links, user: req.session.user, csrfToken: csrfUtils.generateToken(req), valid: false}); } //Speak of our success (don't wait for the emails to be sent) - res.render('emailChange', {instance: config.instanceName, user: req.session.user, csrfToken: csrfUtils.generateToken(req), valid: true}); + res.render('emailChange', {instance: config.instanceName, links: config.links, user: req.session.user, csrfToken: csrfUtils.generateToken(req), valid: true}); //Consume the request await requestDB.consume(); }else{ - return res.render('emailChange', {instance: config.instanceName, user: req.session.user, csrfToken: csrfUtils.generateToken(req), valid: false}); + return res.render('emailChange', {instance: config.instanceName, links: config.links, user: req.session.user, csrfToken: csrfUtils.generateToken(req), valid: false}); } }catch(err){ - return res.render('emailChange', {instance: config.instanceName, user: req.session.user, csrfToken: csrfUtils.generateToken(req), valid: false}); + return res.render('emailChange', {instance: config.instanceName, links: config.links, user: req.session.user, csrfToken: csrfUtils.generateToken(req), valid: false}); } } \ No newline at end of file diff --git a/src/controllers/hrtController.js b/src/controllers/hrtController.js index e03d5ac..7b1b920 100644 --- a/src/controllers/hrtController.js +++ b/src/controllers/hrtController.js @@ -24,5 +24,5 @@ const csrfUtils = require('../utils/csrfUtils'); //register page functions module.exports.get = async function(req, res){ //Render page - return res.render('hrt', {instance: config.instanceName, user: req.session.user, csrfToken: csrfUtils.generateToken(req)}); + return res.render('hrt', {instance: config.instanceName, links: config.links, user: req.session.user, csrfToken: csrfUtils.generateToken(req)}); } \ No newline at end of file diff --git a/src/controllers/indexController.js b/src/controllers/indexController.js index 30e9682..a06cfec 100644 --- a/src/controllers/indexController.js +++ b/src/controllers/indexController.js @@ -29,7 +29,7 @@ const {exceptionHandler, errorHandler} = require('../utils/loggerUtils'); module.exports.get = async function(req, res){ try{ const chanGuide = await channelModel.getChannelList(); - return res.render('index', {instance: config.instanceName, user: req.session.user, chanGuide: chanGuide, csrfToken: csrfUtils.generateToken(req), unescape: validator.unescape}); + return res.render('index', {instance: config.instanceName, links: config.links, user: req.session.user, chanGuide: chanGuide, csrfToken: csrfUtils.generateToken(req), unescape: validator.unescape}); }catch(err){ return exceptionHandler(res, err); } diff --git a/src/controllers/loginController.js b/src/controllers/loginController.js index a25d316..ffa5fc8 100644 --- a/src/controllers/loginController.js +++ b/src/controllers/loginController.js @@ -45,7 +45,7 @@ module.exports.get = async function(req, res){ //if we have previous attempts for this user if(attempts != null){ if(attempts.count > sessionUtils.maxAttempts){ - return res.render('lockedAccount', {instance: config.instanceName, user: req.session.user, csrfToken: csrfUtils.generateToken(req)}); + return res.render('lockedAccount', {instance: config.instanceName, links: config.links, user: req.session.user, csrfToken: csrfUtils.generateToken(req)}); } //If the users login's are being throttled @@ -56,16 +56,16 @@ module.exports.get = async function(req, res){ const challenge = await altchaUtils.genCaptcha(difficulty, user); //Render page - return res.render('login', {instance: config.instanceName, user: req.session.user, challenge, csrfToken: csrfUtils.generateToken(req)}); + return res.render('login', {instance: config.instanceName, links: config.links, user: req.session.user, challenge, csrfToken: csrfUtils.generateToken(req)}); } //otherwise }else{ //Render generic page - return res.render('login', {instance: config.instanceName, user: req.session.user, challenge: null, csrfToken: csrfUtils.generateToken(req)}); + return res.render('login', {instance: config.instanceName, links: config.links, user: req.session.user, challenge: null, csrfToken: csrfUtils.generateToken(req)}); } //if we received invalid input }else{ //Render pretend nothing happened, send out a generic page - return res.render('login', {instance: config.instanceName, user: req.session.user, challenge: null, csrfToken: csrfUtils.generateToken(req)}); + return res.render('login', {instance: config.instanceName, links: config.links, user: req.session.user, challenge: null, csrfToken: csrfUtils.generateToken(req)}); } } \ No newline at end of file diff --git a/src/controllers/migrateController.js b/src/controllers/migrateController.js index ea82e5e..a46d3b2 100644 --- a/src/controllers/migrateController.js +++ b/src/controllers/migrateController.js @@ -27,5 +27,5 @@ module.exports.get = async function(req, res){ const challenge = await altchaUtils.genCaptcha(); //Render page - return res.render('migrate', {instance: config.instanceName, user: req.session.user, challenge, csrfToken: csrfUtils.generateToken(req)}); + return res.render('migrate', {instance: config.instanceName, links: config.links, user: req.session.user, challenge, csrfToken: csrfUtils.generateToken(req)}); } \ No newline at end of file diff --git a/src/controllers/newChannelController.js b/src/controllers/newChannelController.js index ee77166..233c99a 100644 --- a/src/controllers/newChannelController.js +++ b/src/controllers/newChannelController.js @@ -27,5 +27,5 @@ module.exports.get = async function(req, res){ const challenge = await altchaUtils.genCaptcha(); //render the page - return res.render('newChannel', {instance: config.instanceName, user: req.session.user, challenge, csrfToken: csrfUtils.generateToken(req)}); + return res.render('newChannel', {instance: config.instanceName, links: config.links, user: req.session.user, challenge, csrfToken: csrfUtils.generateToken(req)}); } \ No newline at end of file diff --git a/src/controllers/panel/popoutContainerController.js b/src/controllers/panel/popoutContainerController.js index 6993f9e..619cf18 100644 --- a/src/controllers/panel/popoutContainerController.js +++ b/src/controllers/panel/popoutContainerController.js @@ -19,5 +19,5 @@ const config = require('../../../config.json'); //popout panel container functions module.exports.get = async function(req, res){ - res.render('popoutContainer', {instance: config.instanceName}); + res.render('popoutContainer', {instance: config.instanceName, links: config.links}); } \ No newline at end of file diff --git a/src/controllers/passwordResetController.js b/src/controllers/passwordResetController.js index 1d47fae..5fd392c 100644 --- a/src/controllers/passwordResetController.js +++ b/src/controllers/passwordResetController.js @@ -47,11 +47,11 @@ module.exports.get = async function(req, res){ */ //Render page - return res.render('passwordReset', {instance: config.instanceName, user: req.session.user, challenge, token, csrfToken: csrfUtils.generateToken(req)}); + return res.render('passwordReset', {instance: config.instanceName, links: config.links, user: req.session.user, challenge, token, csrfToken: csrfUtils.generateToken(req)}); //If we didn't get a valid token }else{ //otherwise render generic page - return res.render('passwordReset', {instance: config.instanceName, user: req.session.user, challenge, token: null, csrfToken: csrfUtils.generateToken(req)}); + return res.render('passwordReset', {instance: config.instanceName, links: config.links, user: req.session.user, challenge, token: null, csrfToken: csrfUtils.generateToken(req)}); } }catch(err){ return exceptionHandler(res, err); diff --git a/src/controllers/profileController.js b/src/controllers/profileController.js index 67d1895..df5b9c2 100644 --- a/src/controllers/profileController.js +++ b/src/controllers/profileController.js @@ -42,7 +42,7 @@ module.exports.get = async function(req, res){ const presence = await presenceUtils.getPresence(profile.user); res.render('profile', { - instance: config.instanceName, + instance: config.instanceName, links: config.links, user: req.session.user, profile, selfProfile, @@ -52,7 +52,7 @@ module.exports.get = async function(req, res){ }); }else{ res.render('profile', { - instance: config.instanceName, + instance: config.instanceName, links: config.links, user: req.session.user, profile: null, selfProfile: false, diff --git a/src/controllers/registerController.js b/src/controllers/registerController.js index 91fb5b0..9f2eb14 100644 --- a/src/controllers/registerController.js +++ b/src/controllers/registerController.js @@ -27,5 +27,5 @@ module.exports.get = async function(req, res){ const challenge = await altchaUtils.genCaptcha(); //Render page - return res.render('register', {instance: config.instanceName, user: req.session.user, challenge, csrfToken: csrfUtils.generateToken(req)}); + return res.render('register', {instance: config.instanceName, links: config.links, user: req.session.user, challenge, csrfToken: csrfUtils.generateToken(req)}); } \ No newline at end of file diff --git a/src/utils/linkUtils.js b/src/utils/linkUtils.js index 9e85870..76b8e45 100644 --- a/src/utils/linkUtils.js +++ b/src/utils/linkUtils.js @@ -14,6 +14,9 @@ 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 .*/ +//Config +const config = require('../../config.json'); + //NPM Imports const validator = require('validator');//No express here, so regular validator it is! const {sanitizeUrl} = require("@braintree/sanitize-url"); @@ -32,6 +35,15 @@ module.exports.cache = new Map(); module.exports.markLink = async function(dirtyLink){ const link = sanitizeUrl(dirtyLink); + //If this link is referencing this web server + if(link.match(new RegExp(`^${config.protocol}://${config.domain}`)) != null){ + //Lazily return it as a good link, since we know it'll at least return a good 404 page XP + return { + link, + type: "link" + } + } + //Check link cache for the requested link const cachedLink = module.exports.cache.get(link); @@ -105,4 +117,4 @@ module.exports.markLink = async function(dirtyLink){ //return the link return linkObj; -} \ No newline at end of file +} diff --git a/src/utils/media/yanker.js b/src/utils/media/yanker.js index 2dff869..cb6697b 100644 --- a/src/utils/media/yanker.js +++ b/src/utils/media/yanker.js @@ -131,7 +131,7 @@ module.exports.getMediaType = async function(dirtyURL){ } //If we have link to a resource from archive.org - if(match = url.match(/archive\.org\/(?:details|download)\/([a-zA-Z0-9\/._-\s\%]+)/)){ + if(match = url.match(/archive\.org\/(?:details|download)\/(.+)/)){ //return internet archive upload id and filepath return { type: "ia", diff --git a/src/views/partial/navbar.ejs b/src/views/partial/navbar.ejs index aa9a56a..c8c3528 100644 --- a/src/views/partial/navbar.ejs +++ b/src/views/partial/navbar.ejs @@ -20,13 +20,24 @@ along with this program. If not, see . %> <% if(user){ %> -

Welcome, <%= user.user %> - <% if(user.rank == "admin"){ %> - <% } %> About - Logout

+

Welcome, <%= user.user %> - <% if(user.rank == "admin"){ %> + - + <% } %> + + <% for(link of Object.keys(links)){ %> + <%= link %> - + <% } %> + + Logout

<% }else{ %>

Remember Me:

-

Login - Forgot Password - Register - About

+

Login - Forgot Password - Register + <% for(link of Object.keys(links)){ %> + - <%= link %> + <% } %>

<% } %> \ No newline at end of file diff --git a/src/views/partial/panels/settings.ejs b/src/views/partial/panels/settings.ejs index 6fe53d2..320c3e7 100644 --- a/src/views/partial/panels/settings.ejs +++ b/src/views/partial/panels/settings.ejs @@ -16,7 +16,7 @@ along with this program. If not, see . %>

Client Settings

-

Player Settings

+

Playeback Settings

Youtube Player Type:

-

Chat Settings

+

Display Settings

-

Aspect-Ratio Lock Chat Width Minimum:

+

Chat Width Minimum While Locked to Aspect Ratio:

+ +

Disable Portrait/Mobile Layout:

+ +

Notification Settings

Play Sound for received PMs:

diff --git a/www/img/strikethrough.svg b/www/img/strikethrough.svg index 7c41d20..40e46a2 100644 --- a/www/img/strikethrough.svg +++ b/www/img/strikethrough.svg @@ -1,11 +1,11 @@ - + diff --git a/www/js/channel/channel.js b/www/js/channel/channel.js index 6da26c3..18a6996 100644 --- a/www/js/channel/channel.js +++ b/www/js/channel/channel.js @@ -288,6 +288,16 @@ class channel{ //Set Chat Box Width minimum while Locked to Aspect-Ratio this.chatBox.chatWidthMinimum = value / 100; return; + case 'disablePortrait': + //If the chat isn't loaded + if(this.chatBox == null){ + //We're fuckin' done here + return; + } + + //Toggle portrait mode + this.chatBox.togglePortrait(); + return; case 'userlistHidden': //If the userlist class isn't loaded in yet if(this.userList == null){ @@ -326,7 +336,8 @@ class channel{ ["rxPMSound", 'unread'], ["txPMSound", false], ["newSeshSound", true], - ["endSeshSound", true] + ["endSeshSound", true], + ["disablePortrait", false] ]); } diff --git a/www/js/channel/chat.js b/www/js/channel/chat.js index 5311fb5..ee15e7a 100644 --- a/www/js/channel/chat.js +++ b/www/js/channel/chat.js @@ -38,6 +38,11 @@ class chatBox{ */ this.autoScroll = true; + /** + * Whether or not the screen is currently in portrait mode + */ + this.portrait = false; + /** * Chat-Width Minimum while sized to media Aspect-Ratio */ @@ -74,6 +79,11 @@ class chatBox{ this.chatPostprocessor = new chatPostprocessor(client); //Element Nodes + /** + * Channel Div + */ + this.channelDiv = document.querySelector("#channel-flexbox"); + /** * Chat Panel Container Div */ @@ -473,8 +483,14 @@ class chatBox{ resizeAspect(event){ const playerHidden = this.client.player.playerDiv.style.display == "none"; - //If the aspect is locked and the player is hidden - if(this.aspectLock && !playerHidden){ + //If window is taller than wide and not in portrait mode, or vice-versa + if(this.portrait != (window.innerWidth <= window.innerHeight)){ + //Toggle portrait mode + this.togglePortrait(); + } + + //If the aspect is locked/the window is portrait and the player isn't hidden + if((this.aspectLock || this.portrait) && !playerHidden){ this.sizeToAspect(); //Otherwise }else{ @@ -490,24 +506,72 @@ class chatBox{ * Re-sizes chat box relative to media aspect ratio */ sizeToAspect(){ + //If the chat panel is visible if(this.chatPanel.style.display != "none"){ - var targetVidWidth = this.client.player.getRatio() * this.chatPanel.getBoundingClientRect().height; - const targetChatWidth = window.innerWidth - targetVidWidth; - //This should be changeable in settings later on, for now it defaults to 20% - const limit = window.innerWidth * this.chatWidthMinimum; + //If our window width is more than or equal to window height (not portrait mode) + if(!this.portrait){ + //Get target video width by multiplying media ratio by window height + var targetVidWidth = this.client.player.getRatio() * this.chatPanel.getBoundingClientRect().height; + //Get target chat width my subtracting target media width from total window width + const targetChatWidth = window.innerWidth - targetVidWidth; + //This should be changeable in settings later on, for now it defaults to 20% + const limit = window.innerWidth * this.chatWidthMinimum; - //Set width to target or 20vw depending on whether or not we've hit the width limit - this.chatPanel.style.flexBasis = targetChatWidth > limit ? `${targetChatWidth}px` : `${this.chatWidthMinimum * 100}vw`; + //Set width to target or 20vw depending on whether or not we've hit the width limit + this.chatPanel.style.flexBasis = targetChatWidth > limit ? `${targetChatWidth}px` : `${this.chatWidthMinimum * 100}vw`; + + //Fix busted layout + var pageBreak = document.body.scrollWidth - document.body.getBoundingClientRect().width; + this.chatPanel.style.flexBasis = `${this.chatPanel.getBoundingClientRect().width + pageBreak}px`; + }else{ + //Calculate target video height from media aspect ratio and window width + var targetVidHeight = window.innerWidth / this.client.player.getRatio(); + //Calculate target chat height from the difference between the channel div height and the target video height + var targetChatHeight = this.channelDiv.getBoundingClientRect().height - targetVidHeight; + + //Set div heights accordingly + this.client.player.playerDiv.style.height = `${targetVidHeight}px`; + this.chatPanel.style.height = `${targetChatHeight}px`; + } - //Fix busted layout - var pageBreak = document.body.scrollWidth - document.body.getBoundingClientRect().width; - this.chatPanel.style.flexBasis = `${this.chatPanel.getBoundingClientRect().width + pageBreak}px`; //This sometimes gets called before userList ahs been initiated :p if(this.client.userList != null){ this.client.userList.clickDragger.fixCutoff(); } + } + } + + togglePortrait(){ + //If our window width is more than or equal to window height (not portrait mode), or portrait mode is on while its supposed to be disabled + if(window.innerWidth >= window.innerHeight || (localStorage.getItem("disablePortrait") == 'true' && this.portrait)){ + //Disable portrait CSS modifiers + this.channelDiv.style.flexDirection = "row"; + this.clickDragger.enabled = true; + this.chatPanel.style.width = ""; + this.client.player.playerDiv.style.height = ""; + this.chatPanel.style.height = ""; + + //Disable portrait behavior modifiers + this.portrait = false; + + //resize player in-case of empty flex basis + this.resizeAspect(); + + //Otherwise, if portrait mode is enabled + }else if(localStorage.getItem("disablePortrait") != 'true'){ + //Modify CSS for portrait displays + this.channelDiv.style.flexDirection = "column"; + this.clickDragger.enabled = false; + this.chatPanel.style.width = "100%"; + this.chatPanel.style.flexBasis = ""; + + //Enable portrait behavior modifiers + this.portrait = true; + + //resize player to correct height + this.resizeAspect(); } - } + } /** * Toggles Chat Box UX diff --git a/www/js/channel/chatPostprocessor.js b/www/js/channel/chatPostprocessor.js index a1b7e43..8dd9c31 100644 --- a/www/js/channel/chatPostprocessor.js +++ b/www/js/channel/chatPostprocessor.js @@ -144,7 +144,7 @@ class chatPostprocessor{ //with negative lookaheads to exclude file seperators so we don't split link placeholders, dashes so we dont split usernames and other things, and accented characters to keep those from splitting boundries too //Also split by any invisble whitespace as a crutch to handle mushed links/emotes //If we can one day figure out how to split non-repeating special chars instead of special chars with whitespace, that would be perf, unfortunately my brain hasn't rotted enough to understand regex like that just yet. - const splitString = utils.unescapeEntities(this.rawData.msg).split(/(? { @@ -474,7 +474,7 @@ class chatPostprocessor{ //After eight characters if(charIndex > 8){ //Push an invisible line-break character between every character - wordArray.push("ㅤ"); + wordArray.push("​"); } }); diff --git a/www/js/channel/commandPreprocessor.js b/www/js/channel/commandPreprocessor.js index 1dbc218..efed2ab 100644 --- a/www/js/channel/commandPreprocessor.js +++ b/www/js/channel/commandPreprocessor.js @@ -116,14 +116,14 @@ class commandPreprocessor{ */ processEmotes(){ //inject invisible whitespace in-between emotes to prevent from mushing links together - this.message = this.message.replaceAll('][',']ㅤ['); + this.message = this.message.replaceAll('][',']​['); //For each list of emotes Object.keys(this.emotes).forEach((key) => { //For each emote in the current list this.emotes[key].forEach((emote) => { //Inject emote links into the message, pad with invisible whitespace to keep link from getting mushed - this.message = this.message.replaceAll(`[${emote.name}]`, `ㅤ${emote.link}ㅤ`); + this.message = this.message.replaceAll(`[${emote.name}]`, `​${emote.link}​`); }); }); } @@ -135,13 +135,13 @@ class commandPreprocessor{ //Strip out file seperators in-case the user is being a smart-ass this.message = this.message.replaceAll('␜',''); //Split message by links - var splitMessage = this.message.split(/(https?:\/\/[^\sㅤ]+)/g); + var splitMessage = this.message.split(/(https?:\/\/[^\s​]+)/g); //Create an empty array to hold links this.links = []; splitMessage.forEach((chunk, chunkIndex) => { //For each chunk that is a link - if(chunk.match(/(https?:\/\/[^\sㅤ]+)/g)){ + if(chunk.match(/(https?:\/\/[^\s​]+)/g)){ //I looked online for obscure characters that no one would use to prevent people from chatting embed placeholders //Then I found this fucker, turns out it's literally made for the job lmao (even if it was originally intended for paper/magnetic tape) //Replace link with indexed placeholder diff --git a/www/js/channel/panels/queuePanel/queuePanel.js b/www/js/channel/panels/queuePanel/queuePanel.js index a872c92..2bfd1c7 100644 --- a/www/js/channel/panels/queuePanel/queuePanel.js +++ b/www/js/channel/panels/queuePanel/queuePanel.js @@ -1233,6 +1233,11 @@ class queuePanel extends panelObj{ //Convert start epoch to JS date object const started = new Date(nowPlaying.startTime); + //If the date the scheduler is set to isn't within the livestream + if(!utils.isSameDate(started, this.day) && !utils.dateWithinRange(started, new Date(), this.day)){ + return; + } + //If this started today if(utils.isSameDate(this.day, started)){ //Set entryDiv top-border location based on start time @@ -1246,15 +1251,29 @@ class queuePanel extends panelObj{ entryDiv.style.top = `${this.offsetByDate(dawn)}px`; //Apply rest of the styling rules for items that started yestarday - entryDiv.classList.add('started-yesterday') + entryDiv.classList.add('started-yesterday'); } //Create entry title const entryTitle = document.createElement('p'); entryTitle.textContent = utils.unescapeEntities(nowPlaying.title); - //Set entry div bottom-border location based on current time, round to match time marker - entryDiv.style.bottom = `${Math.round(this.offsetByDate(date, true))}px` + + //If we're looking at today + if(utils.isSameDate(this.day, new Date())){ + //Set entry div bottom-border location based on current time, round to match time marker + entryDiv.style.bottom = `${Math.round(this.offsetByDate(date, true))}px`; + }else{ + //Get midnight + const dusk = new Date(); + dusk.setHours(23,59,59,999); + + //Set stream to continue to run into the next morning + entryDiv.style.bottom = `${Math.round(this.offsetByDate(dusk, true))}px`; + + //Apply rest of the styling rules for items that end after today + entryDiv.classList.add('ends-tomorrow'); + } //Assembly entryDiv entryDiv.appendChild(entryTitle); @@ -1285,8 +1304,11 @@ class queuePanel extends panelObj{ //Append entry div to queue container this.queueContainer.appendChild(entryDiv); }else{ - //Update existing entry, round offset to match time marker - staleEntry.style.bottom = `${Math.round(this.offsetByDate(date, true))}px` + //If we're looking at today + if(utils.isSameDate(this.day, new Date())){ + //Update existing entry, round offset to match time marker + staleEntry.style.bottom = `${Math.round(this.offsetByDate(date, true))}px` + } } //Keep tooltip date seperate so it re-calculates live duration properly @@ -1541,7 +1563,7 @@ class reschedulePopup extends schedulePopup{ this.media = media; } - startSesh(event){ + schedule(event){ //If we clicked or hit enter if(event.key == null || event.key == "Enter"){ //Get localized input date diff --git a/www/js/channel/panels/settingsPanel.js b/www/js/channel/panels/settingsPanel.js index e9f0519..73e5dc9 100644 --- a/www/js/channel/panels/settingsPanel.js +++ b/www/js/channel/panels/settingsPanel.js @@ -62,6 +62,11 @@ class settingsPanel extends panelObj{ */ this.chatWidthMinimum = this.panelDocument.querySelector("#settings-panel-min-chat-width input"); + /** + * Disable Portrait/Mobile Layout + */ + this.disablePortrait = this.panelDocument.querySelector("#settings-panel-disable-portrait input"); + /** * Audible Ping on PM Recieved */ @@ -99,6 +104,7 @@ class settingsPanel extends panelObj{ this.liveSyncTolerance.addEventListener('change', this.updateLiveSyncTolerance.bind(this)); this.syncDelta.addEventListener('change', this.updateSyncDelta.bind(this)); this.chatWidthMinimum.addEventListener('change', this.updateChatWidthMinimum.bind(this)); + this.disablePortrait.addEventListener('change', this.updateDisablePortrait.bind(this)); this.rxPMSound.addEventListener('change', this.updateRXPMSound.bind(this)); this.txPMSound.addEventListener('change', this.updateTXPMSound.bind(this)); this.newSeshSound.addEventListener('change', this.updateNewPMSeshSound.bind(this)); @@ -115,6 +121,7 @@ class settingsPanel extends panelObj{ this.liveSyncTolerance.value = localStorage.getItem("liveSyncTolerance"); this.syncDelta.value = localStorage.getItem("syncDelta"); this.chatWidthMinimum.value = localStorage.getItem("chatWidthMin"); + this.disablePortrait.checked = localStorage.getItem("disablePortrait") == 'true'; this.rxPMSound.value = localStorage.getItem('rxPMSound'); this.txPMSound.checked = localStorage.getItem('txPMSound') == 'true'; this.newSeshSound.checked = localStorage.getItem('newSeshSound') == 'true'; @@ -218,11 +225,20 @@ class settingsPanel extends panelObj{ client.processConfig("chatWidthMin", this.chatWidthMinimum.value); } + /** + * Handles change toggle of disable/enable portrait + */ + updateDisablePortrait(){ + localStorage.setItem('disablePortrait', this.disablePortrait.checked); + client.processConfig("disablePortrait", this.disablePortrait.checked); + } + /** * Handles changes to RX PM Sound setting */ updateRXPMSound(){ localStorage.setItem('rxPMSound', this.rxPMSound.value); + client.processConfig("rxPMSound", this.rxPMSound.value); } /** @@ -230,6 +246,7 @@ class settingsPanel extends panelObj{ */ updateTXPMSound(){ localStorage.setItem('txPMSound', this.txPMSound.checked); + client.processConfig("txPMSound", this.txPMSound.checked); } /** @@ -237,6 +254,7 @@ class settingsPanel extends panelObj{ */ updateNewPMSeshSound(){ localStorage.setItem('newSeshSound', this.newSeshSound.checked); + client.processConfig("newSeshSound", this.newSeshSound.checked); } /** @@ -244,5 +262,6 @@ class settingsPanel extends panelObj{ */ updateEndPMSeshSound(){ localStorage.setItem('endSeshSound', this.endSeshSound.checked); + client.processConfig("endSeshSound", this.endSeshSound.checked); } } \ No newline at end of file