Compare commits

..

No commits in common. "0.1-alpha-hotfix-5" and "main" have entirely different histories.

3 changed files with 4 additions and 11 deletions

View file

@ -9,9 +9,8 @@ Canopy
<a href="https://git.ourfore.st/rainbownapkin/canopy/issues" target="_blank"><img src="https://git.ourfore.st/rainbownapkin/canopy/badges/issues/closed.svg"></a>
<a href="https://www.gnu.org/licenses/agpl-3.0.en.html" target="_blank"><img src="https://img.shields.io/badge/License-AGPL_v3-663366.svg"></a>
0.1-Alpha (Panama Red) - Hotfix 5
0.1-Alpha (Panama Red) - Hotfix 4
=========
(This build is an offshoot branch as a lazy way to apply this update both to current and future code in the dev branch)
Canopy - /ˈkæ.nə.pi/:
- The upper layer of foliage and branches of a forest, containing the majority of animal life.

View file

@ -1,7 +1,7 @@
{
"name": "canopy-of-alpha",
"version": "0.1.5",
"canopyDisplayVersion": "0.1-Alpha (Panama Red) - Hotfix 5",
"version": "0.1.4",
"canopyDisplayVersion": "0.1-Alpha (Panama Red) - Hotfix 4",
"license": "AGPL-3.0-only",
"dependencies": {
"@braintree/sanitize-url": "^7.1.1",

View file

@ -353,12 +353,6 @@ class queue{
throw loggerUtils.exceptionSmith(`Unable to find channel document ${this.channel.name} while queue item!`, "queue");
}
//If the user doesn't have permission to be doing this shit
if(!((!this.locked && await chanDB.permCheck(socket.user, 'scheduleMedia')) || await chanDB.permCheck(socket.user, 'scheduleAdmin'))){
//Fuggettabouttit!
return;
}
//If something is playing
if(this.nowPlaying != null){
//Capture currently playing object
@ -405,7 +399,7 @@ class queue{
);
//Validate mode input, and default to overwrite
this.liveMode = (data != null && data.mode == "pushback") ? "pushback" : "overwrite";
this.liveMode = (data.mode == "pushback") ? "pushback" : "overwrite";
//Throw stream lock
this.streamLock = true;