oat/GMusicBot
1
0
Fork 0
forked from remote/MusicBot
Code Pull requests Actions Activity

Store guild ID instead of the guild object in AloneInVoiceHandler

Browse source
This commit is contained in:
Michaili K 2021-02-09 15:09:59 +01:00
parent 36c53cfd41
commit 18e142ed88
No known key found for this signature in database
GPG key ID: BD613494318FEBA0
1 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/main/java/com/jagrosh/jmusicbot/audio/AloneInVoiceHandler.java
View file

@ -16,7 +16,7 @@
package com.jagrosh.jmusicbot.audio;
import com.jagrosh.jmusicbot.Bot;
import net.dv8tion.jda.api.entities.*;
import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.events.guild.voice.GuildVoiceUpdateEvent;
import java.time.Instant;
@ -33,7 +33,7 @@ import java.util.concurrent.TimeUnit;
public class AloneInVoiceHandler
{
private final Bot bot;
private final HashMap<Guild, Instant> aloneSince = new HashMap<>();
private final HashMap<Long, Instant> aloneSince = new HashMap<>();
private long aloneTimeUntilStop = 0;
public AloneInVoiceHandler(Bot bot)
@ -50,13 +50,21 @@ public class AloneInVoiceHandler
private void check()
{
Set<Guild> toRemove = new HashSet<>();
for(Map.Entry<Guild, Instant> entrySet: aloneSince.entrySet())
Set<Long> toRemove = new HashSet<>();
for(Map.Entry<Long, Instant> entrySet: aloneSince.entrySet())
{
if(entrySet.getValue().getEpochSecond() > Instant.now().getEpochSecond()- aloneTimeUntilStop) continue;
if(entrySet.getValue().getEpochSecond() > Instant.now().getEpochSecond() - aloneTimeUntilStop) continue;
((AudioHandler) entrySet.getKey().getAudioManager().getSendingHandler()).stopAndClear();
entrySet.getKey().getAudioManager().closeAudioConnection();
Guild guild = bot.getJDA().getGuildById(entrySet.getKey());
if(guild == null)
{
toRemove.add(entrySet.getKey());
continue;
}
((AudioHandler) guild.getAudioManager().getSendingHandler()).stopAndClear();
guild.getAudioManager().closeAudioConnection();
toRemove.add(entrySet.getKey());
}
@ -71,12 +79,12 @@ public class AloneInVoiceHandler
if(!bot.getPlayerManager().hasHandler(guild)) return;
boolean alone = isAlone(guild);
boolean inList = aloneSince.containsKey(guild);
boolean inList = aloneSince.containsKey(guild.getIdLong());
if(!alone && inList)
aloneSince.remove(guild);
aloneSince.remove(guild.getIdLong());
else if(alone && !inList)
aloneSince.put(guild, Instant.now());
aloneSince.put(guild.getIdLong(), Instant.now());
}
private boolean isAlone(Guild guild)