Skip to content

Commit a747f16

Browse files
spacevoyager03spacevoyager03
committed
raid video
1 parent 3c24907 commit a747f16

File tree

4 files changed

+89
-23
lines changed

4 files changed

+89
-23
lines changed

‎data/database.json

+1-1
Large diffs are not rendered by default.

‎src/config/config.js

+47-22
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,13 @@ let userPermissions = {
3131
commandPriority: ["commandAdmins", "commandSuperUsers", "commandMods", "commandOperator", "commandVips", "commandUsers"],
3232
commandAdmins: ["spacevoyage", "maya", "theconnorobrien", "alveussanctuary"],
3333
commandSuperUsers: ["ellaandalex", "dionysus1911", "dannydv", "maxzillajr", "illjx", "kayla_alveus", "alex_b_patrick",
34-
"lindsay_alveus", "strickknine","tarantulizer","spiderdaynightlive","srutiloops","evantomology","amanda2815"],
35-
commandMods: [userRanks.mods,"96allskills","dansza","echoskope","loganrx_","mattipv4","mik_mwp","pjeweb","shrezno",],
34+
"lindsay_alveus", "strickknine","tarantulizer","spiderdaynightlive","srutiloops","evantomology","amanda2815",
35+
"coltonactually"],
36+
commandMods: [userRanks.mods,"96allskills","dansza","echoskope","loganrx_","mattipv4","mik_mwp","pjeweb","shrezno","wazix11"],
3637
commandOperator: ["stolenarmy_", "berlac", "merger3", "nitelitedf","fixterjake14",
37-
"purplemartinconservation","wazix11","lazygoosepxls","alxiszzz","shutupleonard","taizun","lumberaxe1","glennvde",
38-
"wolfone_", "dohregard", "lakel1","darkrow_","minipurrl","gnomechildboi","danman149","hunnybeehelen","strangecyan",
39-
"viphippo","bagel_deficient","rhinofriend","ponchobee","orophia"],
38+
"purplemartinconservation","lazygoosepxls","alxiszzz","shutupleonard","taizun","lumberaxe1","glennvde",
39+
"wolfone_", "jugglinggrenades", "lakel1","darkrow_","minipurrl","gnomechildboi","danman149","hunnybeehelen","strangecyan",
40+
"viphippo","bagel_deficient","rhinofriend","ponchobee","orophia","catonascreen","phoenickes"],
4041
commandVips: [userRanks.vips, "tfries_", "sivvii_", "ghandii_", "axialmars",
4142
"jazz_peru", "stealfydoge", "xano218", "experimentalcyborg", "klav___", "monkarooo","nixxform","madcharliekelly",
4243
"josh_raiden", "jateu", "storesE6", "rebecca_h9", "matthewde", "user_11_11", "huniebeexd","kurtyykins",
@@ -51,7 +52,7 @@ let userBlacklist = ["RestreamBot"];
5152
//OBS Scene Commands
5253
const commandPermissionsScenes = {
5354
commandAdmins: ["testadminscene"],
54-
commandSuperUsers: ["testsuperscene", "backpackcam", "localbackpackcam", "serverpccam", "localpccam", "servernuthousecam", "phonecam","phone2cam"],
55+
commandSuperUsers: ["testsuperscene", "backpackcam", "localbackpackcam", "serverpccam", "localpccam", "servernuthousecam", "phonecam"],
5556
commandMods: ["testmodscene", "alveusserver", "brbscreen", "georgiecambackup", "noodlecambackup", "hankcambackup", "hankcam2backup", "roachcambackup", "isopodcambackup",
5657
"noodlegeorgiecambackup", "georgienoodlecambackup", "3cambackup", "4cambackup", "ellaintro", "kaylaintro", "connorintro","intro","poboxintro","aqintro",
5758
"accintro","accbrb","accending","ccintro","ccbrb","ccending","sntintro","sntbrb","sntending","nickintro","nickbrb","nickending",
@@ -78,7 +79,7 @@ const throttleCommandLength = 30000;
7879
//Customcam scene names
7980
const commandPermissionsCustomCam = {
8081
commandAdmins: [],
81-
commandSuperUsers: ["nuthousecam", "localpccam", "backpackcam", "phonecam","phone2cam"],
82+
commandSuperUsers: ["nuthousecam", "localpccam", "backpackcam", "phonecam","phone2cam","phone3cam"],
8283
commandMods: ["wolfcam","wolfcam2","wolfcam3","wolfcam4","wolfcam5","wolfcam6","wolfcam7","wolfcam8","wolfcam9","wolfcam10","parrotcam", "pasturecam",
8384
"crowcam", "crowcam2", "crowcam3", "crowcam4", "foxcam", "foxcam2", "foxcam3", "foxcam4", "4camoutdoor", "marmosetcam", "marmosetcam2", "marmosetcam3",
8485
"nightcams", "nightcamsbig","chickencam","gardencam"],
@@ -91,7 +92,7 @@ const commandPermissionsCustomCam = {
9192

9293
//customcam lowercase, no spaces, no s/es
9394
const multiCustomCamScenes = {
94-
wolf: ["wolf", "wolfcorner","wolfindoor","wolfden","wolfden2","wolfmulti","wolfmulti2","wolfmulti3","wolfmulti4","wolfmulti5"],
95+
wolf: ["wolf", "wolfcorner","wolfswitch","wolfindoor","wolfden","wolfden2","wolfmulti","wolfmulti2","wolfmulti3","wolfmulti4","wolfmulti5"],
9596
fox: ["fox", "foxcorner", "foxmulti", "foxden", "foxmulti2", "foxmulti3"],
9697
crow: ["crow", "crowmulti", "crowoutdoor","crowmulti2"],
9798
marmoset: ["marmoset", "marmosetindoor", "marmosetmulti", "marmosetmulti"],
@@ -121,7 +122,7 @@ let multiCommands = {
121122
const multiScenes = {
122123
crow: ["crow", "crowoutdoor", "crowmulti2cam"],
123124
crowoutdoor: ["crowmulticam"],
124-
wolf: ["wolf", "wolfcorner","wolfindoor","wolfden","wolfden2","wolfmulti","wolfmulti2","wolfmulti3"],
125+
wolf: ["wolf", "wolfcorner","wolfswitch","wolfindoor","wolfden","wolfden2","wolfmulti","wolfmulti2","wolfmulti3"],
125126
wolfcorner: ["wolfmulti4", "wolfmulti5"],
126127
fox: ["fox", "foxden", "foxmulticam", "foxcorner"],
127128
marmoset: ["marmoset", "marmosetindoor", "marmosetmulti"],
@@ -161,13 +162,18 @@ const sceneAudioSource = {
161162
"marmosetmulti": "marmoset mic",
162163
"nuthouse": "nuthouse local",
163164
"nut": "nuthouse local",
164-
"phone": "Space RTMP Phone",
165-
"phone2": "Space RTMP Phone2",
165+
"phone": "alveus rtmp mobile",
166+
"phone2": "maya rtmp 2",
167+
"phone3": "maya rtmp 3",
166168
"backpack": "maya rtmp 1",
169+
"backpack2": "colton ninja",
170+
"backpack3": "ninja cam",
167171
"pc": "local rtmp desktop",
172+
"pc2": "local rtmp desktop2",
168173
"wolf": "wolf mic",
169174
"wolfcorner": "wolf mic",
170-
"wolfindoor": "wolf camera indoor",
175+
"wolfswitch": "wolf mic",
176+
"wolfindoor": "wolf indoor camera",
171177
"wolfden": "wolf den2 camera",
172178
"wolfden2": "wolf den2 camera",
173179
"wolfmulti": "wolf mic",
@@ -176,7 +182,7 @@ const sceneAudioSource = {
176182
"wolfmulti4": "wolf mic",
177183
"wolfmulti5": "wolf mic",
178184
"chatchat": "chat chats audio",
179-
"phonemic": "alveus rtmp mobile mic",
185+
"phonemic": "mobile mic",
180186
"chicken": "Chicken Camera",
181187
"garden": "Garden Mic"
182188
}
@@ -191,11 +197,17 @@ const micGroups = {
191197
restrictedcams: {
192198
fox: { name: sceneAudioSource.fox, volume: -2.4 },
193199
garden: { name: sceneAudioSource.garden, volume: -2.4 },
200+
phone: { name: sceneAudioSource.phone, volume: -10 }
194201
},
195202
admincams: {
196203
phone: { name: sceneAudioSource.phone, volume: 0 },
197204
phone2: { name: sceneAudioSource.phone2, volume: 0 },
198-
backpack: { name: sceneAudioSource.backpack, volume: 0 }, pc: { name: sceneAudioSource.pc, volume: 0 },
205+
phone3: { name: sceneAudioSource.phone3, volume: 0 },
206+
backpack: { name: sceneAudioSource.backpack, volume: 0 },
207+
backpack2: { name: sceneAudioSource.backpack2, volume: 0 },
208+
backpack3: { name: sceneAudioSource.backpack3, volume: 0 },
209+
pc: { name: sceneAudioSource.pc, volume: 0 },
210+
pc2: { name: sceneAudioSource.pc2, volume: 0 },
199211
nuthouse: { name: sceneAudioSource.nut, volume: 0 },
200212
chatchat: { name: sceneAudioSource.chatchat, volume: 0 },
201213
phonemic: { name: sceneAudioSource.phonemic, volume: 0 }
@@ -208,7 +220,7 @@ const micGroups = {
208220
//ADD IP INFO IN ENV
209221
//Scene Names in OBS
210222
//lowercase, no spaces, no s/es
211-
const axisCameras = ["pasture", "parrot","wolf","wolfindoor","wolfcorner","wolfden2","wolfden","georgie", "georgiewater", "noodle","patchy", "toast","roach", "crow", "crowoutdoor", "fox", "foxden",
223+
const axisCameras = ["pasture", "parrot","wolf","wolfindoor","wolfcorner","wolfswitch","wolfden2","wolfden","georgie", "georgiewater", "noodle","patchy", "toast","roach", "crow", "crowoutdoor", "fox", "foxden",
212224
"foxcorner", "hank", "hankcorner", "marmoset", "marmosetindoor", "chin", "pushpop", "marty", "bb","construction","chicken", "garden","speaker"];
213225

214226
//Axis Camera Mapping to Command. Converting base to source name
@@ -225,6 +237,7 @@ const axisCameraCommandMapping = {
225237
"wolfcam8":"wolfcorner",
226238
"wolfcam9":"wolf",
227239
"wolfcam10":"wolfcorner",
240+
"wolfcam11":"wolfswitch",
228241
"georgie":"georgie",
229242
"georgiewater":"georgiewater",
230243
"noodle":"noodle",
@@ -274,13 +287,16 @@ const commandPermissionsExtra = {
274287
commandAdmins: ["testadminextra"],
275288
commandSuperUsers: ["testsuperextra", "resetcloudsource", "resetcloudsourcef", "setalveusscene", "setcloudscene", "changeserver", "setmute", "camclear"],
276289
commandMods: ["testmodextra", "resetsource","resetsourcef","camload", "camlist", "camsave", "camrename", "campresetremove", "customcams", "customcamsbig", "customcamstl", "customcamstr", "customcamsbl", "customcamsbr",
277-
"unmutecam", "unmuteallcams", "nightcams", "nightcamsbig", "indoorcams", "addcam","showchat","hidechat"],
278-
commandOperator: [],
279-
commandVips: ["getvolume", "setvolume", "resetvolume", "removecam", "swapcam", "scenecams", "mutecam", "muteallcams", "musicvolume", "musicnext", "musicprev", "mutemusic", "unmutemusic", "mutemusiclocal", "unmutemusiclocal", "resetbackpack", "resetpc", "resetlivecam", "resetbackpackf", "resetpcf", "resetlivecamf", "resetcam", "resetextra","resetphone","resetphone2", "resetphonef"],
290+
"unmutecam", "unmuteallcams", "nightcams", "nightcamsbig", "indoorcams", "addcam"],
291+
commandOperator: ["showchat","hidechat","raidvideo","stopraidvideo"],
292+
commandVips: ["getvolume", "setvolume", "resetvolume", "removecam", "swapcam", "scenecams", "mutecam", "muteallcams", "musicvolume", "musicnext", "musicprev",
293+
"mutemusic", "unmutemusic", "mutemusiclocal", "unmutemusiclocal", "resetbackpack", "resetbackpack2", "resetbackpack3", "resetpc", "resetlivecam",
294+
"resetbackpackf", "resetpcf", "resetlivecamf", "resetcam", "resetextra","resetphone","resetphone2","resetphone3", "resetphonef"],
280295
commandUsers: []
281296
}
282297
timeRestrictedCommands = timeRestrictedCommands.concat(["unmutecam", "unmuteallcams"]);
283-
throttledCommands = throttledCommands.concat(["swapcam", "mutemusic", "unmutemusic", "mutemusiclocal", "unmutemusiclocal", "resetbackpack", "resetpc", "resetlivecam", "resetbackpackf", "resetpcf", "resetlivecamf", "resetcam", "resetphone", "resetphone2","resetphonef","resetextra"]);
298+
throttledCommands = throttledCommands.concat(["swapcam", "mutemusic", "unmutemusic", "mutemusiclocal", "unmutemusiclocal", "resetbackpack", "resetpc", "resetlivecam",
299+
"resetbackpackf", "resetpcf", "resetlivecamf", "resetcam", "resetphone", "resetphone2","resetphonef","resetextra"]);
284300

285301
//Unifi
286302
const commandPermissionsUnifi = {
@@ -340,7 +356,8 @@ const customCamCommandMapping = {
340356
"wolfcam7":"wolfmulti2",
341357
"wolfcam8":"wolfmulti3",
342358
"wolfcam9":"wolfmulti4",
343-
"wolfcam10":"wolfmulti5",
359+
"wolfcam10":"wolfmulti5",
360+
"wolfcam11":"wolfswitch",
344361
"gardencam":"garden"
345362
}
346363

@@ -349,6 +366,7 @@ const commandSceneAlias = {
349366
serverpccam: ["pccam","pcservercam", "remotepccam","serverpccam"],
350367
phonecam: ["alveusphonecam", "winniecam", "goatcam"],
351368
phone2cam: ["alveusphone2cam", "tractorcam"],
369+
phone3cam: ["alveusphone3cam"],
352370
puppycam: ["scorpioncam"],
353371
roachcam: ["roachescam","barbaracam"],
354372
hankcam: ["mrmctraincam ", "choochoocam", "hankthetankchoochoomrmctraincam"],
@@ -412,6 +430,7 @@ const commandSceneAlias = {
412430
wolfcam8: ["wolfdenmulticam","wolfwolfdenmulticam","wolfwolfdencam"],
413431
wolfcam9: ["wolfden2multicam","wolfwolfden2multicam","wolfwolfden2cam"],
414432
wolfcam10: ["wolfcornermulticam","wolfcornerwolfincam","wolfcornerwolfinmulticam","wolfcwolfincam","wolfcwolficam"],
433+
wolfcam11: ["wolfswitchcam"],
415434
gardencam: ["pollinatorcam","plantcam"],
416435
}
417436

@@ -422,11 +441,17 @@ const commandControlAlias = {
422441
"resetlivecam": ["resetlivecams", "restartlivecam", "restartlivecams"],
423442
"resetlivecamf": ["resetlivecamsf", "restartlivecamf", "restartlivecamsf"],
424443
"resetbackpack": ["resetbackpackcam", "restartbackpack", "restartbackpackcam"],
444+
"resetbackpack2": ["resetbackpack2cam", "restartbackpack2", "restartbackpack2cam"],
445+
"resetbackpack3": ["resetbackpack3cam", "restartbackpack3", "restartbackpack3cam"],
425446
"resetbackpackf": ["resetbackpackcamf", "restartbackpackf", "restartbackpackcamf"],
426447
"resetextra": ["resetextracam"],
427448
"resetphone": ["resetphonecam"],
428449
"resetphone2": ["resetphone2cam"],
450+
"resetphone3": ["resetphone3cam"],
451+
"resetphonef": ["resetphonecamf"],
429452
"resetphonef": ["resetphonecamf"],
453+
"raidvideo": ["welcomevideo","raidv","raidvid","welcomevid","startwelcome"],
454+
"stopraidvideo": ["stopwelcomevideo","stopraidv","stopraidvid","stopwelcomevid","stopwelcome"],
430455
customcams: ["cc", "ccams", "ccam", "customcam"],
431456
customcamsbig: ["ccb", "ccamsb", "ccamb", "customcambig", "customcamb", "customcamsb"],
432457
customcamstl: ["piptl", "customcamtl", "customcamtopleft", "pipul"],
@@ -468,7 +493,7 @@ let commandScenes = {
468493
backpackcam: "Backpack Server", //Cloud server
469494
serverpccam: "Alveus PC Server",//"Alveus PC Server", //Cloud server
470495
phonecam: "Phone Server", //Cloud server
471-
phone2cam: "Phone2 Server", //Cloud server
496+
// phone2cam: "Phone2 Server", //Cloud server
472497
servernuthousecam: "fullcam nuthouse",
473498
brbscreen: "BRB", //Cloud server
474499
ellaintro: "EllaIntro",
@@ -523,7 +548,7 @@ let commandScenesCloud = {
523548
backpackcam: "Maya LiveU",
524549
serverpccam: "Alveus PC",
525550
phonecam: "Phone",
526-
phone2cam: "Phone2",
551+
// phone2cam: "Phone2",
527552
brbscreen: "BRB",
528553
servernuthousecam: "Alveus Nuthouse",
529554
ellaintro: "EllaIntro",

‎src/connections/obs.js

+31
Original file line numberDiff line numberDiff line change
@@ -512,6 +512,37 @@ class OBS {
512512
return null;
513513
}
514514
}
515+
async stopSource(sourceName) {
516+
//OBS_WEBSOCKET_MEDIA_INPUT_ACTION_PLAY
517+
//OBS_WEBSOCKET_MEDIA_INPUT_ACTION_PAUSE
518+
//OBS_WEBSOCKET_MEDIA_INPUT_ACTION_STOP
519+
//OBS_WEBSOCKET_MEDIA_INPUT_ACTION_RESTART
520+
//OBS_WEBSOCKET_MEDIA_INPUT_ACTION_NEXT
521+
//OBS_WEBSOCKET_MEDIA_INPUT_ACTION_PREVIOUS
522+
let param = {
523+
inputName: sourceName,
524+
mediaAction: "OBS_WEBSOCKET_MEDIA_INPUT_ACTION_STOP",
525+
};
526+
try {
527+
let response = null;
528+
if (this.oldWS) {
529+
response = await this.client.send("StopMedia", {
530+
sourceName: sourceName,
531+
});
532+
} else {
533+
response = await this.client.call("TriggerMediaInputAction", param);
534+
}
535+
this.utils.log(
536+
`Stop Source (${sourceName}): ${JSON.stringify(response)}`,
537+
);
538+
return true;
539+
} catch (e) {
540+
this.utils.log(
541+
`Error Stopping Source (${sourceName}): ${JSON.stringify(e)}`,
542+
);
543+
return null;
544+
}
545+
}
515546
async nextMediaSource(sourceName) {
516547
//OBS_WEBSOCKET_MEDIA_INPUT_ACTION_PLAY
517548
//OBS_WEBSOCKET_MEDIA_INPUT_ACTION_PAUSE

‎src/modules/legacy.js

+10
Original file line numberDiff line numberDiff line change
@@ -1613,6 +1613,15 @@ async function checkExtraCommand(controller, userCommand, accessProfile, channel
16131613
controller.connections.twitch.send(channel, `${user}: resetcam ${camname}`, true);
16141614
}
16151615
break;
1616+
case "raidvideo":
1617+
await controller.connections.obs.local.setSceneItemEnabled(controller.connections.obs.local.currentScene, "Raid", true);
1618+
setTimeout(()=> controller.connections.obs.local.setSceneItemEnabled(controller.connections.obs.local.currentScene, "Raid", false),40000)
1619+
// controller.connections.obs.local.restartSource("raidvideo");
1620+
break;
1621+
case "stopraidvideo":
1622+
await controller.connections.obs.local.setSceneItemEnabled(controller.connections.obs.local.currentScene, "Raid", false);
1623+
// controller.connections.obs.local.stopSource("raidvideo");
1624+
break;
16161625
case "setalveusscene":
16171626
controller.connections.obs.local.setScene(fullArgs);
16181627
clearCustomCamsDB(controller);
@@ -2111,6 +2120,7 @@ async function checkExtraCommand(controller, userCommand, accessProfile, channel
21112120
if (arg1 == "" || arg1 == "all") {
21122121
let output = "";
21132122
for (const source in config.micGroups["livecams"]) {
2123+
// logger.log('getvolume all',currentSceneBase,arg1Clean, source);
21142124
let dbVolume = await controller.connections.obs.local.getInputVolume(config.micGroups["livecams"][source].name);
21152125
dbVolume = parseInt(dbVolume);
21162126
if (!isNaN(dbVolume)) {

0 commit comments

Comments
 (0)