Skip to content

Commit 20ba88c

Browse files
kohlerpop1jwdeveloper
authored andcommitted
Removed useless lines, made Picture#toString, and optimized TikTokGiftManager#findById & TikTokGiftManager#findByName!
1 parent 77533ea commit 20ba88c

File tree

3 files changed

+18
-30
lines changed

3 files changed

+18
-30
lines changed

API/src/main/java/io/github/jwdeveloper/tiktok/data/models/Picture.java

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,10 @@
2828
import javax.imageio.ImageIO;
2929
import java.awt.*;
3030
import java.awt.image.BufferedImage;
31-
import java.io.ByteArrayInputStream;
32-
import java.io.ByteArrayOutputStream;
33-
import java.io.IOException;
31+
import java.io.*;
3432
import java.net.URL;
35-
import java.util.ArrayList;
36-
import java.util.List;
3733
import java.util.concurrent.CompletableFuture;
3834

39-
4035
public class Picture {
4136

4237
@Getter
@@ -49,7 +44,6 @@ public Picture(String link) {
4944
}
5045

5146
public static Picture map(io.github.jwdeveloper.tiktok.messages.data.Image profilePicture) {
52-
5347
var index = profilePicture.getUrlListCount() - 1;
5448
if (index < 0) {
5549
return new Picture("");
@@ -74,12 +68,11 @@ public CompletableFuture<Image> downloadImageAsync() {
7468
return CompletableFuture.supplyAsync(this::downloadImage);
7569
}
7670

77-
private BufferedImage download(String urlString)
78-
{
79-
if(urlString.isEmpty())
80-
{
71+
private BufferedImage download(String urlString) {
72+
if (urlString.isEmpty()) {
8173
return null;
8274
}
75+
8376
var baos = new ByteArrayOutputStream();
8477
try (var is = new URL(urlString).openStream()) {
8578
var byteChunk = new byte[4096];
@@ -103,4 +96,9 @@ private BufferedImage download(String urlString)
10396
public static Picture Empty() {
10497
return new Picture("");
10598
}
106-
}
99+
100+
@Override
101+
public String toString() {
102+
return "Picture{link='" + link + "', image=" + image + "}";
103+
}
104+
}

API/src/main/java/io/github/jwdeveloper/tiktok/data/models/badges/Badge.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,4 @@ public static Badge map(io.github.jwdeveloper.tiktok.messages.data.BadgeStruct b
3737
public static Badge empty() {
3838
return new Badge();
3939
}
40-
41-
42-
}
40+
}

Client/src/main/java/io/github/jwdeveloper/tiktok/gifts/TikTokGiftManager.java

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,12 @@
2222
*/
2323
package io.github.jwdeveloper.tiktok.gifts;
2424

25-
import io.github.jwdeveloper.tiktok.data.models.gifts.Gift;
2625
import io.github.jwdeveloper.tiktok.data.models.Picture;
26+
import io.github.jwdeveloper.tiktok.data.models.gifts.Gift;
2727
import io.github.jwdeveloper.tiktok.exceptions.TikTokLiveException;
2828
import io.github.jwdeveloper.tiktok.live.GiftManager;
2929
import sun.misc.Unsafe;
3030

31-
import java.lang.reflect.Field;
32-
import java.lang.reflect.Modifier;
3331
import java.util.*;
3432
import java.util.logging.Logger;
3533

@@ -89,23 +87,17 @@ public Gift registerGift(int id, String name, int diamondCost, Picture picture)
8987
}
9088

9189
public Gift findById(int giftId) {
92-
if (!indexById.containsKey(giftId)) {
93-
return Gift.UNDEFINED;
94-
}
95-
return indexById.get(giftId);
90+
Gift gift = indexById.get(giftId);
91+
return gift == null ? Gift.UNDEFINED : gift;
9692
}
9793

9894
public Gift findByName(String giftName) {
99-
if (!indexByName.containsKey(giftName)) {
100-
return Gift.UNDEFINED;
101-
}
102-
return indexByName.get(giftName);
95+
Gift gift = indexByName.get(giftName);
96+
return gift == null ? Gift.UNDEFINED : gift;
10397
}
10498

10599
@Override
106-
public List<Gift> getGifts()
107-
{
100+
public List<Gift> getGifts() {
108101
return indexById.values().stream().toList();
109102
}
110-
111-
}
103+
}

0 commit comments

Comments
 (0)