From ebe17b97ff2a11014e727655a0a4770f59c437dc Mon Sep 17 00:00:00 2001 From: NovaFox161 Date: Fri, 14 Sep 2018 17:30:02 -0500 Subject: [PATCH] Fix my stupidity. --- .../client/listeners/discord/ReadyEventListener.java | 2 +- .../client/message/AnnouncementMessageFormatter.java | 8 ++++---- .../discal/client/message/CalendarMessageFormatter.java | 4 ++-- .../discal/client/message/EventMessageFormatter.java | 8 ++++---- .../discal/client/module/command/DisCalCommand.java | 4 ++-- .../discal/client/module/command/EventCommand.java | 2 +- .../discal/client/module/command/HelpCommand.java | 6 +++--- .../discal/client/module/command/RsvpCommand.java | 2 +- .../discal/client/module/command/TimeCommand.java | 2 +- .../discal/client/network/google/GoogleExternalAuth.java | 4 ++-- 10 files changed, 21 insertions(+), 21 deletions(-) diff --git a/client/src/main/java/org/dreamexposure/discal/client/listeners/discord/ReadyEventListener.java b/client/src/main/java/org/dreamexposure/discal/client/listeners/discord/ReadyEventListener.java index 785f543a..6b609936 100644 --- a/client/src/main/java/org/dreamexposure/discal/client/listeners/discord/ReadyEventListener.java +++ b/client/src/main/java/org/dreamexposure/discal/client/listeners/discord/ReadyEventListener.java @@ -31,7 +31,7 @@ public class ReadyEventListener { //Lets test the new announcement multi-threader... AnnouncementThreader.getThreader().init(); - GlobalConst.iconUrl = DisCalClient.getClient().getApplicationIconURL(); + GlobalConst.iconUrl = DisCalClient.getClient().getOurUser().getAvatarURL(); MessageManager.reloadLangs(); diff --git a/client/src/main/java/org/dreamexposure/discal/client/message/AnnouncementMessageFormatter.java b/client/src/main/java/org/dreamexposure/discal/client/message/AnnouncementMessageFormatter.java index ba8859f1..07f2026e 100644 --- a/client/src/main/java/org/dreamexposure/discal/client/message/AnnouncementMessageFormatter.java +++ b/client/src/main/java/org/dreamexposure/discal/client/message/AnnouncementMessageFormatter.java @@ -38,7 +38,7 @@ public class AnnouncementMessageFormatter { */ public static EmbedObject getFormatAnnouncementEmbed(Announcement a, GuildSettings settings) { EmbedBuilder em = new EmbedBuilder(); - em.withAuthorIcon(GlobalConst.discalSite); + em.withAuthorIcon(GlobalConst.iconUrl); em.withAuthorName("DisCal"); em.withAuthorUrl(GlobalConst.discalSite); em.withTitle(MessageManager.getMessage("Embed.Announcement.Info.Title", settings)); @@ -89,7 +89,7 @@ public class AnnouncementMessageFormatter { */ public static EmbedObject getCondensedAnnouncementEmbed(Announcement a, GuildSettings settings) { EmbedBuilder em = new EmbedBuilder(); - em.withAuthorIcon(GlobalConst.discalSite); + em.withAuthorIcon(GlobalConst.iconUrl); em.withAuthorName("DisCal"); em.withAuthorUrl(GlobalConst.discalSite); em.withTitle(MessageManager.getMessage("Embed.Announcement.Condensed.Title", settings)); @@ -149,7 +149,7 @@ public class AnnouncementMessageFormatter { */ public static void sendAnnouncementMessage(Announcement announcement, Event event, CalendarData data, GuildSettings settings) { EmbedBuilder em = new EmbedBuilder(); - em.withAuthorIcon(GlobalConst.discalSite); + em.withAuthorIcon(GlobalConst.iconUrl); em.withAuthorUrl(GlobalConst.discalSite); IGuild guild = DisCalClient.getClient().getGuildByID(announcement.getGuildId()); @@ -260,7 +260,7 @@ public class AnnouncementMessageFormatter { public static void sendAnnouncementDM(Announcement announcement, Event event, IUser user, CalendarData data, GuildSettings settings) { EmbedBuilder em = new EmbedBuilder(); - em.withAuthorIcon(GlobalConst.discalSite); + em.withAuthorIcon(GlobalConst.iconUrl); em.withAuthorName("DisCal"); em.withAuthorUrl(GlobalConst.discalSite); em.withTitle(MessageManager.getMessage("Embed.Announcement.Announce.Title", settings)); diff --git a/client/src/main/java/org/dreamexposure/discal/client/message/CalendarMessageFormatter.java b/client/src/main/java/org/dreamexposure/discal/client/message/CalendarMessageFormatter.java index bb2121a0..1f401e6a 100644 --- a/client/src/main/java/org/dreamexposure/discal/client/message/CalendarMessageFormatter.java +++ b/client/src/main/java/org/dreamexposure/discal/client/message/CalendarMessageFormatter.java @@ -20,7 +20,7 @@ public class CalendarMessageFormatter { public static EmbedObject getCalendarLinkEmbed(Calendar cal, GuildSettings settings) { EmbedBuilder em = new EmbedBuilder(); - em.withAuthorIcon(GlobalConst.discalSite); + em.withAuthorIcon(GlobalConst.iconUrl); em.withAuthorName("DisCal"); em.withAuthorUrl(GlobalConst.discalSite); em.withTitle(MessageManager.getMessage("Embed.Calendar.Link.Title", settings)); @@ -46,7 +46,7 @@ public class CalendarMessageFormatter { */ public static EmbedObject getPreCalendarEmbed(PreCalendar calendar, GuildSettings settings) { EmbedBuilder em = new EmbedBuilder(); - em.withAuthorIcon(GlobalConst.discalSite); + em.withAuthorIcon(GlobalConst.iconUrl); em.withAuthorName("DisCal"); em.withAuthorUrl(GlobalConst.discalSite); em.withTitle(MessageManager.getMessage("Embed.Calendar.Pre.Title", settings)); diff --git a/client/src/main/java/org/dreamexposure/discal/client/message/EventMessageFormatter.java b/client/src/main/java/org/dreamexposure/discal/client/message/EventMessageFormatter.java index 6158f64c..6ac0c85f 100644 --- a/client/src/main/java/org/dreamexposure/discal/client/message/EventMessageFormatter.java +++ b/client/src/main/java/org/dreamexposure/discal/client/message/EventMessageFormatter.java @@ -41,7 +41,7 @@ public class EventMessageFormatter { public static EmbedObject getEventEmbed(Event event, GuildSettings settings) { EventData ed = DatabaseManager.getManager().getEventData(settings.getGuildID(), event.getId()); EmbedBuilder em = new EmbedBuilder(); - em.withAuthorIcon(GlobalConst.discalSite); + em.withAuthorIcon(GlobalConst.iconUrl); em.withAuthorName("DisCal"); em.withAuthorUrl(GlobalConst.discalSite); em.withTitle(MessageManager.getMessage("Embed.Event.Info.Title", settings)); @@ -109,7 +109,7 @@ public class EventMessageFormatter { */ public static EmbedObject getCondensedEventEmbed(Event event, GuildSettings settings) { EmbedBuilder em = new EmbedBuilder(); - em.withAuthorIcon(GlobalConst.discalSite); + em.withAuthorIcon(GlobalConst.iconUrl); em.withAuthorName("DisCal"); em.withAuthorUrl(GlobalConst.discalSite); em.withTitle(MessageManager.getMessage("Embed.Event.Condensed.Title", settings)); @@ -155,7 +155,7 @@ public class EventMessageFormatter { */ public static EmbedObject getPreEventEmbed(PreEvent event, GuildSettings settings) { EmbedBuilder em = new EmbedBuilder(); - em.withAuthorIcon(GlobalConst.discalSite); + em.withAuthorIcon(GlobalConst.iconUrl); em.withAuthorName("DisCal"); em.withAuthorUrl(GlobalConst.discalSite); em.withTitle(MessageManager.getMessage("Embed.Event.Pre.Title", settings)); @@ -227,7 +227,7 @@ public class EventMessageFormatter { public static EmbedObject getEventConfirmationEmbed(EventCreatorResponse ecr, GuildSettings settings) { EventData ed = DatabaseManager.getManager().getEventData(settings.getGuildID(), ecr.getEvent().getId()); EmbedBuilder em = new EmbedBuilder(); - em.withAuthorIcon(GlobalConst.discalSite); + em.withAuthorIcon(GlobalConst.iconUrl); em.withAuthorName("DisCal"); em.withAuthorUrl(GlobalConst.discalSite); em.withTitle(MessageManager.getMessage("Embed.Event.Confirm.Title", settings)); diff --git a/client/src/main/java/org/dreamexposure/discal/client/module/command/DisCalCommand.java b/client/src/main/java/org/dreamexposure/discal/client/module/command/DisCalCommand.java index fee786f8..5608b7b3 100644 --- a/client/src/main/java/org/dreamexposure/discal/client/module/command/DisCalCommand.java +++ b/client/src/main/java/org/dreamexposure/discal/client/module/command/DisCalCommand.java @@ -136,7 +136,7 @@ public class DisCalCommand implements ICommand { IGuild guild = event.getGuild(); EmbedBuilder em = new EmbedBuilder(); - em.withAuthorIcon(GlobalConst.discalSite); + em.withAuthorIcon(GlobalConst.iconUrl); em.withAuthorName("DisCal"); em.withAuthorUrl(GlobalConst.discalSite); em.withTitle(MessageManager.getMessage("Embed.DisCal.Info.Title", settings)); @@ -235,7 +235,7 @@ public class DisCalCommand implements ICommand { private void moduleSettings(MessageReceivedEvent event, GuildSettings settings) { EmbedBuilder em = new EmbedBuilder(); - em.withAuthorIcon(GlobalConst.discalSite); + em.withAuthorIcon(GlobalConst.iconUrl); em.withAuthorName("DisCal"); em.withAuthorUrl(GlobalConst.discalSite); em.withTitle(MessageManager.getMessage("Embed.DisCal.Settings.Title", settings)); diff --git a/client/src/main/java/org/dreamexposure/discal/client/module/command/EventCommand.java b/client/src/main/java/org/dreamexposure/discal/client/module/command/EventCommand.java index 92e53aa8..b8726c31 100644 --- a/client/src/main/java/org/dreamexposure/discal/client/module/command/EventCommand.java +++ b/client/src/main/java/org/dreamexposure/discal/client/module/command/EventCommand.java @@ -734,7 +734,7 @@ public class EventCommand implements ICommand { String value = args[1]; if (value.equalsIgnoreCase("list") || value.equalsIgnoreCase("colors") || value.equalsIgnoreCase("colours")) { EmbedBuilder em = new EmbedBuilder(); - em.withAuthorIcon(GlobalConst.discalSite); + em.withAuthorIcon(GlobalConst.iconUrl); em.withAuthorName("DisCal"); em.withAuthorUrl(GlobalConst.discalSite); diff --git a/client/src/main/java/org/dreamexposure/discal/client/module/command/HelpCommand.java b/client/src/main/java/org/dreamexposure/discal/client/module/command/HelpCommand.java index 6f9f66f1..b774405a 100644 --- a/client/src/main/java/org/dreamexposure/discal/client/module/command/HelpCommand.java +++ b/client/src/main/java/org/dreamexposure/discal/client/module/command/HelpCommand.java @@ -64,7 +64,7 @@ public class HelpCommand implements ICommand { public boolean issueCommand(String[] args, MessageReceivedEvent event, GuildSettings settings) { if (args.length < 1) { EmbedBuilder em = new EmbedBuilder(); - em.withAuthorIcon(GlobalConst.discalSite); + em.withAuthorIcon(GlobalConst.iconUrl); em.withAuthorName("DisCal"); em.withAuthorUrl(GlobalConst.discalSite); em.withTitle("DisCal Command Help"); @@ -104,7 +104,7 @@ public class HelpCommand implements ICommand { //Embed formatters private EmbedObject getCommandInfoEmbed(ICommand cmd) { EmbedBuilder em = new EmbedBuilder(); - em.withAuthorIcon(GlobalConst.discalSite); + em.withAuthorIcon(GlobalConst.iconUrl); em.withAuthorName("DisCal"); em.withAuthorUrl(GlobalConst.discalSite); em.appendField("Command", cmd.getCommand(), true); @@ -129,7 +129,7 @@ public class HelpCommand implements ICommand { private EmbedObject getSubCommandEmbed(ICommand cmd, String subCommand) { EmbedBuilder em = new EmbedBuilder(); - em.withAuthorIcon(GlobalConst.discalSite); + em.withAuthorIcon(GlobalConst.iconUrl); em.withAuthorName("DisCal"); em.withAuthorUrl(GlobalConst.discalSite); em.appendField("Command", cmd.getCommand(), true); diff --git a/client/src/main/java/org/dreamexposure/discal/client/module/command/RsvpCommand.java b/client/src/main/java/org/dreamexposure/discal/client/module/command/RsvpCommand.java index 861763d4..2777139f 100644 --- a/client/src/main/java/org/dreamexposure/discal/client/module/command/RsvpCommand.java +++ b/client/src/main/java/org/dreamexposure/discal/client/module/command/RsvpCommand.java @@ -234,7 +234,7 @@ public class RsvpCommand implements ICommand { private EmbedObject getRsvpEmbed(RsvpData data, GuildSettings settings) { EmbedBuilder em = new EmbedBuilder(); - em.withAuthorIcon(GlobalConst.discalSite); + em.withAuthorIcon(GlobalConst.iconUrl); em.withAuthorName("DisCal"); em.withAuthorUrl(GlobalConst.discalSite); em.withTitle(MessageManager.getMessage("Embed.RSVP.List.Title", settings)); diff --git a/client/src/main/java/org/dreamexposure/discal/client/module/command/TimeCommand.java b/client/src/main/java/org/dreamexposure/discal/client/module/command/TimeCommand.java index d63a341e..c2421156 100644 --- a/client/src/main/java/org/dreamexposure/discal/client/module/command/TimeCommand.java +++ b/client/src/main/java/org/dreamexposure/discal/client/module/command/TimeCommand.java @@ -93,7 +93,7 @@ public class TimeCommand implements ICommand { //Build embed and send. EmbedBuilder em = new EmbedBuilder(); - em.withAuthorIcon(GlobalConst.discalSite); + em.withAuthorIcon(GlobalConst.iconUrl); em.withAuthorName("DisCal"); em.withAuthorUrl(GlobalConst.discalSite); em.withTitle(MessageManager.getMessage("Embed.Time.Title", settings)); diff --git a/client/src/main/java/org/dreamexposure/discal/client/network/google/GoogleExternalAuth.java b/client/src/main/java/org/dreamexposure/discal/client/network/google/GoogleExternalAuth.java index 616ed708..e55e7289 100644 --- a/client/src/main/java/org/dreamexposure/discal/client/network/google/GoogleExternalAuth.java +++ b/client/src/main/java/org/dreamexposure/discal/client/network/google/GoogleExternalAuth.java @@ -68,7 +68,7 @@ public class GoogleExternalAuth { //Send DM to user with code. EmbedBuilder em = new EmbedBuilder(); - em.withAuthorIcon(GlobalConst.discalSite); + em.withAuthorIcon(GlobalConst.iconUrl); em.withAuthorName("DisCal"); em.withAuthorUrl(GlobalConst.discalSite); em.withTitle(MessageManager.getMessage("Embed.AddCalendar.Code.Title", settings)); @@ -169,7 +169,7 @@ public class GoogleExternalAuth { for (CalendarListEntry i : items) { if (!i.isDeleted()) { EmbedBuilder em = new EmbedBuilder(); - em.withAuthorIcon(GlobalConst.discalSite); + em.withAuthorIcon(GlobalConst.iconUrl); em.withAuthorName("DisCal"); em.withAuthorUrl(GlobalConst.discalSite); em.withTitle(MessageManager.getMessage("Embed.AddCalendar.List.Title", settings));