Skip to content

Commit 0ec15a8

Browse files
committed
[INSTALL] remove voice stuff
1 parent d7190cf commit 0ec15a8

File tree

5 files changed

+5
-130
lines changed

5 files changed

+5
-130
lines changed

lib/util/clientutil.ts

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,4 @@
11
import * as sanitizer from "@aero/sanitizer";
2-
import {
3-
AudioPlayer,
4-
AudioPlayerStatus,
5-
NoSubscriberBehavior,
6-
VoiceConnection,
7-
createAudioPlayer,
8-
} from "@discordjs/voice";
92
import { Fire } from "@fire/lib/Fire";
103
import { FireGuild } from "@fire/lib/extensions/guild";
114
import { FireMember } from "@fire/lib/extensions/guildmember";
@@ -173,7 +166,6 @@ export class Util extends ClientUtil {
173166
paginators: LimitedCollection<Snowflake, PaginatorInterface>;
174167
loadedData: { plonked: boolean; premium: boolean };
175168
mcProfileCache: Collection<string, MojangProfile & { retrievedAt: Date }>;
176-
assistantAudioPlayers: Collection<Snowflake, AudioPlayer>;
177169
permissionFlags: [PermissionString, bigint][];
178170
premium: Collection<string, PremiumData>;
179171
hasRoleUpdates: string[];
@@ -192,7 +184,6 @@ export class Util extends ClientUtil {
192184
},
193185
sweepInterval: 60,
194186
});
195-
this.assistantAudioPlayers = new Collection();
196187
this.mcProfileCache = new Collection();
197188
this.premium = new Collection();
198189
this.hasRoleUpdates = [];
@@ -483,36 +474,6 @@ export class Util extends ClientUtil {
483474
else return body as MojangProfile;
484475
}
485476

