Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-09 16:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

voice: pass joinConfig.group to getVoiceConnection (#7442)

Browse Source
This commit is contained in:
CallMe AsYouFeel
2022-02-12 18:22:25 +09:00
committed by GitHub
parent 55b388a763
commit fa97a31504
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
packages/voice/__tests__/VoiceConnection.test.ts
View File

@@ -129,8 +129,8 @@ describe('createVoiceConnection', () => {
const stateSetter = jest.spyOn(existingVoiceConnection, 'state', 'set'); const stateSetter = jest.spyOn(existingVoiceConnection, 'state', 'set');
DataStore.getVoiceConnection.mockImplementation((guildId) => DataStore.getVoiceConnection.mockImplementation((guildId, group = 'default') =>
guildId === existingJoinConfig.guildId ? existingVoiceConnection : null, guildId === existingJoinConfig.guildId && group === existingJoinConfig.group ? existingVoiceConnection : null,
); );
const newAdapter = createFakeAdapter(); const newAdapter = createFakeAdapter();
@@ -139,7 +139,7 @@ describe('createVoiceConnection', () => {
debug: false, debug: false,
adapterCreator: newAdapter.creator, adapterCreator: newAdapter.creator,
}); });
expect(DataStore.getVoiceConnection).toHaveBeenCalledWith(newJoinConfig.guildId); expect(DataStore.getVoiceConnection).toHaveBeenCalledWith(newJoinConfig.guildId, newJoinConfig.group);
expect(DataStore.trackVoiceConnection).not.toHaveBeenCalled(); expect(DataStore.trackVoiceConnection).not.toHaveBeenCalled();
expect(DataStore.untrackVoiceConnection).not.toHaveBeenCalled(); expect(DataStore.untrackVoiceConnection).not.toHaveBeenCalled();
expect(newAdapter.creator).not.toHaveBeenCalled(); expect(newAdapter.creator).not.toHaveBeenCalled();
@@ -167,8 +167,8 @@ describe('createVoiceConnection', () => {
const rejoinSpy = jest.spyOn(existingVoiceConnection, 'rejoin'); const rejoinSpy = jest.spyOn(existingVoiceConnection, 'rejoin');
DataStore.getVoiceConnection.mockImplementation((guildId) => DataStore.getVoiceConnection.mockImplementation((guildId, group = 'default') =>
guildId === existingJoinConfig.guildId ? existingVoiceConnection : null, guildId === existingJoinConfig.guildId && group === existingJoinConfig.group ? existingVoiceConnection : null,
); );
const newAdapter = createFakeAdapter(); const newAdapter = createFakeAdapter();
@@ -178,7 +178,7 @@ describe('createVoiceConnection', () => {
debug: false, debug: false,
adapterCreator: newAdapter.creator, adapterCreator: newAdapter.creator,
}); });
expect(DataStore.getVoiceConnection).toHaveBeenCalledWith(newJoinConfig.guildId); expect(DataStore.getVoiceConnection).toHaveBeenCalledWith(newJoinConfig.guildId, newJoinConfig.group);
expect(DataStore.trackVoiceConnection).not.toHaveBeenCalled(); expect(DataStore.trackVoiceConnection).not.toHaveBeenCalled();
expect(DataStore.untrackVoiceConnection).not.toHaveBeenCalled(); expect(DataStore.untrackVoiceConnection).not.toHaveBeenCalled();
expect(newAdapter.creator).not.toHaveBeenCalled(); expect(newAdapter.creator).not.toHaveBeenCalled();
@@ -198,8 +198,8 @@ describe('createVoiceConnection', () => {
adapterCreator: existingAdapter.creator, adapterCreator: existingAdapter.creator,
}); });
DataStore.getVoiceConnection.mockImplementation((guildId) => DataStore.getVoiceConnection.mockImplementation((guildId, group = 'default') =>
guildId === existingJoinConfig.guildId ? existingVoiceConnection : null, guildId === existingJoinConfig.guildId && group === existingJoinConfig.group ? existingVoiceConnection : null,
); );
const newAdapter = createFakeAdapter(); const newAdapter = createFakeAdapter();
@@ -209,7 +209,7 @@ describe('createVoiceConnection', () => {
debug: false, debug: false,
adapterCreator: newAdapter.creator, adapterCreator: newAdapter.creator,
}); });
expect(DataStore.getVoiceConnection).toHaveBeenCalledWith(newJoinConfig.guildId); expect(DataStore.getVoiceConnection).toHaveBeenCalledWith(newJoinConfig.guildId, newJoinConfig.group);
expect(DataStore.trackVoiceConnection).not.toHaveBeenCalled(); expect(DataStore.trackVoiceConnection).not.toHaveBeenCalled();
expect(DataStore.untrackVoiceConnection).not.toHaveBeenCalled(); expect(DataStore.untrackVoiceConnection).not.toHaveBeenCalled();
expect(newAdapter.creator).not.toHaveBeenCalled(); expect(newAdapter.creator).not.toHaveBeenCalled();
@@ -473,8 +473,8 @@ describe('VoiceConnection#destroy', () => {
test('Cleans up in a valid, destroyable state', () => { test('Cleans up in a valid, destroyable state', () => {
const { voiceConnection, joinConfig, adapter } = createFakeVoiceConnection(); const { voiceConnection, joinConfig, adapter } = createFakeVoiceConnection();
DataStore.getVoiceConnection.mockImplementation((guildId) => DataStore.getVoiceConnection.mockImplementation((guildId, group = 'default') =>
joinConfig.guildId === guildId ? voiceConnection : undefined, guildId === joinConfig.guildId && group === joinConfig.group ? voiceConnection : undefined,
); );
const dummy = Symbol('dummy'); const dummy = Symbol('dummy');
DataStore.createJoinVoiceChannelPayload.mockImplementation(() => dummy as any); DataStore.createJoinVoiceChannelPayload.mockImplementation(() => dummy as any);

4
packages/voice/src/VoiceConnection.ts
View File

@@ -533,7 +533,7 @@ export class VoiceConnection extends TypedEmitter<VoiceConnectionEvents> {
if (this.state.status === VoiceConnectionStatus.Destroyed) { if (this.state.status === VoiceConnectionStatus.Destroyed) {
throw new Error('Cannot destroy VoiceConnection - it has already been destroyed'); throw new Error('Cannot destroy VoiceConnection - it has already been destroyed');
} }
if (getVoiceConnection(this.joinConfig.guildId) === this) { if (getVoiceConnection(this.joinConfig.guildId, this.joinConfig.group) === this) {
untrackVoiceConnection(this); untrackVoiceConnection(this);
} }
if (adapterAvailable) { if (adapterAvailable) {
@@ -692,7 +692,7 @@ export class VoiceConnection extends TypedEmitter<VoiceConnectionEvents> {
*/ */
export function createVoiceConnection(joinConfig: JoinConfig, options: CreateVoiceConnectionOptions) { export function createVoiceConnection(joinConfig: JoinConfig, options: CreateVoiceConnectionOptions) {
const payload = createJoinVoiceChannelPayload(joinConfig); const payload = createJoinVoiceChannelPayload(joinConfig);
const existing = getVoiceConnection(joinConfig.guildId); const existing = getVoiceConnection(joinConfig.guildId, joinConfig.group);
if (existing && existing.state.status !== VoiceConnectionStatus.Destroyed) { if (existing && existing.state.status !== VoiceConnectionStatus.Destroyed) {
if (existing.state.status === VoiceConnectionStatus.Disconnected) { if (existing.state.status === VoiceConnectionStatus.Disconnected) {
existing.rejoin({ existing.rejoin({