heavycaffeiner/ayaya
1
0
Fork 0
mirror of https://github.com/heavycaffeiner/ayaya.git synced 2025-10-28 04:44:56 +09:00
Code Issues Packages Projects Releases Wiki Activity

Refactor: handle some exception & change structure

Browse Source
This commit is contained in:
Dong Hyun Kim
2025-06-10 15:34:33 +09:00
parent cbeb66766b
commit 815a9eb863
3 changed files with 56 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/dev/ptnr/AyayaBot.java
View File

@@ -5,7 +5,6 @@ import net.dv8tion.jda.api.EmbedBuilder;
import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.JDA;
import net.dv8tion.jda.api.JDABuilder; import net.dv8tion.jda.api.JDABuilder;
import net.dv8tion.jda.api.entities.Guild; import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
import net.dv8tion.jda.api.events.session.ReadyEvent; import net.dv8tion.jda.api.events.session.ReadyEvent;
import net.dv8tion.jda.api.hooks.ListenerAdapter; import net.dv8tion.jda.api.hooks.ListenerAdapter;
@@ -30,7 +29,7 @@ public class AyayaBot {
try { try {
jda.awaitReady(); jda.awaitReady();
} catch (InterruptedException e) { } catch (InterruptedException e) {
System.err.println("[ERR] In AyayaBot.main() > " + e.getMessage()); System.err.println("[ERR > AyayaBot.main()] Failed to Init\n" + e.getMessage());
} }
} }
@@ -55,7 +54,6 @@ class BotListener extends ListenerAdapter {
List<Guild> guildList = jda.getGuilds(); List<Guild> guildList = jda.getGuilds();
for (Guild guild : guildList) { for (Guild guild : guildList) {
System.out.println("Contain Guild : " + guild.getName()); System.out.println("Contain Guild : " + guild.getName());
// System.out.println("ID: " + guild.get);
} }
System.out.println(jda.getSelfUser().getName() + " is Ready."); System.out.println(jda.getSelfUser().getName() + " is Ready.");
@@ -73,34 +71,30 @@ class BotListener extends ListenerAdapter {
} }
public void hitomi(SlashCommandInteractionEvent event, Integer id) { public void hitomi(SlashCommandInteractionEvent event, Integer id) {
event.reply("작품을 로드합니다. 조금 기다려주세요...").setEphemeral(true).queue();
EmbedBuilder eb = new EmbedBuilder(); EmbedBuilder eb = new EmbedBuilder();
eb.setTitle("품번 : " + id); eb.setTitle("품번 : " + id);
eb.setTimestamp(Instant.now()); eb.setTimestamp(Instant.now());
// eb.setDescription("This image has been added to the bot.");
// eb.addBlankField(false);
byte[] webpData = AyayaUtils.GetFileFromUrl(Hitomi.GetHitomiData(id)); byte[] webpData = AyayaUtils.GetFileFromUrl(Hitomi.GetHitomiData(id));
if (webpData == null) { if (webpData == null) {
event.reply("URL에서 이미지를 가져오지 못했습니다. URL이나 서버 상태를 확인해주세요.") event.getHook().editOriginal("URL에서 이미지를 가져오지 못했습니다. URL이나 서버 상태를 확인해주세요.").queue();
.setEphemeral(true)
.queue();
return; return;
} }
byte[] pngData = AyayaUtils.ConvertWebpToPng(webpData); byte[] pngData = AyayaUtils.ConvertWebpToPng(webpData);
if (pngData == null) { if (pngData == null) {
event.reply("이미지를 PNG로 변환하는 데 실패했습니다. 파일이 올바른 WebP 형식이 아닐 수 있습니다.") event.getHook().editOriginal("이미지를 PNG로 변환하는 데 실패했습니다. 파일이 올바른 WebP 형식이 아닐 수 있습니다.").queue();
.setEphemeral(true).queue();
return; return;
} }
eb.setImage("attachment://" + "1.png"); eb.setImage("attachment://" + "1.png");
eb.setFooter("Uploader : " + event.getUser().getName()); eb.setFooter("Uploader : " + event.getUser().getName());
event.reply("작품을 로드합니다. 조금 기다려주세요...").setEphemeral(true).queue();
FileUpload fileUpload = FileUpload.fromData(pngData, "1.png"); FileUpload fileUpload = FileUpload.fromData(pngData, "1.png");
event.getChannel().sendFiles(fileUpload).setEmbeds(eb.build()).queue(); event.getChannel().sendFiles(fileUpload).setEmbeds(eb.build()).queue();
event.getHook().sendMessage("작품을 받아오는 데에 성공하였습니다!").setEphemeral(true).queue(); event.getHook().editOriginal("작품을 받아오는 데에 성공하였습니다!").queue();
} }
} }

4
src/main/java/dev/ptnr/AyayaUtils.java
View File

