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

This *should* fix the null errors by using our own site for the icon.

Browse Source
This commit is contained in:
NovaFox161
2018-06-15 12:07:49 -05:00
parent 2ef0949926
commit 2fdb96d8fe
10 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
API/src/main/java/com/cloudcraftgaming/discal/api/DisCalAPI.java
View File

@@ -7,6 +7,9 @@ public class DisCalAPI {
private static IDiscordClient client;
//final global variables.
public final String iconUrl = "https://discalbot.com/assets/images/logos/Dark/Opaque/Type%20Square%20Dark%20+bg.png";
private DisCalAPI() {
}

4
API/src/main/java/com/cloudcraftgaming/discal/api/message/calendar/CalendarMessageFormatter.java
View File

@@ -21,7 +21,7 @@ public class CalendarMessageFormatter {
public static EmbedObject getCalendarLinkEmbed(Calendar cal, GuildSettings settings) {
EmbedBuilder em = new EmbedBuilder();
em.withAuthorIcon(DisCalAPI.getAPI().getClient().getGuildByID(266063520112574464L).getIconURL());
em.withAuthorIcon(DisCalAPI.getAPI().iconUrl);
em.withAuthorName("DisCal");
em.withTitle(MessageManager.getMessage("Embed.Calendar.Link.Title", settings));
em.appendField(MessageManager.getMessage("Embed.Calendar.Link.Summary", settings), cal.getSummary(), true);
@@ -46,7 +46,7 @@ public class CalendarMessageFormatter {
*/
public static EmbedObject getPreCalendarEmbed(PreCalendar calendar, GuildSettings settings) {
EmbedBuilder em = new EmbedBuilder();
em.withAuthorIcon(DisCalAPI.getAPI().getClient().getGuildByID(266063520112574464L).getIconURL());
em.withAuthorIcon(DisCalAPI.getAPI().iconUrl);
em.withAuthorName("DisCal");
em.withTitle(MessageManager.getMessage("Embed.Calendar.Pre.Title", settings));
if (calendar.getSummary() != null) {

4
API/src/main/java/com/cloudcraftgaming/discal/api/network/google/Authorization.java
View File

@@ -68,7 +68,7 @@ public class Authorization {
//Send DM to user with code.
EmbedBuilder em = new EmbedBuilder();
em.withAuthorIcon(DisCalAPI.getAPI().getClient().getGuildByID(266063520112574464L).getIconURL());
em.withAuthorIcon(DisCalAPI.getAPI().iconUrl);
em.withAuthorName("DisCal");
em.withTitle(MessageManager.getMessage("Embed.AddCalendar.Code.Title", settings));
em.appendField(MessageManager.getMessage("Embed.AddCalendar.Code.Code", settings), cr.user_code, true);
@@ -190,7 +190,7 @@ public class Authorization {
for (CalendarListEntry i : items) {
if (!i.isDeleted()) {
EmbedBuilder em = new EmbedBuilder();
em.withAuthorIcon(DisCalAPI.getAPI().getClient().getGuildByID(266063520112574464L).getIconURL());
em.withAuthorIcon(DisCalAPI.getAPI().iconUrl);
em.withAuthorName("DisCal");
em.withTitle(MessageManager.getMessage("Embed.AddCalendar.List.Title", settings));
em.appendField(MessageManager.getMessage("Embed.AddCalendar.List.Name", settings), i.getSummary(), false);

2
Bot/src/main/java/com/cloudcraftgaming/discal/bot/internal/calendar/event/EventMessageFormatter.java
View File

@@ -154,7 +154,7 @@ public class EventMessageFormatter {
*/
public static EmbedObject getPreEventEmbed(PreEvent event, GuildSettings settings) {
EmbedBuilder em = new EmbedBuilder();
em.withAuthorIcon(DisCalAPI.getAPI().getClient().getGuildByID(266063520112574464L).getIconURL());
em.withAuthorIcon(DisCalAPI.getAPI().iconUrl);
em.withAuthorName("DisCal");
em.withTitle(MessageManager.getMessage("Embed.Event.Pre.Title", settings));
try {

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

@@ -39,7 +39,7 @@ public class AnnouncementMessageFormatter {
*/
public static EmbedObject getFormatAnnouncementEmbed(Announcement a, GuildSettings settings) {
EmbedBuilder em = new EmbedBuilder();
em.withAuthorIcon(DisCalAPI.getAPI().getClient().getGuildByID(266063520112574464L).getIconURL());
em.withAuthorIcon(DisCalAPI.getAPI().iconUrl);
em.withAuthorName("DisCal");
em.withTitle(MessageManager.getMessage("Embed.Announcement.Info.Title", settings));
try {
@@ -86,7 +86,7 @@ public class AnnouncementMessageFormatter {
*/
public static EmbedObject getCondensedAnnouncementEmbed(Announcement a, GuildSettings settings) {
EmbedBuilder em = new EmbedBuilder();
em.withAuthorIcon(DisCalAPI.getAPI().getClient().getGuildByID(266063520112574464L).getIconURL());
em.withAuthorIcon(DisCalAPI.getAPI().iconUrl);
em.withAuthorName("DisCal");
em.withTitle(MessageManager.getMessage("Embed.Announcement.Condensed.Title", settings));
em.appendField(MessageManager.getMessage("Embed.Announcement.Condensed.ID", settings), a.getAnnouncementId().toString(), false);
@@ -145,7 +145,7 @@ public class AnnouncementMessageFormatter {
*/
static void sendAnnouncementMessage(Announcement announcement, Event event, CalendarData data, GuildSettings settings) {
EmbedBuilder em = new EmbedBuilder();
em.withAuthorIcon(DisCalAPI.getAPI().getClient().getGuildByID(266063520112574464L).getIconURL());
em.withAuthorIcon(DisCalAPI.getAPI().iconUrl);
IGuild guild = DisCalAPI.getAPI().getClient().getGuildByID(announcement.getGuildId());
@@ -258,7 +258,7 @@ public class AnnouncementMessageFormatter {
static void sendAnnouncementDM(Announcement announcement, Event event, IUser user, CalendarData data, GuildSettings settings) {
EmbedBuilder em = new EmbedBuilder();
em.withAuthorIcon(DisCalAPI.getAPI().getClient().getGuildByID(266063520112574464L).getIconURL());
em.withAuthorIcon(DisCalAPI.getAPI().iconUrl);
em.withAuthorName("DisCal");
em.withTitle(MessageManager.getMessage("Embed.Announcement.Announce.Title", settings));
EventData ed = DatabaseManager.getManager().getEventData(announcement.getGuildId(), event.getId());

4
Bot/src/main/java/com/cloudcraftgaming/discal/bot/module/command/DisCalCommand.java
View File

@@ -140,7 +140,7 @@ public class DisCalCommand implements ICommand {
IGuild guild = event.getGuild();
EmbedBuilder em = new EmbedBuilder();
em.withAuthorIcon(DisCalAPI.getAPI().getClient().getGuildByID(266063520112574464L).getIconURL());
em.withAuthorIcon(DisCalAPI.getAPI().iconUrl);
em.withAuthorName("DisCal!");
em.withTitle(MessageManager.getMessage("Embed.DisCal.Info.Title", settings));
em.appendField(MessageManager.getMessage("Embed.DisCal.Info.Developer", settings), "NovaFox161", true);
@@ -242,7 +242,7 @@ public class DisCalCommand implements ICommand {
long guildId = event.getGuild().getLongID();
EmbedBuilder em = new EmbedBuilder();
em.withAuthorIcon(DisCalAPI.getAPI().getClient().getGuildByID(266063520112574464L).getIconURL());
em.withAuthorIcon(DisCalAPI.getAPI().iconUrl);
em.withAuthorName("DisCal");
em.withTitle(MessageManager.getMessage("Embed.DisCal.Settings.Title", settings));
em.appendField(MessageManager.getMessage("Embed.DisCal.Settings.ExternalCal", settings), String.valueOf(settings.useExternalCalendar()), true);

2
Bot/src/main/java/com/cloudcraftgaming/discal/bot/module/command/EventCommand.java
View File

@@ -746,7 +746,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(DisCalAPI.getAPI().getClient().getGuildByID(266063520112574464L).getIconURL());
em.withAuthorIcon(DisCalAPI.getAPI().iconUrl);
em.withAuthorName("DisCal!");
em.withTitle("Available Colors");

6
Bot/src/main/java/com/cloudcraftgaming/discal/bot/module/command/HelpCommand.java
View File

@@ -62,7 +62,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(DisCalAPI.getAPI().getClient().getGuildByID(266063520112574464L).getIconURL());
em.withAuthorIcon(DisCalAPI.getAPI().iconUrl);
em.withAuthorName("DisCal");
em.withTitle("DisCal Command Help");
for (ICommand c : CommandExecutor.getExecutor().getCommands()) {
@@ -103,7 +103,7 @@ public class HelpCommand implements ICommand {
//Embed formatters
private EmbedObject getCommandInfoEmbed(ICommand cmd) {
EmbedBuilder em = new EmbedBuilder();
em.withAuthorIcon(DisCalAPI.getAPI().getClient().getGuildByID(266063520112574464L).getIconURL());
em.withAuthorIcon(DisCalAPI.getAPI().iconUrl);
em.withAuthorName("DisCal");
em.appendField("Command", cmd.getCommand(), true);
em.appendField("Description", cmd.getCommandInfo().getDescription(), true);
@@ -127,7 +127,7 @@ public class HelpCommand implements ICommand {
private EmbedObject getSubCommandEmbed(ICommand cmd, String subCommand) {
EmbedBuilder em = new EmbedBuilder();
em.withAuthorIcon(DisCalAPI.getAPI().getClient().getGuildByID(266063520112574464L).getIconURL());
em.withAuthorIcon(DisCalAPI.getAPI().iconUrl);
em.withAuthorName("DisCal");
em.appendField("Command", cmd.getCommand(), true);
em.appendField("Sub Command", subCommand, true);

2
Bot/src/main/java/com/cloudcraftgaming/discal/bot/module/command/RsvpCommand.java
View File

@@ -233,7 +233,7 @@ public class RsvpCommand implements ICommand {
private EmbedObject getRsvpEmbed(RsvpData data, GuildSettings settings) {
EmbedBuilder em = new EmbedBuilder();
em.withAuthorIcon(DisCalAPI.getAPI().getClient().getGuildByID(266063520112574464L).getIconURL());
em.withAuthorIcon(DisCalAPI.getAPI().iconUrl);
em.withAuthorName("DisCal");
em.withTitle(MessageManager.getMessage("Embed.RSVP.List.Title", settings));
em.appendField("Event ID", data.getEventId(), false);

2
Bot/src/main/java/com/cloudcraftgaming/discal/bot/module/command/TimeCommand.java
View File

@@ -94,7 +94,7 @@ public class TimeCommand implements ICommand {
//Build embed and send.
EmbedBuilder em = new EmbedBuilder();
em.withAuthorIcon(DisCalAPI.getAPI().getClient().getGuildByID(266063520112574464L).getIconURL());
em.withAuthorIcon(DisCalAPI.getAPI().iconUrl);
em.withAuthorName("DisCal");
em.withTitle(MessageManager.getMessage("Embed.Time.Title", settings));
em.appendField(MessageManager.getMessage("Embed.Time.Time", settings), thisIsTheCorrectTime, false);