Skip to content

feat: FINALV1KLIPYPREVIEWS - Allow Klipy CDN images for in-game GIF previews #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Good627 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: FINALV1KLIPYPREVIEWS - Allow Klipy CDN images for in-game GIF previews #28

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions src/tel/eden/mod/chat/ImagePreviewManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,6 +621,8 @@ private static java.awt.image.BufferedImage decodeWithImageIo(byte[] data) throw
"media.tenor.com", "media1.tenor.com", "c.tenor.com",
// Giphy
"media.giphy.com", "i.giphy.com", "media0.giphy.com", "media1.giphy.com", "media2.giphy.com", "media3.giphy.com", "media4.giphy.com",
// Klipy (Discord GIF picker)
"static.klipy.com", "static1.klipy.com", "static2.klipy.com",
// Wynncraft
"cdn.wynncraft.com");

Expand All @@ -630,9 +632,9 @@ private static java.awt.image.BufferedImage decodeWithImageIo(byte[] data) throw
* page and pulls the real media URL out of its {@code og:image} tag before the
* normal download path runs.
*
* <p>Klipy is deliberately not included here: its share pages sit behind a
* Cloudflare bot-management challenge that always 403s a plain HTTP fetch, so
* there's nothing to resolve — those links stay plain clickable text instead.
* <p>Klipy share pages sit behind a Cloudflare bot-management challenge that
* always 403s a direct client fetch; EdenBot resolves those to direct
* static.klipy.com media links server-side before relaying.
*/
private static final java.util.Set<String> SHARE_HOSTS = java.util.Set.of("tenor.com", "www.tenor.com");

Expand All @@ -647,8 +649,8 @@ public static boolean isAllowedHost(String urlString) {
if (TRUSTED_HOSTS.contains(host)) {
return true;
}
// Allow any subdomain of Discord's CDN (e.g. images-ext-1.discordapp.net).
return host.endsWith(".discordapp.com") || host.endsWith(".discordapp.net");
// Allow any subdomain of Discord's or Klipy's CDN (e.g. images-ext-1.discordapp.net).
return host.endsWith(".discordapp.com") || host.endsWith(".discordapp.net") || host.endsWith(".klipy.com");
} catch (IllegalArgumentException e) {
return false;
}
Expand Down
Loading