hopefully fixed twitch doing shit

Author: topi314

src/main/java/de/kittybot/kittybot/modules/AnnouncementModule.java

@@ -11,8 +11,6 @@
 import net.dv8tion.jda.api.events.guild.GuildJoinEvent;
 import net.dv8tion.jda.api.events.guild.member.GuildMemberJoinEvent;
 import net.dv8tion.jda.api.events.guild.member.GuildMemberRemoveEvent;
-import net.dv8tion.jda.api.events.guild.member.GuildMemberRoleAddEvent;
-import net.dv8tion.jda.api.events.guild.member.GuildMemberRoleRemoveEvent;
 import net.dv8tion.jda.api.events.message.guild.GuildMessageReceivedEvent;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;

src/main/java/de/kittybot/kittybot/modules/StreamModule.java

@@ -71,10 +71,14 @@ private void checkTwitch(){
 		if(userIds.isEmpty()){
 			return;
 		}
-		var streams = this.twitchWrapper.getStreams(userIds, false);
+		var streams = this.twitchWrapper.getStreams(userIds);
 
 		for(var streamAnnouncement : this.streams){
 			var stream = streams.stream().filter(st -> st.getUserId() == streamAnnouncement.getUserId()).findFirst();
+			if(stream.isPresent() && stream.get().hasError()){
+				// error while fetching stream skip
+				continue;
+			}
 			if(stream.isPresent() && !streamAnnouncement.getIsLive()){
 				setLiveStatus(streamAnnouncement, true);
 				// send online
@@ -133,7 +137,7 @@ private void sendAnnouncementMessage(StreamUsersRecord streamAnnouncement, Strea
 				break;
 		}
 		channel.sendMessage(settings.getStreamAnnouncementMessage().replace("${user}", stream.getUserName()))
-			.embed(embed
+			.setEmbeds(embed
 				.setTimestamp(Instant.now())
 				.setColor(Colors.TWITCH_PURPLE)
 				.build()

src/main/java/de/kittybot/kittybot/objects/streams/Stream.java

@@ -15,9 +15,10 @@ public class Stream{
 	private final Instant startedAt;
 	private final Language language;
 	private final StreamType type;
+	private final boolean error;
 	private Game game;
 
-	public Stream(long streamId, String streamTitle, String thumbnailUrl, long userId, String userName, Game game, int viewerCount, Instant startedAt, Language language, StreamType type){
+	public Stream(long streamId, String streamTitle, String thumbnailUrl, long userId, String userName, Game game, int viewerCount, Instant startedAt, Language language, StreamType type, boolean error){
 		this.streamId = streamId;
 		this.streamTitle = streamTitle;
 		this.thumbnailUrl = thumbnailUrl;
@@ -28,6 +29,7 @@ public Stream(long streamId, String streamTitle, String thumbnailUrl, long userI
 		this.startedAt = startedAt;
 		this.language = language;
 		this.type = type;
+		this.error = error;
 	}
 
 	public static Stream fromTwitchJSON(DataObject json){
@@ -42,7 +44,8 @@ public static Stream fromTwitchJSON(DataObject json){
 			json.getInt("viewer_count"),
 			Instant.parse(json.getString("started_at")),
 			lang.orElse(Language.UNKNOWN),
-			StreamType.TWITCH
+			StreamType.TWITCH,
+			false
 		);
 	}
 
@@ -100,4 +103,8 @@ public String getStreamUrl(){
 		return null;
 	}
 
+	public boolean hasError(){
+		return this.error;
+	}
+
 }

src/main/java/de/kittybot/kittybot/objects/streams/twitch/TwitchWrapper.java

@@ -1,7 +1,9 @@
 package de.kittybot.kittybot.objects.streams.twitch;
 
 import de.kittybot.kittybot.objects.streams.BearerToken;
+import de.kittybot.kittybot.objects.streams.Game;
 import de.kittybot.kittybot.objects.streams.Stream;
+import de.kittybot.kittybot.objects.streams.StreamType;
 import net.dv8tion.jda.api.utils.data.DataObject;
 import okhttp3.Call;
 import okhttp3.FormBody;
@@ -100,7 +102,7 @@ private Call newRequest(String url, Object... params){
 		);
 	}
 
-	public List<Stream> getStreams(List<Long> userIds, boolean reTry){
+	public List<Stream> getStreams(List<Long> userIds){
 		var streams = new ArrayList<Stream>();
 		do{
 			var users = userIds.subList(0, Math.min(userIds.size(), 100));
@@ -112,9 +114,9 @@ public List<Stream> getStreams(List<Long> userIds, boolean reTry){
 					LOG.error("Url: {} Code: {} Body: {}", resp.request().url(), resp.code(), body == null ? "null" : body.string());
 					if(resp.code() == 401){
 						this.bearerToken = null;
-						if(!reTry){
-							return getStreams(userIds, true);
-						}
+					}
+					for(var userId : users){
+						streams.add(new Stream(0L, "", "", userId, "", Game.getUnknown(), 0, null, null, StreamType.YOUTUBE, true));
 					}
 					continue;
 				}