Skip to content

Commit

Permalink
Replace discord cdn links
Browse files Browse the repository at this point in the history
Welcome TTT
  • Loading branch information
Alf-Melmac committed Nov 27, 2023
1 parent b9d352d commit 3599df2
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/main/java/de/webalf/slotbot/model/Guild.java
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public String buildEmojiUrl() {
}

public String getSpacerUrl() {
return StringUtils.isNotEmpty(spacerUrl) ? spacerUrl : "https://cdn.discordapp.com/attachments/759147249325572097/1084262121761677322/Discord_Missionstrenner_Slotbot.png";
return StringUtils.isNotEmpty(spacerUrl) ? spacerUrl : "https://slotbot.de/backend/userContent/1/Discord_Missionstrenner_Slotbot.png";
}

public Locale getLocale() {
Expand Down
16 changes: 12 additions & 4 deletions src/main/java/de/webalf/slotbot/service/GuildService.java
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,10 @@ public void removeArchiveChannelByChannel(long guildId, long removedChannelId) {
}
}

private static final String SLOTBOT_LOGO = "https://cdn.discordapp.com/attachments/759147249325572097/899740543603589130/AM-name-slotbot-small.png";
private static final String AMB_LOGO = "https://cdn.discordapp.com/attachments/759147249325572097/885282179796566046/AM-Blau-small.jpg";
private static final String DAA_LOGO = "https://cdn.discordapp.com/attachments/759147249325572097/899747640634376272/DAA_transparent.gif";
private static final String SLOTBOT_LOGO = "https://slotbot.de/backend/userContent/1/AM-name-slotbot-small.png";
private static final String AMB_LOGO = "https://events.armamachtbock.de/backend/userContent/1/AM-Blau-small.jpg";
private static final String DAA_LOGO = "https://events.deutsche-arma-allianz.de/backend/userContent/1/DAA_transparent.gif";
private static final String TTT_LOGO = "https://events.tacticalteam.de/backend/userContent/1/TTT_Logo.png";

public static String getLogo(@NonNull Guild guild) {
return getLogo(guild.getId());
Expand All @@ -151,6 +152,8 @@ public static String getLogo(long guildId) {
return AMB_LOGO;
} else if (GuildService.isDAA(guildId)) {
return DAA_LOGO;
} else if (GuildService.isTTT(guildId)) {
return TTT_LOGO;
}
return SLOTBOT_LOGO;
}
Expand All @@ -166,6 +169,7 @@ private static boolean is(long guildId, long givenGuildId) {

private static final long AMB = 706254758721224707L;
private static final long DAA = 874650742089203792L;
private static final long TTT = 121399943393968128L;

public static boolean isAMB(@NonNull Guild guild) {
return isAMB(guild.getId());
Expand All @@ -175,7 +179,11 @@ public static boolean isAMB(long guildId) {
return is(AMB, guildId);
}

public static boolean isDAA(long guildId) {
private static boolean isDAA(long guildId) {
return is(DAA, guildId);
}

private static boolean isTTT(long guildId) {
return is(TTT, guildId);
}
}
2 changes: 1 addition & 1 deletion src/main/java/de/webalf/slotbot/util/EventHelper.java
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public MessageEmbed buildDetailsEmbed(@NonNull Event event, @NonNull Locale guil
.setTimestamp(Instant.now());

if (event.isHidden()) {
embedBuilder.setImage("https://cdn.discordapp.com/attachments/759147249325572097/789151354920632330/hidden_event.jpg");
embedBuilder.setImage("https://slotbot.de/backend/userContent/1/hidden_event.jpg");
}

addFields(embedBuilder, event, guildLocale);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ void buildDetailsEmbedAddsHiddenImage() {

final MessageEmbed result = sut.buildDetailsEmbed(event, TEST_LOCALE);

assertEquals("https://cdn.discordapp.com/attachments/759147249325572097/789151354920632330/hidden_event.jpg", result.getImage().getUrl());
assertEquals("https://slotbot.de/backend/userContent/1/hidden_event.jpg", result.getImage().getUrl());
}

@Test
Expand Down

0 comments on commit 3599df2

Please sign in to comment.