@@ -30,7 +30,7 @@ public class AyayaUtils {
return out.toByteArray(); return out.toByteArray();
} }
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); System.out.println("[ERR > AyayaUtils.GetFileFromUrl()] Failed to Get Data\n" + e.getMessage());
return null; return null;
} finally { } finally {
if (conn != null) { if (conn != null) {
@@ -47,7 +47,7 @@ public class AyayaUtils {
ImageIO.write(image, "png", baos); ImageIO.write(image, "png", baos);
return baos.toByteArray(); return baos.toByteArray();
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); System.out.println("[ERR > AyayaUtils.ConvertWebpToPng()] Failed to Convert Webp\n" + e.getMessage());
return null; return null;
} }
} }

117
src/main/java/dev/ptnr/Hitomi.java
View File

@@ -2,134 +2,111 @@ package dev.ptnr;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map; import java.util.Map;
import java.util.regex.*; import java.util.regex.*;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
public class Hitomi { public class Hitomi {
private static String cdnUrl = ".gold-usergeneratedcontent.net"; private static final String cdnUrl = ".gold-usergeneratedcontent.net";
private static String baseCDNUrl = "https://ltn" + cdnUrl; private static final String baseCDNUrl = "https://ltn" + cdnUrl;
private static Map<String, Boolean> getGalleryData(Integer galleryId) throws Exception {
Map<String, Boolean> galleryData = new LinkedHashMap<>();
private static ArrayList<String> getGalleryData(Integer galleryId) {
String baseUrl = baseCDNUrl + "/galleries/" + galleryId + ".js"; String baseUrl = baseCDNUrl + "/galleries/" + galleryId + ".js";
String rawData = new String(AyayaUtils.GetFileFromUrl(baseUrl)); byte[] rawData = AyayaUtils.GetFileFromUrl(baseUrl);
if (rawData.length() == 3) { if (rawData == null) {
throw new Exception("Failed to Get JS (code " + rawData + ")"); System.out.println("[ERR > Hitomi.GetGalleryData()] Failed to Get " + galleryId + ".js");
return null;
} }
String rawJson = new String(rawData).replace("var galleryinfo = ", "");
rawData = rawData.replace("var galleryinfo = ", ""); ArrayList<String> galleryData = new ArrayList<>();
ObjectMapper objectMapper = new ObjectMapper();
try { try {
JsonNode rootNode = objectMapper.readTree(rawData); ObjectMapper objectMapper = new ObjectMapper();
JsonNode rootNode = objectMapper.readTree(rawJson);
JsonNode files = rootNode.get("files"); JsonNode files = rootNode.get("files");
for (JsonNode node : files) { for (JsonNode node : files) {
String fileHash = node.get("hash").asText(); String fileHash = node.get("hash").asText();
Boolean hasAvif = node.get("hasavif").asBoolean(); // Boolean hasAvif = node.get("hasavif").asBoolean();
galleryData.put(fileHash, hasAvif); galleryData.add(fileHash);
} }
} catch (JsonProcessingException e) { } catch (Exception e) {
System.out.println("[ERR] In Hitomi.getGalleryData() > " + e.getMessage()); System.out.println("[ERR > Hitomi.GetGalleryData()] Failed to Parse JSON\n" + e.getMessage());
throw e; return null;
} }
return galleryData; return galleryData;
} }
private static String getIdFromGG(String regex, String data) { private static Integer getIdFromGG(String regex, String data) {
Matcher matcher = Pattern.compile(regex).matcher(data); Matcher matcher = Pattern.compile(regex).matcher(data);
String regexData = ""; int regexData;
matcher.find(); matcher.find();
regexData = matcher.group(1); regexData = Integer.parseInt(matcher.group(1));
return regexData; return regexData;
} }
private static Map<String, Integer> getOffsetsFromGG(String regex, String data, Integer key) { private static Map<Integer, Integer> getOffsetsFromGG(String regex, String data, Integer key) {
Matcher matcher = Pattern.compile(regex).matcher(data); Matcher matcher = Pattern.compile(regex).matcher(data);
Map<String, Integer> offsets = new HashMap<>(); Map<Integer, Integer> offsets = new HashMap<>();
while (matcher.find()) { while (matcher.find()) {
offsets.put(matcher.group(1), key); offsets.put(Integer.parseInt(matcher.group(1)), key);
} }
return offsets; return offsets;
} }
private static String getGGJS() { private static String getGGJS() {
String baseUrl = baseCDNUrl + "/gg.js"; String baseUrl = baseCDNUrl + "/gg.js";
byte[] rawJs = AyayaUtils.GetFileFromUrl(baseUrl);
try { if (rawJs == null) {
return new String(AyayaUtils.GetFileFromUrl(baseUrl)); System.out.println("[ERR > Hitomi.GetGGJS()] Failed to Get gg.js");
} catch (Exception e) { return null;
System.out.println("[ERR] In Hitomi.GetGGJS() > " + e.getMessage());
return "";
} }
return new String(rawJs);
} }
private static String getImageUrl(String rawGG, String hash, Boolean hasAvif) { private static String getImageUrl(String rawGG, String hash) {
String DefaultSubdomainKey = getIdFromGG("var o = (\\d)", rawGG); int defaultDomainKey = getIdFromGG("var o = (\\d)", rawGG) + 1;
String SubdomainKey = getIdFromGG("o = (\\d); break;", rawGG); int offsetDomainKey = getIdFromGG("o = (\\d); break;", rawGG) + 1;
String CommonImagePath = getIdFromGG("b: '(.+)'", rawGG); int commonKey = getIdFromGG("b: '(\\d+)\\/'", rawGG);
Map<String, Integer> Offsets = getOffsetsFromGG("case (\\d+):", rawGG, Integer.parseInt(SubdomainKey)); Map<Integer, Integer> Offsets = getOffsetsFromGG("case (\\d+):", rawGG, offsetDomainKey);
int domainOffset = defaultDomainKey;
String ImageUrl = "";
Integer SubdomainOffset = Integer.parseInt(DefaultSubdomainKey) + 1;
// ex) hash == 415e8c1bfbac7cb6192b6f7c14768c196dde9029233126ca5f108d6aa99818de // ex) hash == 415e8c1bfbac7cb6192b6f7c14768c196dde9029233126ca5f108d6aa99818de
// 8de to slice hash[-1:] / hash[-3:-1] (e / 8d) // 8de to slice hash[-1:] / hash[-3:-1] (e / 8d)
// -> s == hash[-1:] + hash[-3:-1] == "e8d" // -> s == hash[-1:] + hash[-3:-1] == "e8d"
String SubKey = hash.substring(hash.length() - 1, hash.length()) + hash.substring(hash.length() - 3, hash.length() - 1);
// s to parseInt(s, 16) == 3725 == ImageId // s to parseInt(s, 16) == 3725 == ImageId
Integer ImageId = Integer.parseInt(SubKey, 16); int imageId = Integer.parseInt(hash.substring(hash.length() - 1) + hash.substring(hash.length() - 3, hash.length() - 1), 16);
if (Offsets.containsKey(imageId)) domainOffset = offsetDomainKey;
if (Offsets.containsKey(ImageId.toString())) SubdomainOffset = Integer.parseInt(SubdomainKey) + 1;
// a{key}.gold-usergeneratedcontent.net/1749488401/3725/415e8c1bfbac7cb6192b6f7c14768c196dde9029233126ca5f108d6aa99818de.avif
// domain number (a1, a2 / w1, w2..) // domain number (a1, a2 / w1, w2..)
// webp = w1, w2 / avif = a1, a2 // webp = w1, w2 / avif = a1, a2
// in gg.js case -> o(SubdomainKey) + 1 == 1, out of ggjs case -> o(DefaultSubdomainKey) + 1 == 2
// hasavif flag 1 -> a1, a2 / flag 0 -> w1, w2
// if (hasAvif) ImageUrl = "https://a" + SubdomainOffset + cdnUrl + "/" + CommonImagePath + ImageId + "/" + hash + ".avif"; return "https://w" + domainOffset + cdnUrl + "/" + commonKey + "/" + imageId + "/" + hash + ".webp";
// else ImageUrl = "https://w" + SubdomainOffset + cdnUrl + "/" + CommonImagePath + ImageId + "/" + hash + ".webp";
ImageUrl = "https://w" + SubdomainOffset + cdnUrl + "/" + CommonImagePath + ImageId + "/" + hash + ".webp";
// System.out.println("ImageUrl: " + ImageUrl);
return ImageUrl;
} }
public static String GetHitomiData(Integer galleryId) { public static String GetHitomiData(Integer galleryId) {
Map<String, Boolean> galleryData = new LinkedHashMap<>(); ArrayList<String> galleryData = getGalleryData(galleryId);
ArrayList<String> images = new ArrayList<>(); if (galleryData == null) {
System.err.println("[ERR > Hitomi.GetHitomiData()] Failed to Get Gallery Data");
try { return null;
galleryData = getGalleryData(galleryId);
} catch (Exception e) {
System.err.println("In Hitomi.main() > " + e.getMessage());
return "";
} }
String GGJS = getGGJS(); String GGJS = getGGJS();
if (GGJS == null) {
System.err.println("[ERR > Hitomi.GetHitomiData()] Failed to Get gg.js");
return null;
}
galleryData.forEach((hash, hasAvif) -> { ArrayList<String> images = new ArrayList<>();
images.add(getImageUrl(GGJS, hash, hasAvif));
}); galleryData.forEach((hash) -> images.add(getImageUrl(GGJS, hash)));
return images.get(0); return images.get(0);
} }
public static void main(String[] args) {
// GetHitomiData(3390541);
}
} }