486-
createAssistantAudioPlayer(
487-
user: FireMember | FireUser,
488-
connection: VoiceConnection
489-
) {
490-
if (this.assistantAudioPlayers.has(user.id))
491-
return this.assistantAudioPlayers.get(user.id);
492-
const player = createAudioPlayer({
493-
behaviors: {
494-
noSubscriber: NoSubscriberBehavior.Pause,
495-
},
496-
});
497-
player.on("stateChange", async (oldState, newState) => {
498-
if (
499-
oldState.status == AudioPlayerStatus.Playing &&
500-
newState.status == AudioPlayerStatus.Idle
501-
) {
502-
await this.client.util.sleep(8000);
503-
if (player.state.status != AudioPlayerStatus.Playing) {
504-
try {
505-
connection.destroy();
506-
player.stop(true);
507-
this.client.util.assistantAudioPlayers.delete(user.id);
508-
} catch {}
509-
}
510-
}
511-
});
512-
this.assistantAudioPlayers.set(user.id, player);
513-
return player;
514-
}
515-
516477
addDashesToUUID = (uuid: string) =>
517478
uuid.slice(0, 8) +
518479
"-" +

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
"license": "AGPL-3.0-only",
3030
"dependencies": {
3131
"@aero/sanitizer": "^1.3.2",
32-
"@discordjs/voice": "0.17.0",
3332
"@sapphire/async-queue": "^1.5.0",
3433
"@sentry/node": "^6.19.7",
3534
"centra": "^2.7.0",

src/commands/Fun/google.ts

Lines changed: 1 addition & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
import {
2-
createAudioResource,
3-
getVoiceConnection,
4-
joinVoiceChannel,
5-
} from "@discordjs/voice";
61
import { ApplicationCommandMessage } from "@fire/lib/extensions/appcommandmessage";
72
import { ComponentMessage } from "@fire/lib/extensions/componentmessage";
83
import { ContextCommandMessage } from "@fire/lib/extensions/contextcommandmessage";
@@ -17,7 +12,6 @@ import {
1712
MessageSelectMenu,
1813
SnowflakeUtil,
1914
} from "discord.js";
20-
import { Readable } from "stream";
2115

2216
enum GoogleAssistantActions {
2317
GET_AUTHENTICATE_URL,
@@ -193,35 +187,9 @@ export default class Google extends Command {
193187
const screenshot = Buffer.from(assist.response.screenshot.image.data);
194188
files.push({ attachment: screenshot, name: "google.png" });
195189
}
196-
const canPlayAudio =
197-
assist.response.audio &&
198-
// author voice will give voice state for any guild on the same cluster
199-
// so it's a nice little bonus if you happen to be in a vc
200-
// in one server and run the command in another on the same cluster
201-
(command.member ?? command.author).voice?.channelId;
202-
if (canPlayAudio) {
203-
const state = (command.member ?? command.author).voice;
204-
const audio = Buffer.from(assist.response.audio.data);
205-
const connection =
206-
getVoiceConnection(state.guild.id) ??
207-
joinVoiceChannel({
208-
channelId: state.channelId,
209-
guildId: state.guild.id,
210-
// @ts-ignore
211-
adapterCreator: state.guild.voiceAdapterCreator,
212-
});
213-
const player = this.client.util.createAssistantAudioPlayer(
214-
command.member ?? command.author,
215-
connection
216-
);
217-
connection.subscribe(player);
218-
player.play(createAudioResource(Readable.from(audio)));
219-
}
220190
return await command.channel.send({
221191
content: !files.length
222-
? assist.response.text ?? canPlayAudio
223-
? command.language.get("GOOGLE_RESPONSE_AUDIO_ONLY")
224-
: command.language.get("GOOGLE_NO_RESPONSE")
192+
? command.language.get("GOOGLE_NO_RESPONSE")
225193
: undefined,
226194
files,
227195
components,

src/listeners/select.ts

Lines changed: 1 addition & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
1-
import {
2-
createAudioResource,
3-
getVoiceConnection,
4-
joinVoiceChannel,
5-
} from "@discordjs/voice";
61
import { ComponentMessage } from "@fire/lib/extensions/componentmessage";
72
import { FireMember } from "@fire/lib/extensions/guildmember";
83
import { FireMessage } from "@fire/lib/extensions/message";
94
import { ModalMessage } from "@fire/lib/extensions/modalmessage";
10-
import { FireUser } from "@fire/lib/extensions/user";
115
import {
126
ActionLogTypes,
137
constants,
@@ -35,7 +29,6 @@ import {
3529
TextInputComponent,
3630
} from "discord.js";
3731
import { TextInputStyles } from "discord.js/typings/enums";
38-
import { Readable } from "stream";
3932
import { parseWithUserTimezone } from "../arguments/time";
4033
import LinkfilterToggle from "../commands/Configuration/linkfilter-toggle";
4134
import LoggingConfig from "../commands/Configuration/logging-configure";
@@ -213,34 +206,9 @@ export default class Select extends Listener {
213206
const screenshot = Buffer.from(assist.response.screenshot.image.data);
214207
files.push({ attachment: screenshot, name: "google.png" });
215208
}
216-
const canPlayAudio =
217-
assist.response.audio &&
218-
(select.member ?? select.author).voice?.channelId;
219-
if (canPlayAudio) {
220-
const state = (select.member ?? select.author).voice;
221-
const audio = Buffer.from(assist.response.audio.data);
222-
const connection =
223-
getVoiceConnection(state.guild.id) ??
224-
joinVoiceChannel({
225-
channelId: state.channelId,
226-
guildId: state.guild.id,
227-
// @ts-ignore
228-
adapterCreator: state.guild.voiceAdapterCreator,
229-
});
230-
const player = this.client.util.createAssistantAudioPlayer(
231-
(state.member ?? select.member ?? select.author) as
232-
| FireMember
233-
| FireUser,
234-
connection
235-
);
236-
connection.subscribe(player);
237-
player.play(createAudioResource(Readable.from(audio)));
238-
}
239209
return await select.edit({
240210
content: !files.length
241-
? assist.response.text ?? canPlayAudio
242-
? select.language.get("GOOGLE_RESPONSE_AUDIO_ONLY")
243-
: select.language.get("GOOGLE_NO_RESPONSE")
211+
? select.language.get("GOOGLE_NO_RESPONSE")
244212
: undefined,
245213
files,
246214
components,

yarn.lock

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,6 @@
3535
resolved "https://registry.yarnpkg.com/@discordjs/collection/-/collection-0.7.0.tgz#1a6c00198b744ba2b73a64442145da637ac073b8"
3636
integrity sha512-R5i8Wb8kIcBAFEPLLf7LVBQKBDYUL+ekb23sOgpkpyGT+V4P7V83wTxcsqmX+PbqHt4cEHn053uMWfRqh/Z/nA==
3737

38-
"@discordjs/[email protected]":
39-
version "0.17.0"
40-
resolved "https://registry.yarnpkg.com/@discordjs/voice/-/voice-0.17.0.tgz#37be97c20dc4144c4c4d27d8ad02f29373da7ea6"
41-
integrity sha512-hArn9FF5ZYi1IkxdJEVnJi+OxlwLV0NJYWpKXsmNOojtGtAZHxmsELA+MZlu2KW1F/K1/nt7lFOfcMXNYweq9w==
42-
dependencies:
43-
"@types/ws" "^8.5.10"
44-
discord-api-types "0.37.83"
45-
prism-media "^1.3.5"
46-
tslib "^2.6.2"
47-
ws "^8.16.0"
48-
4938
"@sapphire/async-queue@^1.5.0":
5039
version "1.5.5"
5140
resolved "https://registry.yarnpkg.com/@sapphire/async-queue/-/async-queue-1.5.5.tgz#2b18d402bb920b65b13ad4ed8dfb6c386300dd84"
@@ -172,7 +161,7 @@
172161
resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.3.4.tgz#bd86a43617df0594787d38b735f55c805becf1bc"
173162
integrity sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw==
174163

175-
"@types/ws@^8.5.10", "@types/ws@^8.5.14", "@types/ws@^8.5.4":
164+
"@types/ws@^8.5.14", "@types/ws@^8.5.4":
176165
version "8.5.14"
177166
resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.14.tgz#93d44b268c9127d96026cf44353725dd9b6c3c21"
178167
integrity sha512-bd/YFLW+URhBzMXurx7lWByOu+xzU9+kb3RboOteXYDfW+tr+JZa99OyNmPINEGB/ahzKrEuc8rcv4gnpJmxTw==
@@ -299,11 +288,6 @@ discord-akairo@discord-akairo/discord-akairo:
299288
version "8.1.0"
300289
resolved "https://codeload.github.com/discord-akairo/discord-akairo/tar.gz/905f69382957023601ebbb6f8a3a8b6b0f615bd1"
301290

302-
303-
version "0.37.83"
304-
resolved "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.37.83.tgz#a22a799729ceded8176ea747157837ddf4708b1f"
305-
integrity sha512-urGGYeWtWNYMKnYlZnOnDHm8fVRffQs3U0SpE8RHeiuLKb/u92APS8HoQnPTFbnXmY1vVnXjXO4dOxcAn3J+DA==
306-
307291
discord-api-types@^0.36.2:
308292
version "0.36.3"
309293
resolved "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.36.3.tgz#a931b7e57473a5c971d6937fa5f392eb30047579"
@@ -621,11 +605,6 @@ prettier@^2.8.8:
621605
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.8.tgz#e8c5d7e98a4305ffe3de2e1fc4aca1a71c28b1da"
622606
integrity sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==
623607

624-
prism-media@^1.3.5:
625-
version "1.3.5"
626-
resolved "https://registry.yarnpkg.com/prism-media/-/prism-media-1.3.5.tgz#ea1533229f304a1b774b158de40e98c765db0aa6"
627-
integrity sha512-IQdl0Q01m4LrkN1EGIE9lphov5Hy7WWlH6ulf5QdGePLlPas9p2mhgddTEHrlaXYjjFToM1/rWuwF37VF4taaA==
628-
629608
regenerator-runtime@^0.14.0:
630609
version "0.14.1"
631610
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f"
@@ -730,7 +709,7 @@ tslib@^1.9.3:
730709
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
731710
integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
732711

733-
tslib@^2.4.0, tslib@^2.6.2:
712+
tslib@^2.4.0:
734713
version "2.8.1"
735714
resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f"
736715
integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==
@@ -787,7 +766,7 @@ which@^2.0.1:
787766
dependencies:
788767
isexe "^2.0.0"
789768

790-
ws@^8.13.0, ws@^8.16.0, ws@^8.18.1:
769+
ws@^8.13.0, ws@^8.18.1:
791770
version "8.18.1"
792771
resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.1.tgz#ea131d3784e1dfdff91adb0a4a116b127515e3cb"
793772
integrity sha512-RKW2aJZMXeMxVpnZ6bck+RswznaxmzdULiBr6KY7XkTnW8uvt0iT9H5DkHUChXrc+uurzwa0rVI16n/Xzjdz1w==

0 commit comments

Comments
 (0)