From b997e8e971cd5a887e6283e9c8c08d6a6325fb40 Mon Sep 17 00:00:00 2001 From: Chris Helming Date: Mon, 4 Nov 2024 21:26:17 -0500 Subject: [PATCH] Updating Dockerfile since there's no go.sum --- Dockerfile | 2 +- go.mod | 4 ++-- main.go | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6029515..3b73049 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM golang:alpine AS builder RUN apk update && apk add --no-cache ca-certificates && update-ca-certificates WORKDIR /app -COPY go.mod go.sum ./ +COPY go.mod ./ RUN go mod download COPY . . RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o owa-away . diff --git a/go.mod b/go.mod index a9e6d67..62d9cf1 100644 --- a/go.mod +++ b/go.mod @@ -1,3 +1,3 @@ -module chelming/owa-away +module github.com/chelming/owa-away -go 1.18 +go 1.23.2 diff --git a/main.go b/main.go index 3a3362f..b6f821b 100644 --- a/main.go +++ b/main.go @@ -34,9 +34,10 @@ func processCalendar(bodyString string) string { bodyString = strings.Replace(bodyString, "\r\n", "%%", -1) // join to make regex easier matches := re.FindAllStringSubmatch(bodyString, -1) for _, match := range matches { + fullMatch := match[0] for _, keyword := range keywords { - if strings.Contains(match, keyword) { - bodyString = strings.Replace(bodyString, match, "", -1) + if strings.Contains(fullMatch, keyword) { + bodyString = strings.Replace(bodyString, fullMatch, "", -1) break } }