Merge pull request #153 from slmnio/voicestream

Voicestream
slmnio · Nov 19, 2022 · 5ccbf27 · 5ccbf27
2 parents 630463d + 35f5664
commit 5ccbf27
Show file tree

Hide file tree

Showing 20 changed files with 1,189 additions and 18 deletions.
diff --git a/server/package.json b/server/package.json
@@ -19,6 +19,8 @@
     "nodemon": "^2.0.7"
   },
   "dependencies": {
+    "@discordjs/opus": "^0.9.0",
+    "@discordjs/voice": "^0.13.0",
     "@twurple/api": "^5.2.5",
     "@twurple/auth": "^5.2.5",
     "airtable": "^0.10.1",
@@ -28,6 +30,7 @@
     "discord.js": "^13.3.1",
     "dotenv": "^8.2.0",
     "express": "^4.17.1",
+    "libsodium-wrappers": "^0.7.10",
     "node-fetch": "^2.6.1",
     "ora": "^5.4.0",
     "sharp": "^0.30.1",

diff --git a/server/src/airtable-interface.js b/server/src/airtable-interface.js
@@ -82,7 +82,7 @@ function setRebuilding(isRebuilding) {
 // Starting with syncing Matches
 
 // const tables = ["Matches", "Teams", "Themes", "Events", "Players", "Player Relationships"];
-const tables = ["Broadcasts", "Clients", "Channels", "Players", "Events", "Event Series", "Teams", "Ad Reads", "Ad Read Groups", "News", "Matches",  "Themes",  "Socials", "Accolades", "Player Relationships", "Brackets", "Live Guests", "Headlines", "Maps", "Map Data", "Heroes", "Log Files", "Tracks", "Track Groups", "Track Group Roles"];
+const tables = ["Broadcasts", "Clients", "Channels", "Discord Bots", "Players", "Events", "Event Series", "Teams", "Ad Reads", "Ad Read Groups", "News", "Matches",  "Themes",  "Socials", "Accolades", "Player Relationships", "Brackets", "Live Guests", "Headlines", "Maps", "Map Data", "Heroes", "Log Files", "Tracks", "Track Groups", "Track Group Roles"];
 const staticTables = ["Redirects"];
 
 function deAirtable(obj) {

diff --git a/server/src/cache.js b/server/src/cache.js
@@ -89,10 +89,10 @@ async function dataUpdate(id, data, options) {
     if (JSON.stringify(store.get(id)) !== JSON.stringify(data)) {
         // console.log(`Data update on [${id}]`);
         recents.sent++;
-        if (!(options && options.custom)) updateFunction(id, { oldData: store.get(id), newData: data });
         if (data) data = await removeAntiLeak(id, data);
         // if (options?.eager) console.log("Sending");
         await broadcast(id, "data_update", id, data);
+        if (!(options && options.custom)) updateFunction(id, { oldData: store.get(id), newData: data });
     }
 }
 
@@ -198,7 +198,13 @@ async function set(id, data, options) {
 
     if (data?.__tableName === "Channels") {
         auth.set(`channel_${id}`, data);
-        return; // not setting it on global requestble store
+        return; // not setting it on global requestable store
+    }
+
+    if (data?.__tableName === "Discord Bots") {
+        auth.set(`bot_${cleanID(id)}`, data);
+
+        return; // not setting it on global requestable store
     }
 
     if (data?.__tableName === "Events") {
@@ -266,6 +272,7 @@ async function set(id, data, options) {
 
     await dataUpdate(id, data, options);
     store.set(id, data);
+
 }
 function cleanID(id) {
     if (!id) return null;
@@ -318,12 +325,18 @@ async function getPlayer(discordID) {
 async function getChannel(airtableID) {
     return auth.get(`channel_${cleanID(airtableID)}`);
 }
+async function getBot(airtableID) {
+    return auth.get(`bot_${cleanID(airtableID)}`);
+}
 async function getChannelByID(channelID) {
     return (await getChannels()).find(channel => channel.channel_id === channelID);
 }
 async function getChannels() {
     return await Promise.all(((await get("Channels"))?.ids || []).map(id => getChannel(id)));
 }
+async function getBots() {
+    return await Promise.all(((await get("Discord Bots"))?.ids || []).map(id => getBot(id)));
+}
 
 async function getTwitchAccessToken(channel) {
     // get stored access token, check if it's valid
@@ -349,6 +362,7 @@ module.exports = {
         getPlayer,
         getChannel,
         getChannelByID,
-        getTwitchAccessToken
+        getTwitchAccessToken,
+        getBots
     }
 };
diff --git a/server/src/custom-datasets.js b/server/src/custom-datasets.js
@@ -6,6 +6,7 @@ function tableUpdated(tableName, Cache) {
     if (tableName === "Matches") matchUpdate(Cache);
     if (tableName === "Broadcasts") broadcastUpdate(Cache);
     if (tableName === "Players") playerList(Cache);
+    // TODO: maybe add discord bots here?
 }
 module.exports = tableUpdated;