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

Code cleanup. Hopefully fix announcement view pings.

Browse Source
This commit is contained in:
NovaFox161
2018-07-07 22:52:38 -05:00
parent e2af8652d6
commit e7cb694ab9
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/com/cloudcraftgaming/discal/bot/module/announcement/AnnouncementMessageFormatter.java
View File

@@ -47,21 +47,23 @@ public class AnnouncementMessageFormatter {
} catch (NullPointerException e) {
em.appendField(MessageManager.getMessage("Embed.Announcement.Info.ID", settings), "ID IS NULL???", true);
}
em.appendField(MessageManager.getMessage("Embed.Announcement.Info.Type", settings), a.getAnnouncementType().name(), true);
if (a.getAnnouncementType().equals(AnnouncementType.SPECIFIC)) {
em.appendField(MessageManager.getMessage("Embed.Announcement.Info.EventID", settings), a.getEventId(), true);
EventData ed = DatabaseManager.getManager().getEventData(a.getGuildId(), a.getEventId());
if (ed.getImageLink() != null && ImageUtils.validate(ed.getImageLink())) {
if (ed.getImageLink() != null && ImageUtils.validate(ed.getImageLink()))
em.withImage(ed.getImageLink());
}
} else if (a.getAnnouncementType().equals(AnnouncementType.COLOR)) {
em.appendField(MessageManager.getMessage("Embed.Announcement.Info.Color", settings), a.getEventColor().name(), true);
} else if (a.getAnnouncementType().equals(AnnouncementType.RECUR)) {
em.appendField(MessageManager.getMessage("Embed.Announcement.Info.RecurID", settings), a.getEventId(), true);
EventData ed = DatabaseManager.getManager().getEventData(a.getGuildId(), a.getEventId());
if (ed.getImageLink() != null && ImageUtils.validate(ed.getImageLink())) {
if (ed.getImageLink() != null && ImageUtils.validate(ed.getImageLink()))
em.withImage(ed.getImageLink());
}
}
em.appendField(MessageManager.getMessage("Embed.Announcement.Info.Hours", settings), String.valueOf(a.getHoursBefore()), true);
em.appendField(MessageManager.getMessage("Embed.Announcement.Info.Minutes", settings), String.valueOf(a.getMinutesBefore()), true);
@@ -103,9 +105,9 @@ public class AnnouncementMessageFormatter {
CalendarData data = DatabaseManager.getManager().getMainCalendar(a.getGuildId());
Event event = service.events().get(data.getCalendarAddress(), a.getEventId()).execute();
EventData ed = DatabaseManager.getManager().getEventData(settings.getGuildID(), event.getId());
if (ed.getImageLink() != null && ImageUtils.validate(ed.getImageLink())) {
if (ed.getImageLink() != null && ImageUtils.validate(ed.getImageLink()))
em.withThumbnail(ed.getImageLink());
}
if (event.getSummary() != null) {
String summary = event.getSummary();
if (summary.length() > 250) {
@@ -159,9 +161,8 @@ public class AnnouncementMessageFormatter {
em.withTitle(MessageManager.getMessage("Embed.Announcement.Announce.Title", settings));
EventData ed = DatabaseManager.getManager().getEventData(announcement.getGuildId(), event.getId());
if (ed.getImageLink() != null && ImageUtils.validate(ed.getImageLink())) {
if (ed.getImageLink() != null && ImageUtils.validate(ed.getImageLink()))
em.withImage(ed.getImageLink());
}
em.withUrl(event.getHtmlLink());
@@ -230,12 +231,10 @@ public class AnnouncementMessageFormatter {
}
}
if (!settings.usingSimpleAnnouncements()) {
if (!settings.usingSimpleAnnouncements())
em.appendField(MessageManager.getMessage("Embed.Announcement.Announce.EventID", settings), event.getId(), false);
}
if (!announcement.getInfo().equalsIgnoreCase("None") && !announcement.getInfo().equalsIgnoreCase("")) {
if (!announcement.getInfo().equalsIgnoreCase("None") && !announcement.getInfo().equalsIgnoreCase(""))
em.appendField(MessageManager.getMessage("Embed.Announcement.Announce.Info", settings), announcement.getInfo(), false);
}
}
@@ -388,6 +387,10 @@ public class AnnouncementMessageFormatter {
if (mentionHere)
message = message + " here";
//Sanitize even tho this shouldn't be needed....
message = message.replaceAll("@", "");
return message;
}