diff --git a/client/src/main/java/ctbrec/ui/sites/camsoda/CamsodaUpdateService.java b/client/src/main/java/ctbrec/ui/sites/camsoda/CamsodaUpdateService.java index 75f827a6..9f7ff403 100644 --- a/client/src/main/java/ctbrec/ui/sites/camsoda/CamsodaUpdateService.java +++ b/client/src/main/java/ctbrec/ui/sites/camsoda/CamsodaUpdateService.java @@ -84,31 +84,25 @@ public class CamsodaUpdateService extends PaginatedScheduledService { } else { String name = result.getString("username"); CamsodaModel model = (CamsodaModel) camsoda.createModel(name); - if(result.has("server_prefix")) { - String serverPrefix = result.getString("server_prefix"); - String streamName = result.getString("stream_name"); - model.setSortOrder(result.getFloat("sort_value")); - models.add(model); - if(result.has("status")) { - model.setOnlineStateByStatus(result.getString("status")); - } + String streamName = result.getString("stream_name"); + model.setSortOrder(result.getFloat("sort_value")); + models.add(model); + if(result.has("status")) { + model.setOnlineStateByStatus(result.getString("status")); + } - if(result.has("display_name")) { - model.setDisplayName(result.getString("display_name")); - } + if(result.has("display_name")) { + model.setDisplayName(result.getString("display_name")); + } - if(result.has("edge_servers")) { - JSONArray edgeServers = result.getJSONArray("edge_servers"); - model.setStreamUrl("https://" + edgeServers.getString(0) + "/cam/mp4:" + streamName + "_h264_aac_480p/playlist.m3u8"); - } + if(result.has("edge_servers")) { + JSONArray edgeServers = result.getJSONArray("edge_servers"); + model.setStreamUrl("https://" + edgeServers.getString(0) + "/cam/mp4:" + streamName + "_h264_aac_480p/playlist.m3u8"); + } - if(result.has("tsize")) { - long unixtime = System.currentTimeMillis() / 1000; - String tsize = result.getString("tsize"); - String preview = "https://thumbs-orig.camsoda.com/thumbs/" - + streamName + '/' + serverPrefix + '/' + tsize + '/' + unixtime + '/' + name + ".jpg?cb=" + unixtime; - model.setPreview(preview); - } + if(result.has("thumb")) { + String previewUrl = "https:" + result.getString("thumb"); + model.setPreview(previewUrl); } } } @@ -118,6 +112,7 @@ public class CamsodaUpdateService extends PaginatedScheduledService { .limit(modelsPerPage) .collect(Collectors.toList()); } else { + LOG.debug("Response was not successful: {}", json.toString()); return Collections.emptyList(); } } else {