mirror/DisCal-Discord-Bot
1
0
Fork 0
mirror of https://github.com/DreamExposure/DisCal-Discord-Bot.git synced 2026-02-11 22:18:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix my stupidity.

Browse Source
This commit is contained in:
NovaFox161
2018-09-14 17:30:02 -05:00
parent d4f2f50c88
commit ebe17b97ff
10 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/main/java/org/dreamexposure/discal/client/listeners/discord/ReadyEventListener.java
View File

@@ -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();

8
client/src/main/java/org/dreamexposure/discal/client/message/AnnouncementMessageFormatter.java
View File

@@ -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));

4
client/src/main/java/org/dreamexposure/discal/client/message/CalendarMessageFormatter.java
View File

@@ -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));

8
client/src/main/java/org/dreamexposure/discal/client/message/EventMessageFormatter.java
View File

@@ -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));

4
client/src/main/java/org/dreamexposure/discal/client/module/command/DisCalCommand.java
View File

@@ -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));

2
client/src/main/java/org/dreamexposure/discal/client/module/command/EventCommand.java
View File

@@ -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);

6
client/src/main/java/org/dreamexposure/discal/client/module/command/HelpCommand.java
View File

@@ -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);

2
client/src/main/java/org/dreamexposure/discal/client/module/command/RsvpCommand.java
View File

@@ -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));

2
client/src/main/java/org/dreamexposure/discal/client/module/command/TimeCommand.java
View File

@@ -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));

4
client/src/main/java/org/dreamexposure/discal/client/network/google/GoogleExternalAuth.java
View File

@@ -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));