mirror of
https://github.com/Equicord/Equicord.git
synced 2025-03-30 12:11:58 -04:00
Merge branch 'dev' of https://github.com/Equicord/Equicord into dev
This commit is contained in:
commit
70164e959d
1 changed files with 2 additions and 3 deletions
|
@ -705,10 +705,9 @@ function getChannels() {
|
|||
|
||||
function JoinVc(channelID) {
|
||||
const channel = ChannelStore.getChannel(channelID);
|
||||
|
||||
const channel_link = `/channels/${channel.guild_id}/${channel.id}`;
|
||||
ChannelActions.selectVoiceChannel(channelID);
|
||||
|
||||
if (settings.store.autoNavigate) NavigationRouter.transitionTo(channel.guild_id, channel.id);
|
||||
if (settings.store.autoNavigate) NavigationRouter.transitionTo(channel_link);
|
||||
if (settings.store.autoCamera && PermissionStore.can(STREAM, channel)) autoCamera();
|
||||
if (settings.store.autoCamera && PermissionStore.can(STREAM, channel)) autoCamera();
|
||||
if (settings.store.selfMute && !MediaEngineStore.isSelfMute() && SelectedChannelStore.getVoiceChannelId()) toggleSelfMute();
|
||||
|
|
Loading…
Add table
Reference in a new issue