diff --git a/src/app/channel/connectedUser.js b/src/app/channel/connectedUser.js
index 5347cb4..bec1409 100644
--- a/src/app/channel/connectedUser.js
+++ b/src/app/channel/connectedUser.js
@@ -197,6 +197,8 @@ class connectedUser{
chanDB = await channelModel.findOne({name: this.channel.name});
}
+ //If our perm map is un-initiated
+ //can't set this in constructor easily since it's asyncornous
//need to wait for it to complete before sending this off, but shouldnt re-do the wait for later connections
if(this.permMap == null){
//Grab perm map
@@ -236,7 +238,7 @@ class connectedUser{
const chatBuffer = this.channel.chatBuffer.buffer;
//Send off the metadata to our user's clients
- this.emit("clientMetadata", {user: userObj, flairList, queueLock, chatBuffer, streamType: chanDB.settings.streamType});
+ this.emit("clientMetadata", {user: userObj, flairList, queueLock, chatBuffer});
}
/**
diff --git a/src/app/channel/media/queue.js b/src/app/channel/media/queue.js
index ac2eb75..597c062 100644
--- a/src/app/channel/media/queue.js
+++ b/src/app/channel/media/queue.js
@@ -120,7 +120,6 @@ class queue{
socket.on("move", (data) => {this.moveMedia(socket, data)});
socket.on("lock", () => {this.toggleLock(socket)});
socket.on("goLive", (data) => {this.goLive(socket, data)});
- socket.on("getStreamType", (data) => {this.getStreamType(socket)});
//If debug mode is enabled
if(config.debug){
@@ -358,18 +357,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(chanDB.settings.streamType == "webrtc"){
- console.log("WEBRTC ENABLED, BAILING!");
- return;
- }
-
//If something is playing
if(this.nowPlaying != null){
//Capture currently playing object
@@ -416,7 +403,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;
@@ -428,22 +415,6 @@ class queue{
}
}
- /**
- * Returns current channel stream type upon request
- * @param {Socket} socket - Socket we received the request from
- */
- async getStreamType(socket){
- try{
- //Get the current channel from the database
- const chanDB = await channelModel.findOne({name: socket.chan});
-
- //Send streamtype back down to user (Not perm checking for something someone can figure out by looking at a running livestream)
- socket.emit("streamType", {streamType: chanDB.settings.streamType});
- }catch(err){
- return loggerUtils.socketExceptionHandler(socket, err);
- }
- }
-
async dumpQueue(socket, data){
//If we somehow got here while config.debug is disabled, or the user isn't allowed to preform server-side debugging
if(!(config.debug && await permissionModel.permCheck(socket.user, "debug"))){
diff --git a/src/schemas/channel/channelSchema.js b/src/schemas/channel/channelSchema.js
index 8bfa484..b6df0b1 100644
--- a/src/schemas/channel/channelSchema.js
+++ b/src/schemas/channel/channelSchema.js
@@ -35,11 +35,6 @@ const chatSchema = require('./chatSchema');
//Utils
const { exceptionHandler, errorHandler } = require('../../utils/loggerUtils');
-/**
- * "Enum" for emote type property
- */
-const streamMethodEnum = ["webrtc","hls"];
-
/**
* DB Schema for Documents containing de-hydrated representations of Canopy Stream/Chat Channels
*/
@@ -76,12 +71,6 @@ const channelSchema = new mongoose.Schema({
streamURL: {
type: mongoose.SchemaTypes.String,
default: ''
- },
- streamType: {
- type: mongoose.SchemaTypes.String,
- enum: streamMethodEnum,
- default: streamMethodEnum[0]
-
}
},
permissions: {
diff --git a/src/validators/channelValidator.js b/src/validators/channelValidator.js
index 9c87f55..92ef4b5 100644
--- a/src/validators/channelValidator.js
+++ b/src/validators/channelValidator.js
@@ -20,6 +20,15 @@ const { checkSchema, checkExact } = require('express-validator');
//local imports
const accountValidator = require('./accountValidator');
+module.exports = {
+
+ settingsMap: () => checkExact(checkSchema({
+ 'settingsMap.hidden': {
+ optional: true,
+ isBoolean: true,
+ } }))
+}
+
module.exports.name = function(field = 'name'){
return checkSchema({
[field]: {
@@ -80,13 +89,6 @@ module.exports.settingsMap = function(){
}
},
errorMessage: "Invalid Stream URL"
- },
- 'settingsMap.streamType': {
- optional: true,
- errorMessage: "Invalid Stream Type",
- matches: {
- options: [/\b(?:webrtc|hls)\b/]
- }
}
})
);
diff --git a/src/views/partial/channelSettings/settings.ejs b/src/views/partial/channelSettings/settings.ejs
index d8dd2ea..ec740eb 100644
--- a/src/views/partial/channelSettings/settings.ejs
+++ b/src/views/partial/channelSettings/settings.ejs
@@ -17,11 +17,7 @@ along with this program. If not, see . %>
Channel Preferences:
\ No newline at end of file
diff --git a/www/css/adminPanel.css b/www/css/adminPanel.css
index 1141bf5..dbcf120 100644
--- a/www/css/adminPanel.css
+++ b/www/css/adminPanel.css
@@ -139,16 +139,6 @@ img.admin-list-entry-item{
width: 8em;
}
-#channel-preference-list-stream-settings-grid{
- display: grid;
- grid-template-columns: auto auto;
- row-gap: 0.5em;
-}
-
-#channel-preference-list-stream-url {
- grid-column: 2;
-}
-
div.toke-command-list{
display: grid;
grid-template-columns: repeat(auto-fit, minmax(15em, 1fr));
diff --git a/www/js/channel/channel.js b/www/js/channel/channel.js
index 840b939..5663d48 100644
--- a/www/js/channel/channel.js
+++ b/www/js/channel/channel.js
@@ -117,10 +117,6 @@ class channel{
this.queueLock = data.locked;
});
- this.socket.on("streamType", (data) => {
- this.streamType = data.streamType;
- });
-
this.queueBroadcastSocket.on("queue", (data) => {
this.queue = new Map(data.queue);
});
@@ -150,9 +146,6 @@ class channel{
//Store queue lock status
this.queueLock = data.queueLock;
-
- //Store streamType
- this.streamType = data.streamType;
}
/**
diff --git a/www/js/channel/panels/queuePanel/queuePanel.js b/www/js/channel/panels/queuePanel/queuePanel.js
index 7f258e3..c254caa 100644
--- a/www/js/channel/panels/queuePanel/queuePanel.js
+++ b/www/js/channel/panels/queuePanel/queuePanel.js
@@ -54,8 +54,6 @@ class queuePanel extends panelObj{
*/
this.playlistManager = new playlistManager(client, panelDocument, this);
- this.streamType = "";
-
//Define non-input event listeners
this.defineListeners();
}
@@ -67,9 +65,6 @@ class queuePanel extends panelObj{
//Call derived doc switch function
super.docSwitch();
- //Request Channel Stream Type
- this.client.socket.emit('getStreamType');
-
//Get queue div
this.queue = this.panelDocument.querySelector('#queue');
//Get queue container
@@ -248,10 +243,6 @@ class queuePanel extends panelObj{
}
}
- handleStreamType(data){
-
- }
-
/* queue control button functions */
/**
@@ -278,9 +269,6 @@ class queuePanel extends panelObj{
* @param {Event} event - Event passed down from Event Listener
*/
toggleGoLive(event){
- //Request stream type from the server Just-InCase™
- client.socket.emit('getStreamType');
-
//If we're not livestreaming
if(client.player.mediaHandler.type != "livehls"){
//If the div is hidden
diff --git a/www/js/channelSettings.js b/www/js/channelSettings.js
index 74bbe49..36fa99a 100644
--- a/www/js/channelSettings.js
+++ b/www/js/channelSettings.js
@@ -24,7 +24,6 @@ class channelSettingsPage{
this.banList = new banList(this.channel);
this.permList = new permList(this.channel);
this.prefrenceList = new prefrenceList(this.channel);
- this.livestreamPreferences = new livestreamPreferences(this.channel);
this.tokeCommandList = new tokeCommandList(this.channel);
this.emoteList = new emoteList(this.channel);
this.deleteBtn = new deleteBtn(this.channel);
@@ -365,72 +364,6 @@ class prefrenceList{
}
}
-class livestreamPreferences{
- constructor(channel){
- this.channel = channel;
-
- //Grab inputs
- this.webRTCButton = document.querySelector("#channel-preference-list-stream-type-webrtc");
- this.hlsButton = document.querySelector("#channel-preference-list-stream-type-hls");
- this.streamURL = document.querySelector("#channel-preference-list-stream-url");
-
- //Setup Input
- this.setupInput();
- }
-
- setupInput(){
- //Add event listeners
- this.webRTCButton.addEventListener("change", this.submitTypeUpdate.bind(this));
- this.hlsButton.addEventListener("change", this.submitTypeUpdate.bind(this));
- this.streamURL.addEventListener("change",this.submitURLUpdate.bind(this));
- }
-
- async submitURLUpdate(event){
- //Grab value from event target
- const value = event.target.value;
-
- //Send setting change request to server, and store update once its received
- const update = await utils.ajax.setChannelSetting(this.channel, new Map([["streamURL", value]]));
-
- //If we we're given a good update
- if(update != null && update.streamURL != null){
- //Display the new streamURL in the input (I'm not making a dedicated method for a fuckin' one-liner)
- this.streamURL.value = update.streamURL
- }
- }
-
- async submitTypeUpdate(event){
- //Grab value from event target
- const value = event.target.value;
-
- //Send setting change request to server, and store update once its received
- const update = await utils.ajax.setChannelSetting(this.channel, new Map([["streamType", value]]));
-
- //Pass update to the handleUpdate method
- this.handleTypeUpdate(update);
- }
-
- handleTypeUpdate(data){
- //If the stream type is HLS
- if(data.streamType == "hls"){
- //Ensure the hls button is checked
- this.hlsButton.checked = true;
- //Ensure the stream url input is enabled
- this.streamURL.disabled = false;
- //Otherwise
- }else{
- //Ensure the stream url input is disabled
- this.streamURL.disabled = true;
- }
-
- //If the stream type is webrtc
- if(data.streamType == "webrtc"){
- //Ensure the webrtc button is checked
- this.webRTCButton.checked = true;
- }
- }
-}
-
class permList{
constructor(channel){
this.channel = channel