Skip to content

Commit

Permalink
Upgrade to D4J 3.2.0-RC1
Browse files Browse the repository at this point in the history 
This means I redid everything that used Consumer<Spec> and now just Spec

Also cleaned up some other code too. Potentially fix database connection leaking
  • Loading branch information
@NovaFox161
NovaFox161 committed Jul 23, 2021
1 parent 855883d commit 878c12b
Show file tree
Hide file tree
Showing 14 changed files with 522 additions and 539 deletions.
175 changes: 98 additions & 77 deletions ...t/src/main/java/org/dreamexposure/discal/client/message/AnnouncementMessageFormatter.java
View file

Large diffs are not rendered by default.

85 changes: 47 additions & 38 deletions client/src/main/java/org/dreamexposure/discal/client/message/CalendarMessageFormatter.java
View file
Expand Up @@ -11,8 +11,6 @@
import org.dreamexposure.discal.core.utils.GlobalVal;
import reactor.core.publisher.Mono;

import java.util.function.Consumer;

/**
* Created by Nova Fox on 11/10/17.
* Website: www.cloudcraftgaming.com
Expand All @@ -29,83 +27,94 @@ public static String getCalendarLink(final Snowflake guildId, final int calNumbe
}

@Deprecated
public static Mono<Consumer<EmbedCreateSpec>> getCalendarLinkEmbed(final Calendar cal, final GuildSettings settings) {
return DisCalClient.getClient().getGuildById(settings.getGuildID()).map(g -> spec -> {
public static Mono<EmbedCreateSpec> getCalendarLinkEmbed(final Calendar cal, final GuildSettings settings) {
return DisCalClient.getClient().getGuildById(settings.getGuildID()).map(g -> {
var builder = EmbedCreateSpec.builder();

if (settings.getBranded())
spec.setAuthor(g.getName(), BotSettings.BASE_URL.get(),
builder.author(g.getName(), BotSettings.BASE_URL.get(),
g.getIconUrl(Image.Format.PNG).orElse(GlobalVal.getIconUrl()));
else
spec.setAuthor("DisCal", BotSettings.BASE_URL.get(), GlobalVal.getIconUrl());
builder.author("DisCal", BotSettings.BASE_URL.get(), GlobalVal.getIconUrl());

spec.setTitle(Messages.getMessage("Embed.Calendar.Link.Title", settings));
builder.title(Messages.getMessage("Embed.Calendar.Link.Title", settings));

if (cal.getSummary() != null)
spec.addField(Messages.getMessage("Embed.Calendar.Link.Summary", settings), cal.getSummary(), true);
builder.addField(Messages.getMessage("Embed.Calendar.Link.Summary", settings), cal.getSummary(), true);

if (cal.getDescription() != null)
spec.addField(Messages.getMessage("Embed.Calendar.Link.Description", settings), cal.getDescription(), true);
builder.addField(Messages.getMessage("Embed.Calendar.Link.Description", settings), cal.getDescription(), true);

builder.addField(Messages.getMessage("Embed.Calendar.Link.TimeZone", settings), cal.getTimeZone(), false);
builder.url(CalendarMessageFormatter.getCalendarLink(settings.getGuildID()));
builder.footer(Messages.getMessage("Embed.Calendar.Link.CalendarId", "%id%", cal.getId(), settings), null);
builder.color(GlobalVal.getDiscalColor());

spec.addField(Messages.getMessage("Embed.Calendar.Link.TimeZone", settings), cal.getTimeZone(), false);
spec.setUrl(CalendarMessageFormatter.getCalendarLink(settings.getGuildID()));
spec.setFooter(Messages.getMessage("Embed.Calendar.Link.CalendarId", "%id%", cal.getId(), settings), null);
spec.setColor(GlobalVal.getDiscalColor());
return builder.build();
});
}

public static Mono<Consumer<EmbedCreateSpec>> getCalendarLinkEmbed(final Calendar cal, final int calNum, final GuildSettings settings) {
return DisCalClient.getClient().getGuildById(settings.getGuildID()).map(g -> spec -> {
public static Mono<EmbedCreateSpec> getCalendarLinkEmbed(final Calendar cal, final int calNum, final GuildSettings settings) {
return DisCalClient.getClient().getGuildById(settings.getGuildID()).map(g -> {
var builder = EmbedCreateSpec.builder();

if (settings.getBranded())
spec.setAuthor(g.getName(), BotSettings.BASE_URL.get(),
builder.author(g.getName(), BotSettings.BASE_URL.get(),
g.getIconUrl(Image.Format.PNG).orElse(GlobalVal.getIconUrl()));
else
spec.setAuthor("DisCal", BotSettings.BASE_URL.get(), GlobalVal.getIconUrl());
builder.author("DisCal", BotSettings.BASE_URL.get(), GlobalVal.getIconUrl());

spec.setTitle(Messages.getMessage("Embed.Calendar.Link.Title", settings));
builder.title(Messages.getMessage("Embed.Calendar.Link.Title", settings));

if (cal.getSummary() != null)
spec.addField(Messages.getMessage("Embed.Calendar.Link.Summary", settings), cal.getSummary(), true);
builder.addField(Messages.getMessage("Embed.Calendar.Link.Summary", settings), cal.getSummary(), true);

if (cal.getDescription() != null)
spec.addField(Messages.getMessage("Embed.Calendar.Link.Description", settings), cal.getDescription(), true);
builder.addField(Messages.getMessage("Embed.Calendar.Link.Description", settings), cal.getDescription(), true);

builder.addField(Messages.getMessage("Embed.Calendar.Link.TimeZone", settings), cal.getTimeZone(), false);
builder.url(CalendarMessageFormatter.getCalendarLink(settings.getGuildID(), calNum));
builder.footer(Messages.getMessage("Embed.Calendar.Link.CalendarId", "%id%", cal.getId(), settings), null);
builder.color(GlobalVal.getDiscalColor());

spec.addField(Messages.getMessage("Embed.Calendar.Link.TimeZone", settings), cal.getTimeZone(), false);
spec.setUrl(CalendarMessageFormatter.getCalendarLink(settings.getGuildID(), calNum));
spec.setFooter(Messages.getMessage("Embed.Calendar.Link.CalendarId", "%id%", cal.getId(), settings), null);
spec.setColor(GlobalVal.getDiscalColor());
return builder.build();
});
}

public static Mono<Consumer<EmbedCreateSpec>> getPreCalendarEmbed(final PreCalendar calendar, final GuildSettings settings) {
return DisCalClient.getClient().getGuildById(settings.getGuildID()).map(g -> spec -> {
public static Mono<EmbedCreateSpec> getPreCalendarEmbed(final PreCalendar calendar, final GuildSettings settings) {
return DisCalClient.getClient().getGuildById(settings.getGuildID()).map(g -> {
var builder = EmbedCreateSpec.builder();

if (settings.getBranded())
spec.setAuthor(g.getName(), BotSettings.BASE_URL.get(),
builder.author(g.getName(), BotSettings.BASE_URL.get(),
g.getIconUrl(Image.Format.PNG).orElse(GlobalVal.getIconUrl()));
else
spec.setAuthor("DisCal", BotSettings.BASE_URL.get(), GlobalVal.getIconUrl());
builder.author("DisCal", BotSettings.BASE_URL.get(), GlobalVal.getIconUrl());

spec.setTitle(Messages.getMessage("Embed.Calendar.Pre.Title", settings));
builder.title(Messages.getMessage("Embed.Calendar.Pre.Title", settings));
if (!calendar.getSummary().isEmpty())
spec.addField(Messages.getMessage("Embed.Calendar.Pre.Summary", settings), calendar.getSummary(), true);
builder.addField(Messages.getMessage("Embed.Calendar.Pre.Summary", settings), calendar.getSummary(), true);
else
spec.addField(Messages.getMessage("Embed.Calendar.Pre.Summary", settings), "***UNSET***", true);
builder.addField(Messages.getMessage("Embed.Calendar.Pre.Summary", settings), "***UNSET***", true);

if (!calendar.getDescription().isEmpty())
spec.addField(Messages.getMessage("Embed.Calendar.Pre.Description", settings), calendar.getDescription(), false);
builder.addField(Messages.getMessage("Embed.Calendar.Pre.Description", settings), calendar.getDescription(), false);
else
spec.addField(Messages.getMessage("Embed.Calendar.Pre.Description", settings), "***UNSET***", false);
builder.addField(Messages.getMessage("Embed.Calendar.Pre.Description", settings), "***UNSET***", false);

if (calendar.getTimezone() != null)
spec.addField(Messages.getMessage("Embed.Calendar.Pre.TimeZone", settings), calendar.getTimezone(), true);
builder.addField(Messages.getMessage("Embed.Calendar.Pre.TimeZone", settings), calendar.getTimezone(), true);
else
spec.addField(Messages.getMessage("Embed.Calendar.Pre.TimeZone", settings), "***UNSET***", true);
builder.addField(Messages.getMessage("Embed.Calendar.Pre.TimeZone", settings), "***UNSET***", true);

if (calendar.getEditing())
spec.addField(Messages.getMessage("Embed.Calendar.Pre.CalendarId", settings), calendar.getCalendarId(), false);
builder.addField(Messages.getMessage("Embed.Calendar.Pre.CalendarId", settings), calendar.getCalendarId(), false);


spec.setFooter(Messages.getMessage("Embed.Calendar.Pre.Key", settings), null);
spec.setColor(GlobalVal.getDiscalColor());
builder.footer(Messages.getMessage("Embed.Calendar.Pre.Key", settings), null);
builder.color(GlobalVal.getDiscalColor());

return builder.build();
});
}
}

0 comments on commit 878c12b

Please sign in to comment.