[GCAL] today/tomorrow commands with styling

server/command/command.go

@@ -38,6 +38,8 @@ var cmds = []*model.AutocompleteData{
 	model.NewAutocompleteData("disconnect", "", fmt.Sprintf("Disconnect from your %s account", config.Provider.DisplayName)),
 	model.NewAutocompleteData("summary", "", "View your events for today, or edit the settings for your daily summary."),
 	model.NewAutocompleteData("viewcal", "", "View your events for the upcoming week."),
+	model.NewAutocompleteData("today", "", "Display today's events."),
+	model.NewAutocompleteData("tomorrow", "", "Display tomorrow's events."),
 	model.NewAutocompleteData("settings", "", "Edit your user personal settings."),
 	model.NewAutocompleteData("subscribe", "", "Enable notifications for event invitations and updates."),
 	model.NewAutocompleteData("unsubscribe", "", "Disable notifications for event invitations and updates."),

server/command/daily_summary.go

@@ -29,11 +29,11 @@ func (c *Command) dailySummary(parameters ...string) (string, bool, error) {
 		}
 		return postStr, false, nil
 	case "tomorrow":
-		_, err := c.MSCalendar.GetDaySummaryForUser(time.Now().Add(time.Hour*24), c.user())
+		postStr, err := c.MSCalendar.GetDaySummaryForUser(time.Now().Add((time.Hour*24)*4), c.user())
 		if err != nil {
 			return err.Error(), false, err
 		}
-		return "", false, nil
+		return postStr, false, nil
 	case "time":
 		if len(parameters) != 2 {
 			return dailySummarySetTimeErrorMessage, false, nil

server/mscalendar/daily_summary.go

@@ -185,16 +185,12 @@ func (m *mscalendar) GetDaySummaryForUser(day time.Time, user *User) (string, er
 		return "Failed to get calendar events", err
 	}
 
-	message, attachments, err := views.RenderDaySummary(calendarData, tz)
+	messageString, err := views.RenderCalendarView(calendarData, tz)
 	if err != nil {
 		return "", errors.Wrap(err, "failed to render daily summary")
 	}
 
-	if _, err := m.Poster.DMWithMessageAndAttachments(user.MattermostUserID, message, attachments...); err != nil {
-		return "", errors.Wrap(err, "failed to send message to user")
-	}
-
-	return "", nil
+	return messageString, nil
 }
 
 func shouldPostDailySummary(dsum *store.DailySummaryUserSettings, now time.Time) (bool, error) {

server/mscalendar/views/calendar.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"net/url"
 	"sort"
+	"strings"
 	"time"
 
 	"github.com/mattermost/mattermost-server/v6/model"
@@ -83,8 +84,8 @@ func RenderDaySummary(events []*remote.Event, timezone string) (string, []*model
 }
 
 func renderTableHeader() string {
-	return `| Time | Subject |
-| :--: | :-- |`
+	return `| Time | Subject | |
+	| :-- | :-- | :--`
 }
 
 func renderEvent(event *remote.Event, asRow bool, timeZone string) (string, error) {
@@ -93,17 +94,26 @@ func renderEvent(event *remote.Event, asRow bool, timeZone string) (string, erro
 
 	format := "(%s - %s) [%s](%s)"
 	if asRow {
-		format = "| %s - %s | [%s](%s) |"
+		format = "| %s - %s | [%s](%s) | %s |"
 	}
 
 	link, err := url.QueryUnescape(event.Weblink)
 	if err != nil {
 		return "", err
 	}
 
+	var other string
+	if event.Location != nil && isKnownMeetingURL(event.Location.DisplayName) {
+		other = "[Join meeting](" + event.Location.DisplayName + ")"
+	}
+
 	subject := EnsureSubject(event.Subject)
 
-	return fmt.Sprintf(format, start, end, subject, link), nil
+	return fmt.Sprintf(format, start, end, subject, link, other), nil
+}
+
+func isKnownMeetingURL(location string) bool {
+	return strings.Contains(location, "zoom.us/j/") || strings.Contains(location, "discord.gg") || strings.Contains(location, "meet.google.com")
 }
 
 func groupEventsByDate(events []*remote.Event) [][]*remote.Event {

server/remote/gcal/get_default_calendar_view.go

@@ -54,23 +54,23 @@ func (c *client) GetDefaultCalendarView(_ string, start, end time.Time) ([]*remo
 	req.SingleEvents(true)
 	req.OrderBy("startTime")
 
-	events, err := req.Do()
+	result, err := req.Do()
 	if err != nil {
 		return nil, errors.Wrap(err, "gcal GetDefaultCalendarView, error performing request")
 	}
 
-	result := []*remote.Event{}
-	if len(events.Items) == 0 {
-		return result, nil
+	if len(result.Items) == 0 {
+		return []*remote.Event{}, nil
 	}
 
-	for _, event := range events.Items {
+	events := []*remote.Event{}
+	for _, event := range result.Items {
 		if event.ICalUID != "" {
-			result = append(result, convertGCalEventToRemoteEvent(event))
+			events = append(events, convertGCalEventToRemoteEvent(event))
 		}
 	}
 
-	return result, nil
+	return events, nil
 }
 
 func convertGCalEventDateTimeToRemoteDateTime(dt *calendar.EventDateTime) *remote.DateTime {