taigrr/wtf
1
0
Fork 0
mirror of https://github.com/taigrr/wtf synced 2025-01-18 04:03:14 -08:00
Code Issues Projects Releases Wiki Activity

Use 'timezone' instead of 'timeZone' for the gCal setting name. More colloquial

Browse Source
This commit is contained in:
Chris Cummer 2019-07-05 21:39:38 -07:00
parent a6a75ee691
commit 2a944b3f0a
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/gcal/client.go
View File

@ -56,7 +56,7 @@ func (widget *Widget) Fetch() ([]*CalEvent, error) {
startTime := fromMidnight().Format(time.RFC3339) startTime := fromMidnight().Format(time.RFC3339)
eventLimit := int64(widget.settings.eventCount) eventLimit := int64(widget.settings.eventCount)
timezone := widget.settings.timeZone timezone := widget.settings.timezone
for _, calendarId := range calendarIds { for _, calendarId := range calendarIds {
calendarEvents, err := srv.Events.List(calendarId).TimeZone(timezone).ShowDeleted(false).TimeMin(startTime).MaxResults(eventLimit).SingleEvents(true).OrderBy("startTime").Do() calendarEvents, err := srv.Events.List(calendarId).TimeZone(timezone).ShowDeleted(false).TimeMin(startTime).MaxResults(eventLimit).SingleEvents(true).OrderBy("startTime").Do()

36
modules/gcal/settings.go
View File

@ -9,27 +9,27 @@ const defaultTitle = "Calendar"
type colors struct { type colors struct {
day string day string
description string `help:"The default color for calendar event descriptions." values:"Any X11 color name." optional:true` description string `help:"The default color for calendar event descriptions." values:"Any X11 color name." optional:"true"`
past string `help:"The color for calendar events that have passed." values:"Any X11 color name." optional:true` past string `help:"The color for calendar events that have passed." values:"Any X11 color name." optional:"true"`
title string `help:"The default colour for calendar event titles." values:"Any X11 color name." optional:true` title string `help:"The default colour for calendar event titles." values:"Any X11 color name." optional:"true"`
highlights []interface{} `help:"A list of arrays that define a regular expression pattern and a color. If a calendar event title matches a regular expression, the title will be drawn in that colour. Over-rides the default title colour." values:"An array of a valid regular expression, any X11 color name." optional:true` highlights []interface{} `help:"A list of arrays that define a regular expression pattern and a color. If a calendar event title matches a regular expression, the title will be drawn in that colour. Over-rides the default title colour." values:"An array of a valid regular expression, any X11 color name." optional:"true"`
} }
type Settings struct { type Settings struct {
colors colors
common *cfg.Common common *cfg.Common
conflictIcon string `help:"The icon displayed beside calendar events that have conflicting times (they intersect or overlap in some way)." values:"Any displayable unicode character." optional:true` conflictIcon string `help:"The icon displayed beside calendar events that have conflicting times (they intersect or overlap in some way)." values:"Any displayable unicode character." optional:"true"`
currentIcon string `help:"The icon displayed beside the current calendar event." values:"Any displayable unicode character." optional:true` currentIcon string `help:"The icon displayed beside the current calendar event." values:"Any displayable unicode character." optional:"true"`
displayResponseStatus bool `help:"Whether or not to display your response status to the calendar event." values:"true or false" optional:true` displayResponseStatus bool `help:"Whether or not to display your response status to the calendar event." values:"true or false" optional:"true"`
email string `help:"The email address associated with your Google account. Necessary for determining 'responseStatus'." values:"A valid email address string."` email string `help:"The email address associated with your Google account. Necessary for determining 'responseStatus'." values:"A valid email address string."`
eventCount int `help:"The number of calendar events to display." values:"A positive integer, 0..n." optional:true` eventCount int `help:"The number of calendar events to display." values:"A positive integer, 0..n." optional:"true"`
multiCalendar bool `help:"Whether or not to display your primary calendar or all calendars you have access to." values:"true or false" optional:true` multiCalendar bool `help:"Whether or not to display your primary calendar or all calendars you have access to." values:"true or false" optional:"true"`
secretFile string `help:"Your Google client secret JSON file." values:"A string representing a file path to the JSON secret file."` secretFile string `help:"Your Google client secret JSON file." values:"A string representing a file path to the JSON secret file."`
showDeclined bool `help:"Whether or not to display events you’ve declined to attend." values:"true or false" optional:true` showDeclined bool `help:"Whether or not to display events you’ve declined to attend." values:"true or false" optional:"true"`
withLocation bool `help:"Whether or not to show the location of the appointment." values:"true or false"` withLocation bool `help:"Whether or not to show the location of the appointment." values:"true or false"`
timeZone string `help:"Time zone used in the calendar." values:"A valid time zone string"` timezone string `help:"The time zone used to display calendar event times." values:"A valid TZ database time zone string" optional:"true"`
} }
func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings { func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *config.Config) *Settings {
@ -40,13 +40,13 @@ func NewSettingsFromYAML(name string, ymlConfig *config.Config, globalConfig *co
conflictIcon: ymlConfig.UString("conflictIcon", "🚨"), conflictIcon: ymlConfig.UString("conflictIcon", "🚨"),
currentIcon: ymlConfig.UString("currentIcon", "🔸"), currentIcon: ymlConfig.UString("currentIcon", "🔸"),
displayResponseStatus: ymlConfig.UBool("displayResponseStatus", true), displayResponseStatus: ymlConfig.UBool("displayResponseStatus", true),
email: ymlConfig.UString("email", ""), email: ymlConfig.UString("email", ""),
eventCount: ymlConfig.UInt("eventCount", 10), eventCount: ymlConfig.UInt("eventCount", 10),
multiCalendar: ymlConfig.UBool("multiCalendar", false), multiCalendar: ymlConfig.UBool("multiCalendar", false),
secretFile: ymlConfig.UString("secretFile", ""), secretFile: ymlConfig.UString("secretFile", ""),
showDeclined: ymlConfig.UBool("showDeclined", false), showDeclined: ymlConfig.UBool("showDeclined", false),
withLocation: ymlConfig.UBool("withLocation", true), withLocation: ymlConfig.UBool("withLocation", true),
timeZone: ymlConfig.UString("timeZone", ""), timezone: ymlConfig.UString("timezone", ""),
} }
settings.colors.day = ymlConfig.UString("colors.day", "forestgreen") settings.colors.day = ymlConfig.UString("colors.day", "forestgreen")