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

Cleaning up google authentication code.

Browse Source
This commit is contained in:
NovaFox161
2018-06-14 16:12:17 -05:00
parent 4e26db6643
commit cf5c21ebb6
17 changed files with 82 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
API/src/main/java/com/cloudcraftgaming/discal/api/calendar/CalendarAuth.java
View File

@@ -108,21 +108,13 @@ public class CalendarAuth {
return credential;
}
/**
* Build and return an authorized Calendar client service.
*
* @return an authorized Calendar client service
* @throws IOException In the event authorization fails.
*/
public static com.google.api.services.calendar.Calendar
getCalendarService() throws IOException {
Credential credential = authorize();
return new com.google.api.services.calendar.Calendar.Builder(HTTP_TRANSPORT, JSON_FACTORY, credential).setApplicationName(APPLICATION_NAME).build();
}
public static com.google.api.services.calendar.Calendar getCalendarService(GuildSettings g) throws Exception {
Credential credential = authorize(g);
return new com.google.api.services.calendar.Calendar.Builder(new NetHttpTransport(), JacksonFactory.getDefaultInstance(), credential).setApplicationName(APPLICATION_NAME).build();
if (g != null && g.useExternalCalendar()) {
Credential credential = authorize(g);
return new com.google.api.services.calendar.Calendar.Builder(new NetHttpTransport(), JacksonFactory.getDefaultInstance(), credential).setApplicationName(APPLICATION_NAME).build();
} else {
Credential credential = authorize();
return new com.google.api.services.calendar.Calendar.Builder(HTTP_TRANSPORT, JSON_FACTORY, credential).setApplicationName(APPLICATION_NAME).build();
}
}
}

6
API/src/main/java/com/cloudcraftgaming/discal/api/object/event/PreEvent.java
View File

