mirror of
https://github.com/Xevion/banner.git
synced 2025-12-10 22:06:34 -06:00
Add local ICal timestamp format, rename centralTime global var
This commit is contained in:
27
main.go
27
main.go
@@ -20,20 +20,21 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
ctx context.Context
|
ctx context.Context
|
||||||
kv *redis.Client
|
kv *redis.Client
|
||||||
session *discordgo.Session
|
session *discordgo.Session
|
||||||
client http.Client
|
client http.Client
|
||||||
cookies http.CookieJar
|
cookies http.CookieJar
|
||||||
isDevelopment bool
|
isDevelopment bool
|
||||||
baseURL string // Base URL for all requests to the banner system
|
baseURL string // Base URL for all requests to the banner system
|
||||||
environment string
|
environment string
|
||||||
centralTime *time.Location
|
CentralTimeLocation *time.Location
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
ICalTimestampFormatUtc = "20060102T150405Z"
|
ICalTimestampFormatUtc = "20060102T150405Z"
|
||||||
CentralTimezone = "America/Chicago"
|
ICalTimestampFormatLocal = "20060102T150405"
|
||||||
|
CentralTimezoneName = "America/Chicago"
|
||||||
)
|
)
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
@@ -45,14 +46,14 @@ func init() {
|
|||||||
ctx = context.Background()
|
ctx = context.Background()
|
||||||
|
|
||||||
var err error
|
var err error
|
||||||
centralTime, err = time.LoadLocation(CentralTimezone)
|
CentralTimeLocation, err = time.LoadLocation(CentralTimezoneName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set zerolog's timestamp function to use the central timezone
|
// Set zerolog's timestamp function to use the central timezone
|
||||||
zerolog.TimestampFunc = func() time.Time {
|
zerolog.TimestampFunc = func() time.Time {
|
||||||
return time.Now().In(centralTime)
|
return time.Now().In(CentralTimeLocation)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Try to grab the environment variable, or default to development
|
// Try to grab the environment variable, or default to development
|
||||||
|
|||||||
12
term.go
12
term.go
@@ -46,12 +46,12 @@ type YearDayRange struct {
|
|||||||
// Summer: May 25th - August 15th
|
// Summer: May 25th - August 15th
|
||||||
// Fall: August 18th - December 10th
|
// Fall: August 18th - December 10th
|
||||||
func GetYearDayRange(year uint16) (YearDayRange, YearDayRange, YearDayRange) {
|
func GetYearDayRange(year uint16) (YearDayRange, YearDayRange, YearDayRange) {
|
||||||
springStart := time.Date(int(year), time.January, 14, 0, 0, 0, 0, centralTime).YearDay()
|
springStart := time.Date(int(year), time.January, 14, 0, 0, 0, 0, CentralTimeLocation).YearDay()
|
||||||
springEnd := time.Date(int(year), time.May, 1, 0, 0, 0, 0, centralTime).YearDay()
|
springEnd := time.Date(int(year), time.May, 1, 0, 0, 0, 0, CentralTimeLocation).YearDay()
|
||||||
summerStart := time.Date(int(year), time.May, 25, 0, 0, 0, 0, centralTime).YearDay()
|
summerStart := time.Date(int(year), time.May, 25, 0, 0, 0, 0, CentralTimeLocation).YearDay()
|
||||||
summerEnd := time.Date(int(year), time.August, 15, 0, 0, 0, 0, centralTime).YearDay()
|
summerEnd := time.Date(int(year), time.August, 15, 0, 0, 0, 0, CentralTimeLocation).YearDay()
|
||||||
fallStart := time.Date(int(year), time.August, 18, 0, 0, 0, 0, centralTime).YearDay()
|
fallStart := time.Date(int(year), time.August, 18, 0, 0, 0, 0, CentralTimeLocation).YearDay()
|
||||||
fallEnd := time.Date(int(year), time.December, 10, 0, 0, 0, 0, centralTime).YearDay()
|
fallEnd := time.Date(int(year), time.December, 10, 0, 0, 0, 0, CentralTimeLocation).YearDay()
|
||||||
|
|
||||||
return YearDayRange{
|
return YearDayRange{
|
||||||
Start: uint16(springStart),
|
Start: uint16(springStart),
|
||||||
|
|||||||
Reference in New Issue
Block a user