logan/DRB-CnC
1
0
Fork 0
Code Issues 23 Pull Requests Packages Projects 1 Releases Wiki Activity

feature/implement-bot-into-client-core #2

Merged
logan merged 42 commits from feature/implement-bot-into-client-core into master 2023-05-06 14:45:00 -04:00
Conversation 0 Commits 42 Files Changed 30 +3 -3
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e27cfdfdd4 - Show all commits

2
Client/controllers/audioController.js
View File

@@ -43,7 +43,7 @@ exports.getAudioDevices = async function getAudioDevices(){
* @returns new portAudio.AudioIO
*/
exports.createAudioInstance = async function createAudioInstance() {
const selectedDevice = await confirmAudioDevice({deviceId: getDeviceID()});//{deviceName: "VoiceMeeter VAIO3 Output (VB-Au"});
const selectedDevice = await this.confirmAudioDevice({deviceId: getDeviceID()});//{deviceName: "VoiceMeeter VAIO3 Output (VB-Au"});
log.DEBUG("Device selected from config: ", selectedDevice);
// Create an instance of AudioIO with outOptions (defaults are as below), which will return a WritableStream
return new alsaInstance({

4
Client/controllers/botController.js
View File

@@ -75,10 +75,10 @@ exports.joinServer = (req, res) => {
const presetName = req.body.presetName;
const guildObj = getGuildFromChannel(channelId, req);
if (!channelId || !presetName || !guildId) return res.status(400).json({'message': "Request does not have all components to proceed"});
if (!channelId || !presetName || !guildObj) return res.status(400).json({'message': "Request does not have all components to proceed"});
// join the sever
join({guildID: guildId, guildObj: guildObj, channelID: channelId, callback: () => {
join({guildID: guildObj.id, guildObj: guildObj, channelID: channelId, callback: () => {
return req.sendStatus(202);
}});
}