Removal of blank spaces and unused imports/dependencies

Optimize picture download memory usage and add option to convert to unsigned url
Convert response data classes to final and add toString with `@Data`
Made sending requests dynamic by allowing passing of BodyHandler to class
This commit is contained in:
kohlerpop1
2024-11-22 22:31:23 -05:00
parent 2dc3001e7b
commit 14bf9c8c9b
10 changed files with 33 additions and 39 deletions

View File

@@ -28,8 +28,6 @@ import io.github.jwdeveloper.tiktok.data.events.common.TikTokUnhandledEvent;
import io.github.jwdeveloper.tiktok.messages.webcast.WebcastResponse;
import lombok.Getter;
@Getter
@EventMeta(eventType = EventType.Debug)
public class TikTokWebsocketUnhandledMessageEvent extends TikTokUnhandledEvent<WebcastResponse.Message>
@@ -42,4 +40,4 @@ public class TikTokWebsocketUnhandledMessageEvent extends TikTokUnhandledEvent<W
{
return this.getData();
}
}
}

View File

@@ -85,8 +85,7 @@ public class Picture {
throw new TikTokLiveException("Unable map downloaded image", e);
}
var bais = new ByteArrayInputStream(baos.toByteArray());
try {
try (var bais = new ByteArrayInputStream(baos.toByteArray())) {
return ImageIO.read(bais);
} catch (IOException e) {
throw new TikTokLiveException("Unable map downloaded image bytes to Image", e);
@@ -97,6 +96,13 @@ public class Picture {
return new Picture("");
}
public Picture asUnsigned() {
if (link == null || link.isEmpty())
return this;
// p16-sign-va.tiktokcdn.com -> p16-va.tiktokcdn.com || p16-sign.tiktokcdn.com -> p16.tiktokcdn.com
return new Picture(link.replace("-sign-", "-").replace("-sign.", "."));
}
@Override
public String toString() {
return "Picture{link='" + link + "', image=" + image + "}";

View File

@@ -29,11 +29,11 @@ import java.util.List;
public class GiftsData
{
@Getter
@Data
@AllArgsConstructor
public static final class Response
{
private String json;
private List<Gift> gifts;
private final String json;
private final List<Gift> gifts;
}
}

View File

@@ -28,20 +28,19 @@ import lombok.Data;
import lombok.Getter;
import java.net.URI;
import java.time.Duration;
public class LiveConnectionData {
@Getter
@AllArgsConstructor
public static class Request {
private String roomId;
private final String roomId;
}
@Getter
@Data
@AllArgsConstructor
public static class Response {
private String websocketCookies;
private URI websocketUrl;
private WebcastResponse webcastResponse;
private final String websocketCookies;
private final URI websocketUrl;
private final WebcastResponse webcastResponse;
}
}
}

View File

@@ -31,7 +31,7 @@ public class LiveData {
@Getter
@AllArgsConstructor
public static class Request {
private String roomId;
private final String roomId;
}
@Data
@@ -46,11 +46,7 @@ public class LiveData {
private boolean ageRestricted;
private User host;
private LiveType liveType;
public Response() {
}
public Response() {}
}
public enum LiveStatus {

View File

@@ -38,7 +38,7 @@ public class LiveUserData {
}
}
@Getter
@Data
@AllArgsConstructor
public static class Response {
private final String json;

View File

@@ -22,19 +22,10 @@
*/
package io.github.jwdeveloper.tiktok.live;
import io.github.jwdeveloper.tiktok.data.dto.MessageMetaData;
import io.github.jwdeveloper.tiktok.data.events.TikTokErrorEvent;
import io.github.jwdeveloper.tiktok.data.events.websocket.TikTokWebsocketMessageEvent;
import io.github.jwdeveloper.tiktok.data.events.websocket.TikTokWebsocketResponseEvent;
import io.github.jwdeveloper.tiktok.data.events.websocket.TikTokWebsocketUnhandledMessageEvent;
import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveMessageException;
import io.github.jwdeveloper.tiktok.messages.webcast.WebcastResponse;
import io.github.jwdeveloper.tiktok.utils.Stopwatch;
import java.time.Duration;
public interface LiveMessagesHandler {
void handle(LiveClient client, WebcastResponse webcastResponse);
void handleSingleMessage(LiveClient client, WebcastResponse.Message message);
}
}