@@ -103,11 +103,7 @@ public class PreEvent {
Calendar cal = null;
try {
if (settings.useExternalCalendar()) {
cal = CalendarAuth.getCalendarService(settings).calendars().get(data.getCalendarAddress()).execute();
} else {
cal = CalendarAuth.getCalendarService().calendars().get(data.getCalendarAddress()).execute();
}
cal = CalendarAuth.getCalendarService(settings).calendars().get(data.getCalendarAddress()).execute();
} catch (Exception ex) {
Logger.getLogger().exception(null, "Failed to get proper date time for event!", ex, this.getClass(), true);
}

15
API/src/main/java/com/cloudcraftgaming/discal/api/object/web/WebCalendar.java
View File

@@ -94,17 +94,10 @@ public class WebCalendar {
link = "https://www.discalbot.com/embed/calendar/" + gs.getGuildID();
external = cd.isExternal();
try {
if (cd.isExternal()) {
Calendar cal = CalendarAuth.getCalendarService(gs).calendars().get(id).execute();
name = cal.getSummary();
description = cal.getDescription();
timezone = cal.getTimeZone().replaceAll("/", "___");
} else {
Calendar cal = CalendarAuth.getCalendarService().calendars().get(id).execute();
name = cal.getSummary();
description = cal.getDescription();
timezone = cal.getTimeZone().replaceAll("/", "___");
}
Calendar cal = CalendarAuth.getCalendarService(gs).calendars().get(id).execute();
name = cal.getSummary();
description = cal.getDescription();
timezone = cal.getTimeZone().replaceAll("/", "___");
} catch (Exception e) {
Logger.getLogger().exception(null, "[WEB] Failed to get calendar!", e, this.getClass(), true);
name = "ERROR!";

12
API/src/main/java/com/cloudcraftgaming/discal/api/utils/CalendarUtils.java
View File

@@ -8,8 +8,6 @@ import com.cloudcraftgaming.discal.logger.Logger;
import com.google.api.client.googleapis.json.GoogleJsonResponseException;
import com.google.api.services.calendar.Calendar;
import java.io.IOException;
/**
* Created by Nova Fox on 11/10/17.
* Website: www.cloudcraftgaming.com
@@ -26,10 +24,10 @@ public class CalendarUtils {
try {
//Only delete if the calendar is stored on DisCal's account.
if (!data.getCalendarAddress().equalsIgnoreCase("primary") && !settings.useExternalCalendar()) {
Calendar service = CalendarAuth.getCalendarService();
Calendar service = CalendarAuth.getCalendarService(settings);
service.calendars().delete(data.getCalendarAddress()).execute();
}
} catch (IOException e) {
} catch (Exception e) {
//Fail silently.
Logger.getLogger().exception(null, "Failed to delete calendar", e, CalendarUtils.class, true);
return false;
@@ -53,11 +51,7 @@ public class CalendarUtils {
public static boolean calendarExists(CalendarData data, GuildSettings settings) {
try {
if (settings.useExternalCalendar()) {
return CalendarAuth.getCalendarService(settings).calendars().get(data.getCalendarAddress()).execute() != null;
} else {
return CalendarAuth.getCalendarService().calendars().get(data.getCalendarAddress()).execute() != null;
}
return CalendarAuth.getCalendarService(settings).calendars().get(data.getCalendarAddress()).execute() != null;
} catch (GoogleJsonResponseException ge) {
if (ge.getStatusCode() == 410 || ge.getStatusCode() == 404) {
//Calendar does not exist... remove from db...

32
API/src/main/java/com/cloudcraftgaming/discal/api/utils/EventUtils.java
View File

@@ -26,12 +26,7 @@ public class EventUtils {
//TODO: Support multiple calendars...
String calendarId = DatabaseManager.getManager().getMainCalendar(settings.getGuildID()).getCalendarAddress();
try {
Calendar service;
if (settings.useExternalCalendar()) {
service = CalendarAuth.getCalendarService(settings);
} else {
service = CalendarAuth.getCalendarService();
}
Calendar service = CalendarAuth.getCalendarService(settings);
try {
service.events().delete(calendarId, eventId).execute();
} catch (Exception e) {
@@ -53,12 +48,8 @@ public class EventUtils {
//TODO: Support multiple calendars...
String calendarId = DatabaseManager.getManager().getMainCalendar(settings.getGuildID()).getCalendarAddress();
try {
Calendar service;
if (settings.useExternalCalendar()) {
service = CalendarAuth.getCalendarService(settings);
} else {
service = CalendarAuth.getCalendarService();
}
Calendar service = CalendarAuth.getCalendarService(settings);
return service.events().get(calendarId, eventId).execute() != null;
} catch (Exception e) {
//Failed to check event, probably doesn't exist, safely ignore.
@@ -80,21 +71,4 @@ public class EventUtils {
return pe;
}
public static String applyHoursToRawUserInput(String dateRaw, Integer plus) {
//format: yyyy/MM/dd-HH:mm:ss
String hoursS = dateRaw.substring(11, 13);
try {
Integer newHours = Integer.valueOf(hoursS);
newHours = newHours + plus;
String[] timeArray = dateRaw.split(":");
return timeArray[0] + newHours + ":" + timeArray[1] + ":" + timeArray[2];
} catch (NumberFormatException e) {
Logger.getLogger().exception(null, "Failed to convert to number from: " + hoursS, e, EventUtils.class, true);
}
return dateRaw;
}
}

31
API/src/main/java/com/cloudcraftgaming/discal/api/utils/TimeUtils.java
View File

@@ -52,28 +52,15 @@ public class TimeUtils {
public static boolean inPast(String eventId, GuildSettings settings) {
//TODO: Support multiple calendars
if (EventUtils.eventExists(settings, eventId)) {
if (settings.useExternalCalendar()) {
try {
Calendar service = CalendarAuth.getCalendarService(settings);
CalendarData calendarData = DatabaseManager.getManager().getMainCalendar(settings.getGuildID());
Event e = service.events().get(calendarData.getCalendarId(), eventId).execute();
return inPast(e);
} catch (Exception e) {
Logger.getLogger().exception(null, "Failed to get external calendar auth", e, TimeUtils.class, true);
//Return false and allow RSVP so user is not adversely affected.
return false;
}
} else {
try {
Calendar service = CalendarAuth.getCalendarService();
CalendarData calendarData = DatabaseManager.getManager().getMainCalendar(settings.getGuildID());
Event e = service.events().get(calendarData.getCalendarId(), eventId).execute();
return inPast(e);
} catch (Exception e) {
Logger.getLogger().exception(null, "Failed to get calendar auth", e, TimeUtils.class, true);
//Return false and allow RSVP so user is not adversely affected.
return false;
}
try {
Calendar service = CalendarAuth.getCalendarService(settings);
CalendarData calendarData = DatabaseManager.getManager().getMainCalendar(settings.getGuildID());
Event e = service.events().get(calendarData.getCalendarId(), eventId).execute();
return inPast(e);
} catch (Exception e) {
Logger.getLogger().exception(null, "Failed to get calendar auth", e, TimeUtils.class, true);
//Return false and allow RSVP so user is not adversely affected.
return false;
}
}
return false;

21
Bot/src/main/java/com/cloudcraftgaming/discal/bot/internal/calendar/calendar/CalendarCreator.java
View File

@@ -79,12 +79,7 @@ public class CalendarCreator {
CalendarData data = DatabaseManager.getManager().getMainCalendar(guildId);
try {
com.google.api.services.calendar.Calendar service;
if (settings.useExternalCalendar()) {
service = CalendarAuth.getCalendarService(settings);
} else {
service = CalendarAuth.getCalendarService();
}
com.google.api.services.calendar.Calendar service = CalendarAuth.getCalendarService(settings);
Calendar calendar = service.calendars().get(data.getCalendarAddress()).execute();
@@ -151,12 +146,7 @@ public class CalendarCreator {
calendar.setDescription(preCalendar.getDescription());
calendar.setTimeZone(preCalendar.getTimezone());
try {
com.google.api.services.calendar.Calendar service;
if (settings.useExternalCalendar()) {
service = CalendarAuth.getCalendarService(settings);
} else {
service = CalendarAuth.getCalendarService();
}
com.google.api.services.calendar.Calendar service = CalendarAuth.getCalendarService(settings);
Calendar confirmed = service.calendars().insert(calendar).execute();
AclRule rule = new AclRule();
@@ -188,12 +178,7 @@ public class CalendarCreator {
calendar.setTimeZone(preCalendar.getTimezone());
try {
com.google.api.services.calendar.Calendar service;
if (settings.useExternalCalendar()) {
service = CalendarAuth.getCalendarService(settings);
} else {
service = CalendarAuth.getCalendarService();
}
com.google.api.services.calendar.Calendar service = CalendarAuth.getCalendarService(settings);
Calendar confirmed = service.calendars().update(preCalendar.getCalendarId(), calendar).execute();
AclRule rule = new AclRule();

44
Bot/src/main/java/com/cloudcraftgaming/discal/bot/internal/calendar/event/EventCreator.java
View File

@@ -59,11 +59,10 @@ public class EventCreator {
if (!hasPreEvent(e.getGuild().getLongID())) {
PreEvent event = new PreEvent(e.getGuild().getLongID());
try {
//TODO: Handle multiple calendars...
String calId = DatabaseManager.getManager().getMainCalendar(e.getGuild().getLongID()).getCalendarAddress();
event.setTimeZone(CalendarAuth.getCalendarService().calendars().get(calId).execute().getTimeZone());
} catch (IOException exc) {
event.setTimeZone(CalendarAuth.getCalendarService(settings).calendars().get(calId).execute().getTimeZone());
} catch (Exception exc) {
//Failed to get timezone, ignore safely.
}
if (handleMessage) {
@@ -90,11 +89,8 @@ public class EventCreator {
//TODO: Handle multiple calendars...
String calId = DatabaseManager.getManager().getMainCalendar(e.getGuild().getLongID()).getCalendarAddress();
if (!settings.useExternalCalendar()) {
event.setTimeZone(CalendarAuth.getCalendarService().calendars().get(calId).execute().getTimeZone());
} else {
event.setTimeZone(CalendarAuth.getCalendarService(settings).calendars().get(calId).execute().getTimeZone());
}
event.setTimeZone(CalendarAuth.getCalendarService(settings).calendars().get(calId).execute().getTimeZone());
} catch (Exception exc) {
//Failed to get timezone, ignore safely.
}
@@ -120,12 +116,8 @@ public class EventCreator {
//TODO: Handle multiple calendars...
try {
String calId = DatabaseManager.getManager().getMainCalendar(e.getGuild().getLongID()).getCalendarAddress();
Calendar service;
if (settings.useExternalCalendar()) {
service = CalendarAuth.getCalendarService(settings);
} else {
service = CalendarAuth.getCalendarService();
}
Calendar service = CalendarAuth.getCalendarService(settings);
Event calEvent = service.events().get(calId, eventId).execute();
PreEvent event = EventUtils.copyEvent(e.getGuild().getLongID(), calEvent);
@@ -162,12 +154,8 @@ public class EventCreator {
//TODO: Handle multiple calendars...
try {
String calId = DatabaseManager.getManager().getMainCalendar(guildId).getCalendarAddress();
Calendar service;
if (settings.useExternalCalendar()) {
service = CalendarAuth.getCalendarService(settings);
} else {
service = CalendarAuth.getCalendarService();
}
Calendar service = CalendarAuth.getCalendarService(settings);
Event calEvent = service.events().get(calId, eventId).execute();
PreEvent event = new PreEvent(guildId, calEvent);
@@ -258,12 +246,8 @@ public class EventCreator {
if (!preEvent.isEditing()) {
event.setId(KeyGenerator.generateEventId());
try {
Event confirmed;
if (settings.useExternalCalendar()) {
confirmed = CalendarAuth.getCalendarService(settings).events().insert(calendarId, event).execute();
} else {
confirmed = CalendarAuth.getCalendarService().events().insert(calendarId, event).execute();
}
Event confirmed = CalendarAuth.getCalendarService(settings).events().insert(calendarId, event).execute();
if (preEvent.getEventData().shouldBeSaved()) {
preEvent.getEventData().setEventId(confirmed.getId());
preEvent.getEventData().setEventEnd(confirmed.getEnd().getDateTime().getValue());
@@ -281,12 +265,8 @@ public class EventCreator {
}
} else {
try {
Event confirmed;
if (settings.useExternalCalendar()) {
confirmed = CalendarAuth.getCalendarService(settings).events().update(calendarId, preEvent.getEventId(), event).execute();
} else {
confirmed = CalendarAuth.getCalendarService().events().update(calendarId, preEvent.getEventId(), event).execute();
}
Event confirmed = CalendarAuth.getCalendarService(settings).events().update(calendarId, preEvent.getEventId(), event).execute();
if (preEvent.getEventData().shouldBeSaved()) {
preEvent.getEventData().setEventId(confirmed.getId());
preEvent.getEventData().setEventEnd(confirmed.getEnd().getDateTime().getValue());

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

@@ -73,8 +73,7 @@ public class EventMessageFormatter {
try {
//TODO: add support for multiple calendars...
CalendarData data = DatabaseManager.getManager().getMainCalendar(settings.getGuildID());
Calendar service;
service = settings.useExternalCalendar() ? CalendarAuth.getCalendarService(settings) : CalendarAuth.getCalendarService();
Calendar service = CalendarAuth.getCalendarService(settings);
String tz = service.calendars().get(data.getCalendarAddress()).execute().getTimeZone();
em.appendField(MessageManager.getMessage("Embed.Event.Info.TimeZone", settings), tz, true);
} catch (Exception e1) {
@@ -272,11 +271,7 @@ public class EventMessageFormatter {
String timezone;
if (!preEvent) {
if (settings.useExternalCalendar()) {
timezone = CalendarAuth.getCalendarService(settings).calendars().get(data.getCalendarAddress()).execute().getTimeZone();
} else {
timezone = CalendarAuth.getCalendarService().calendars().get(data.getCalendarAddress()).execute().getTimeZone();
}
timezone = CalendarAuth.getCalendarService(settings).calendars().get(data.getCalendarAddress()).execute().getTimeZone();
} else {
timezone = "America/Chicago";
}
@@ -317,11 +312,7 @@ public class EventMessageFormatter {
String timezone;
if (!preEvent) {
if (settings.useExternalCalendar()) {
timezone = CalendarAuth.getCalendarService(settings).calendars().get(data.getCalendarAddress()).execute().getTimeZone();
} else {
timezone = CalendarAuth.getCalendarService().calendars().get(data.getCalendarAddress()).execute().getTimeZone();
}
timezone = CalendarAuth.getCalendarService(settings).calendars().get(data.getCalendarAddress()).execute().getTimeZone();
} else {
timezone = "America/Chicago";
}
@@ -356,11 +347,7 @@ public class EventMessageFormatter {
String timezone;
if (!preEvent) {
if (settings.useExternalCalendar()) {
timezone = CalendarAuth.getCalendarService(settings).calendars().get(data.getCalendarAddress()).execute().getTimeZone();
} else {
timezone = CalendarAuth.getCalendarService().calendars().get(data.getCalendarAddress()).execute().getTimeZone();
}
timezone = CalendarAuth.getCalendarService(settings).calendars().get(data.getCalendarAddress()).execute().getTimeZone();
} else {
timezone = "America/Chicago";
}

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

@@ -95,13 +95,10 @@ public class AnnouncementMessageFormatter {
if (a.getAnnouncementType().equals(AnnouncementType.SPECIFIC)) {
em.appendField(MessageManager.getMessage("Embed.Announcement.Condensed.EventID", settings), a.getEventId(), false);
try {
Calendar service;
if (settings.useExternalCalendar()) {
service = CalendarAuth.getCalendarService(settings);
} else {
service = CalendarAuth.getCalendarService();
}
Calendar service = CalendarAuth.getCalendarService(settings);
//TODO: Handle multiple calendars...
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());
@@ -205,7 +202,7 @@ public class AnnouncementMessageFormatter {
em.appendField(MessageManager.getMessage("Embed.Announcement.Announce.Date", settings), EventMessageFormatter.getHumanReadableDate(event.getStart(), settings, false), true);
em.appendField(MessageManager.getMessage("Embed.Announcement.Announce.Time", settings), EventMessageFormatter.getHumanReadableTime(event.getStart(), settings, false), true);
try {
Calendar service = CalendarAuth.getCalendarService();
Calendar service = CalendarAuth.getCalendarService(settings);
String tz = service.calendars().get(data.getCalendarAddress()).execute().getTimeZone();
em.appendField(MessageManager.getMessage("Embed.Announcement.Announce.TimeZone", settings), tz, true);
} catch (Exception e1) {
@@ -214,7 +211,7 @@ public class AnnouncementMessageFormatter {
} else {
String start = EventMessageFormatter.getHumanReadableDate(event.getStart(), settings, false) + " at " + EventMessageFormatter.getHumanReadableTime(event.getStart(), settings, false);
try {
Calendar service = CalendarAuth.getCalendarService();
Calendar service = CalendarAuth.getCalendarService(settings);
String tz = service.calendars().get(data.getCalendarAddress()).execute().getTimeZone();
start = start + " " + tz;
} catch (Exception e1) {
@@ -288,7 +285,7 @@ public class AnnouncementMessageFormatter {
em.appendField(MessageManager.getMessage("Embed.Announcement.Announce.Date", settings), EventMessageFormatter.getHumanReadableDate(event.getStart(), settings, false), true);
em.appendField(MessageManager.getMessage("Embed.Announcement.Announce.Time", settings), EventMessageFormatter.getHumanReadableTime(event.getStart(), settings, false), true);
try {
Calendar service = CalendarAuth.getCalendarService();
Calendar service = CalendarAuth.getCalendarService(settings);
String tz = service.calendars().get(data.getCalendarAddress()).execute().getTimeZone();
em.appendField(MessageManager.getMessage("Embed.Announcement.Announce.TimeZone", settings), tz, true);
} catch (Exception e1) {
@@ -297,7 +294,7 @@ public class AnnouncementMessageFormatter {
} else {
String start = EventMessageFormatter.getHumanReadableDate(event.getStart(), settings, false) + " at " + EventMessageFormatter.getHumanReadableTime(event.getStart(), settings, false);
try {
Calendar service = CalendarAuth.getCalendarService();
Calendar service = CalendarAuth.getCalendarService(settings);
String tz = service.calendars().get(data.getCalendarAddress()).execute().getTimeZone();
start = start + " " + tz;
} catch (Exception e1) {

2
Bot/src/main/java/com/cloudcraftgaming/discal/bot/module/announcement/AnnouncementTask.java
View File

@@ -41,7 +41,7 @@ public class AnnouncementTask extends TimerTask {
try {
//Get the default stuff.
try {
discalService = CalendarAuth.getCalendarService();
discalService = CalendarAuth.getCalendarService(null);
} catch (IOException e) {
Logger.getLogger().exception(null, "Failed to get service! 00a0101", e, this.getClass(), true);
}

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

@@ -425,12 +425,8 @@ public class EventCommand implements ICommand {
if (!EventCreator.getCreator().hasPreEvent(guildId)) {
if (!calendarData.getCalendarAddress().equalsIgnoreCase("primary")) {
try {
Calendar service;
if (settings.useExternalCalendar()) {
service = CalendarAuth.getCalendarService(settings);
} else {
service = CalendarAuth.getCalendarService();
}
Calendar service = CalendarAuth.getCalendarService(settings);
Event calEvent = service.events().get(calendarData.getCalendarAddress(), args[1]).execute();
Message.sendMessage(EventMessageFormatter.getEventEmbed(calEvent, settings), event);
} catch (Exception e) {

23
Bot/src/main/java/com/cloudcraftgaming/discal/bot/module/command/EventListCommand.java
View File

@@ -100,12 +100,7 @@ public class EventListCommand implements ICommand {
private void moduleSimpleList(String[] args, MessageReceivedEvent event, GuildSettings settings) {
if (args.length == 0) {
try {
Calendar service;
if (settings.useExternalCalendar()) {
service = CalendarAuth.getCalendarService(settings);
} else {
service = CalendarAuth.getCalendarService();
}
Calendar service = CalendarAuth.getCalendarService(settings);
DateTime now = new DateTime(System.currentTimeMillis());
CalendarData calendarData = DatabaseManager.getManager().getMainCalendar(event.getGuild().getLongID());
@@ -139,12 +134,8 @@ public class EventListCommand implements ICommand {
return;
}
try {
Calendar service;
if (settings.useExternalCalendar()) {
service = CalendarAuth.getCalendarService(settings);
} else {
service = CalendarAuth.getCalendarService();
}
Calendar service = CalendarAuth.getCalendarService(settings);
DateTime now = new DateTime(System.currentTimeMillis());
CalendarData calendarData = DatabaseManager.getManager().getMainCalendar(event.getGuild().getLongID());
Events events = service.events().list(calendarData.getCalendarAddress())
@@ -187,12 +178,8 @@ public class EventListCommand implements ICommand {
if (args.length == 1) {
//Get the upcoming events in the next 24 hours.
try {
Calendar service;
if (settings.useExternalCalendar()) {
service = CalendarAuth.getCalendarService(settings);
} else {
service = CalendarAuth.getCalendarService();
}
Calendar service = CalendarAuth.getCalendarService(settings);
DateTime now = new DateTime(System.currentTimeMillis());
DateTime twentyFourHoursFromNow = new DateTime(now.getValue() + 86400000L);
CalendarData calendarData = DatabaseManager.getManager().getMainCalendar(event.getGuild().getLongID());

7
Bot/src/main/java/com/cloudcraftgaming/discal/bot/module/command/LinkCalendarCommand.java
View File

@@ -75,12 +75,7 @@ public class LinkCalendarCommand implements ICommand {
//Does not have a calendar.
Message.sendMessage(MessageManager.getMessage("Creator.Calendar.NoCalendar", settings), event);
} else {
Calendar cal;
if (settings.useExternalCalendar()) {
cal = CalendarAuth.getCalendarService(settings).calendars().get(data.getCalendarAddress()).execute();
} else {
cal = CalendarAuth.getCalendarService().calendars().get(data.getCalendarAddress()).execute();
}
Calendar cal = CalendarAuth.getCalendarService(settings).calendars().get(data.getCalendarAddress()).execute();
Message.sendMessage(CalendarMessageFormatter.getCalendarLinkEmbed(cal, settings), event);
}

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

@@ -84,12 +84,8 @@ public class TimeCommand implements ICommand {
//Does not have a calendar.
Message.sendMessage(MessageManager.getMessage("Creator.Calendar.NoCalendar", settings), event);
} else {
Calendar cal;
if (settings.useExternalCalendar()) {
cal = CalendarAuth.getCalendarService(settings).calendars().get(data.getCalendarAddress()).execute();
} else {
cal = CalendarAuth.getCalendarService().calendars().get(data.getCalendarAddress()).execute();
}
Calendar cal = CalendarAuth.getCalendarService(settings).calendars().get(data.getCalendarAddress()).execute();
LocalDateTime ldt = LocalDateTime.now(ZoneId.of(cal.getTimeZone()));
//Okay... format and then we can go from there...

32
Website/src/main/java/com/cloudcraftgaming/discal/web/endpoints/v1/EventEndpoint.java
View File

@@ -51,12 +51,8 @@ public class EventEndpoint {
//okay, lets actually get the month's events.
try {
Calendar service;
if (settings.useExternalCalendar()) {
service = CalendarAuth.getCalendarService(settings);
} else {
service = CalendarAuth.getCalendarService();
}
Calendar service = CalendarAuth.getCalendarService(settings);
CalendarData calendarData = DatabaseManager.getManager().getMainCalendar(settings.getGuildID());
Events events = service.events().list(calendarData.getCalendarAddress())
.setTimeMin(new DateTime(startEpoch))
@@ -108,12 +104,8 @@ public class EventEndpoint {
//okay, lets actually get the month's events.
try {
Calendar service;
if (settings.useExternalCalendar()) {
service = CalendarAuth.getCalendarService(settings);
} else {
service = CalendarAuth.getCalendarService();
}
Calendar service = CalendarAuth.getCalendarService(settings);
CalendarData calendarData = DatabaseManager.getManager().getMainCalendar(settings.getGuildID());
Events events = service.events().list(calendarData.getCalendarAddress())
.setTimeMin(new DateTime(startEpoch))
@@ -205,12 +197,8 @@ public class EventEndpoint {
//Okay, time to update the event
try {
Calendar service;
if (settings.useExternalCalendar()) {
service = CalendarAuth.getCalendarService(settings);
} else {
service = CalendarAuth.getCalendarService();
}
Calendar service = CalendarAuth.getCalendarService(settings);
CalendarData calendarData = DatabaseManager.getManager().getMainCalendar(settings.getGuildID());
com.google.api.services.calendar.model.Calendar cal = service.calendars().get(calendarData.getCalendarId()).execute();
@@ -305,12 +293,8 @@ public class EventEndpoint {
//Okay, time to create the event
try {
Calendar service;
if (settings.useExternalCalendar()) {
service = CalendarAuth.getCalendarService(settings);
} else {
service = CalendarAuth.getCalendarService();
}
Calendar service = CalendarAuth.getCalendarService(settings);
CalendarData calendarData = DatabaseManager.getManager().getMainCalendar(settings.getGuildID());
com.google.api.services.calendar.model.Calendar cal = service.calendars().get(calendarData.getCalendarId()).execute();

43
Website/src/main/java/com/cloudcraftgaming/discal/web/handler/DashboardHandler.java
View File

@@ -258,15 +258,9 @@ public class DashboardHandler {
if (g.isDiscalRole()) {
try {
if (g.getCalendar().isExternal()) {
Calendar cal = CalendarAuth.getCalendarService(g.getSettings()).calendars().get(g.getCalendar().getId()).execute();
cal.setSummary(request.queryParams("cal-name"));
CalendarAuth.getCalendarService(g.getSettings()).calendars().update(g.getCalendar().getId(), cal).execute();
} else {
Calendar cal = CalendarAuth.getCalendarService().calendars().get(g.getCalendar().getId()).execute();
cal.setSummary(request.queryParams("cal-name"));
CalendarAuth.getCalendarService().calendars().update(g.getCalendar().getId(), cal).execute();
}
Calendar cal = CalendarAuth.getCalendarService(g.getSettings()).calendars().get(g.getCalendar().getId()).execute();
cal.setSummary(request.queryParams("cal-name"));
CalendarAuth.getCalendarService(g.getSettings()).calendars().update(g.getCalendar().getId(), cal).execute();
g.getCalendar().setName(request.queryParams("cal-name"));
} catch (Exception e) {
@@ -280,15 +274,9 @@ public class DashboardHandler {
if (g.isDiscalRole()) {
try {
if (g.getCalendar().isExternal()) {
Calendar cal = CalendarAuth.getCalendarService(g.getSettings()).calendars().get(g.getCalendar().getId()).execute();
cal.setDescription(request.queryParams("cal-desc"));
CalendarAuth.getCalendarService(g.getSettings()).calendars().update(g.getCalendar().getId(), cal).execute();
} else {
Calendar cal = CalendarAuth.getCalendarService().calendars().get(g.getCalendar().getId()).execute();
cal.setDescription(request.queryParams("cal-desc"));
CalendarAuth.getCalendarService().calendars().update(g.getCalendar().getId(), cal).execute();
}
Calendar cal = CalendarAuth.getCalendarService(g.getSettings()).calendars().get(g.getCalendar().getId()).execute();
cal.setDescription(request.queryParams("cal-desc"));
CalendarAuth.getCalendarService(g.getSettings()).calendars().update(g.getCalendar().getId(), cal).execute();
g.getCalendar().setDescription(request.queryParams("cal-desc"));
} catch (Exception e) {
@@ -302,15 +290,9 @@ public class DashboardHandler {
if (g.isDiscalRole()) {
try {
if (g.getCalendar().isExternal()) {
Calendar cal = CalendarAuth.getCalendarService(g.getSettings()).calendars().get(g.getCalendar().getId()).execute();
cal.setTimeZone(request.queryParams("cal-tz").replace("___", "/"));
CalendarAuth.getCalendarService(g.getSettings()).calendars().update(g.getCalendar().getId(), cal).execute();
} else {
Calendar cal = CalendarAuth.getCalendarService().calendars().get(g.getCalendar().getId()).execute();
cal.setTimeZone(request.queryParams("cal-tz").replace("___", "/"));
CalendarAuth.getCalendarService().calendars().update(g.getCalendar().getId(), cal).execute();
}
Calendar cal = CalendarAuth.getCalendarService(g.getSettings()).calendars().get(g.getCalendar().getId()).execute();
cal.setTimeZone(request.queryParams("cal-tz").replace("___", "/"));
CalendarAuth.getCalendarService(g.getSettings()).calendars().update(g.getCalendar().getId(), cal).execute();
g.getCalendar().setTimezone(request.queryParams("cal-tz"));
} catch (Exception e) {
@@ -343,12 +325,7 @@ public class DashboardHandler {
calendar.setDescription(desc);
calendar.setTimeZone(tz.replace("___", "/"));
try {
com.google.api.services.calendar.Calendar service;
if (g.getSettings().useExternalCalendar()) {
service = CalendarAuth.getCalendarService(g.getSettings());
} else {
service = CalendarAuth.getCalendarService();
}
com.google.api.services.calendar.Calendar service = CalendarAuth.getCalendarService(g.getSettings());
Calendar confirmed = service.calendars().insert(calendar).execute();
AclRule rule = new AclRule();