diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..65e0a76 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,6 @@ +.git +.github +.gitea +.env +.idea +prepbot diff --git a/.gitea/workflows/build-and-push.yml b/.gitea/workflows/build-and-push.yml new file mode 100644 index 0000000..46c9939 --- /dev/null +++ b/.gitea/workflows/build-and-push.yml @@ -0,0 +1,64 @@ +name: Build and Push Container + +on: + push: + branches: + - master + - main + tags: + - v* + workflow_dispatch: + +env: + REGISTRY: gitea.wayfinderak.com + IMAGE_NAME: wayfinderak/prepbot + +jobs: + docker: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Log in to Gitea registry + uses: docker/login-action@v3 + with: + registry: ${{ env.REGISTRY }} + username: ${{ secrets.REGISTRY_USERNAME }} + password: ${{ secrets.REGISTRY_PASSWORD }} + + - name: Prepare image tags + id: prep + shell: bash + run: | + short_sha="${GITHUB_SHA::7}" + tags="${REGISTRY}/${IMAGE_NAME}:sha-${short_sha}" + + if [[ "${GITHUB_REF_TYPE}" == "branch" && ("${GITHUB_REF_NAME}" == "master" || "${GITHUB_REF_NAME}" == "main") ]]; then + tags+=$'\n'"${REGISTRY}/${IMAGE_NAME}:latest" + fi + + if [[ "${GITHUB_REF_TYPE}" == "tag" ]]; then + version="${GITHUB_REF_NAME#v}" + tags+=$'\n'"${REGISTRY}/${IMAGE_NAME}:${version}" + fi + + { + echo 'tags<> "$GITHUB_OUTPUT" + + - name: Build and push image + uses: docker/build-push-action@v6 + with: + context: . + push: true + platforms: linux/amd64,linux/arm64 + tags: ${{ steps.prep.outputs.tags }} diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e4e0f35..46c9939 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,64 +1,64 @@ -name: CI +name: Build and Push Container -# Controls when the action will run. Triggers the workflow on push to master or development -# with a tag like v1.0.0 or v1.0.0-dev on: push: - tags: - - v[0-9]+.[0-9]+.[0-9]+ - - v[0-9]+.[0-9]+.[0-9]+-[a-zA-Z]+ + branches: + - master + - main + tags: + - v* + workflow_dispatch: + +env: + REGISTRY: gitea.wayfinderak.com + IMAGE_NAME: wayfinderak/prepbot jobs: - build: + docker: runs-on: ubuntu-latest - - # Steps represent a sequence of tasks that will be executed as part of the job steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 - - - name: Get Version - id: get_version - uses: battila7/get-version-action@v2.0.0 - - - name: install buildx - id: buildx - uses: crazy-max/ghaction-docker-buildx@v1 - with: - version: latest + - name: Checkout + uses: actions/checkout@v4 - - name: Docker Login - # You may pin to the exact commit or the version. - # uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9 - uses: docker/login-action@v1.10.0 - with: - registry: ${{ secrets.DR_URL }} - # Username used to log against the Docker registry - username: ${{ secrets.DH_USERNAME }} - # Password or personal access token used to log against the Docker registry - password: ${{ secrets.DH_PASSWORD }} - # Log out from the Docker registry at the end of a job - logout: true + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 - - name: Docker Build & Push - env: - IMAGE_TAG: ${{ steps.get_version.outputs.version-without-v }} + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Log in to Gitea registry + uses: docker/login-action@v3 + with: + registry: ${{ env.REGISTRY }} + username: ${{ secrets.REGISTRY_USERNAME }} + password: ${{ secrets.REGISTRY_PASSWORD }} + + - name: Prepare image tags + id: prep + shell: bash run: | - docker buildx build --push \ - --tag ${{ secrets.DR_URL }}/prepbot:$IMAGE_TAG \ - --platform linux/amd64,linux/arm/v7,linux/arm64 . + short_sha="${GITHUB_SHA::7}" + tags="${REGISTRY}/${IMAGE_NAME}:sha-${short_sha}" - - name: Update deployment file - run: TAG=${{ steps.get_version.outputs.version-without-v }} && sed -i 's||${{ secrets.DR_URL }}/prepbot:'${TAG}'|' $GITHUB_WORKSPACE/deployment.yml + if [[ "${GITHUB_REF_TYPE}" == "branch" && ("${GITHUB_REF_NAME}" == "master" || "${GITHUB_REF_NAME}" == "main") ]]; then + tags+=$'\n'"${REGISTRY}/${IMAGE_NAME}:latest" + fi - - uses: azure/k8s-set-context@v1 + if [[ "${GITHUB_REF_TYPE}" == "tag" ]]; then + version="${GITHUB_REF_NAME#v}" + tags+=$'\n'"${REGISTRY}/${IMAGE_NAME}:${version}" + fi + + { + echo 'tags<> "$GITHUB_OUTPUT" + + - name: Build and push image + uses: docker/build-push-action@v6 with: - method: kubeconfig - kubeconfig: ${{ secrets.KUBE_CONFIG }} - id: setcontext - - - name: Deploy to Kubernetes - run: kubectl apply -f $GITHUB_WORKSPACE/deployment.yml - - - name: Verify deployment - run: kubectl rollout status -n discord-bots deployment/prepbot + context: . + push: true + platforms: linux/amd64,linux/arm64 + tags: ${{ steps.prep.outputs.tags }} diff --git a/Dockerfile b/Dockerfile index fb2b6a3..a7994cf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,20 +1,18 @@ -FROM golang:1.15-alpine as dev +FROM golang:1.22-alpine AS builder -WORKDIR /go/src/prepbot -COPY ./go.mod . -COPY ./go.sum . +WORKDIR /src +RUN apk add --no-cache ca-certificates git tzdata +COPY go.mod go.sum ./ RUN go mod download COPY . . -RUN go install github.com/dustinpianalto/prepbot/... +ARG TARGETARCH=amd64 +RUN CGO_ENABLED=0 GOOS=linux GOARCH=$TARGETARCH go build -o /out/prepbot ./cmd/prepbot -CMD [ "go", "run", "cmd/prepbot/main.go"] +FROM alpine:3.20 +RUN apk add --no-cache ca-certificates tzdata -from alpine +COPY --from=builder /out/prepbot /usr/local/bin/prepbot -WORKDIR /bin - -COPY --from=dev /go/bin/prepbot ./prepbot - -CMD [ "prepbot" ] +ENTRYPOINT ["/usr/local/bin/prepbot"] diff --git a/cmd/prepbot/main.go b/cmd/prepbot/main.go index 1bf3318..0fcf5ef 100644 --- a/cmd/prepbot/main.go +++ b/cmd/prepbot/main.go @@ -6,10 +6,10 @@ import ( "os/signal" "syscall" - "github.com/bwmarrin/discordgo" + "github.com/dustinpianalto/discordgo" "github.com/dustinpianalto/disgoman" - "github.com/dustinpianalto/prepbot/internal/exts/members" - "github.com/dustinpianalto/prepbot/internal/exts/messages" + "gitea.wayfinderak.com/wayfinderak/prepbot/internal/exts/members" + "gitea.wayfinderak.com/wayfinderak/prepbot/internal/exts/messages" ) func main() { @@ -21,7 +21,9 @@ func main() { } dg.State.MaxMessageCount = 100 dg.StateEnabled = true - + dg.LogLevel = 3 + dg.Debug = false + dg.Identify = discordgo.Identify{ Intents: discordgo.MakeIntent(discordgo.IntentsAll), } diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..5f4d87a --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,9 @@ +services: + prepbot: + image: ${IMAGE:-gitea.wayfinderak.com/wayfinderak/prepbot:${IMAGE_TAG:-latest}} + container_name: prepbot + restart: unless-stopped + environment: + DISCORD_TOKEN: ${DISCORD_TOKEN} + LINK_CHANNEL: ${LINK_CHANNEL} + CHAT_CHANNEL: ${CHAT_CHANNEL} diff --git a/go.mod b/go.mod index 3250630..32d068e 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,9 @@ -module github.com/dustinpianalto/prepbot +module gitea.wayfinderak.com/wayfinderak/prepbot go 1.14 require ( - github.com/bwmarrin/discordgo v0.22.0 - github.com/dustinpianalto/disgoman v0.0.15 + github.com/bwmarrin/discordgo v0.29.0 // indirect + github.com/dustinpianalto/discordgo v0.0.4 + github.com/dustinpianalto/disgoman v0.0.26 ) diff --git a/go.sum b/go.sum index 932b752..bc5f4ad 100644 --- a/go.sum +++ b/go.sum @@ -1,10 +1,17 @@ -github.com/bwmarrin/discordgo v0.20.2/go.mod h1:O9S4p+ofTFwB02em7jkpkV8M3R0/PUVOwN61zSZ0r4Q= -github.com/bwmarrin/discordgo v0.22.0 h1:uBxY1HmlVCsW1IuaPjpCGT6A2DBwRn0nvOguQIxDdFM= -github.com/bwmarrin/discordgo v0.22.0/go.mod h1:c1WtWUGN6nREDmzIpyTp/iD3VYt4Fpx+bVyfBG7JE+M= -github.com/dustinpianalto/disgoman v0.0.15 h1:kdIw6jhC82WBut7+4BarqxBw06dozU+Hu47LQzkkoGM= -github.com/dustinpianalto/disgoman v0.0.15/go.mod h1:v3FM6n+4dH9XlvO+IDx6MN3DUnGq6YVDBvy1A1k202g= -github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q= -github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/bwmarrin/discordgo v0.29.0 h1:FmWeXFaKUwrcL3Cx65c20bTRW+vOb6k8AnaP+EgjDno= +github.com/bwmarrin/discordgo v0.29.0/go.mod h1:NJZpH+1AfhIcyQsPeuBKsUtYrRnjkyu0kIVMCHkZtRY= +github.com/dustinpianalto/discordgo v0.0.4 h1:KlIkMzDH4jKRbs5IxeqeIXtNTDVcDi/sHV1gaKYEnPg= +github.com/dustinpianalto/discordgo v0.0.4/go.mod h1:LKY7UDCPJMChgrowLagHjDSj1gWbt3Hx+6bRFjpaVg8= +github.com/dustinpianalto/disgoman v0.0.26 h1:7p6hDbNgEehUgOHigY/lHDY4P2VklJiZmOn674ka1h0= +github.com/dustinpianalto/disgoman v0.0.26/go.mod h1:WsDb+7XIm2MJ6xhxRAiXlzSPuSYIGSr4rWRmACeoing= +github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= +github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= -golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16 h1:y6ce7gCWtnH+m3dCjzQ1PCuwl28DDIc3VNnvY29DlIA= -golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b h1:7mWr3k41Qtv8XlltBkDkl8LoP3mpSgBW8BUoxtEdbXg= +golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 h1:nxC68pudNYkKU6jWhgrqdreuFiOQWj1Fs7T3VrH4Pjw= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= diff --git a/internal/exts/members/member_logging.go b/internal/exts/members/member_logging.go index 8aaad41..d28e5f4 100644 --- a/internal/exts/members/member_logging.go +++ b/internal/exts/members/member_logging.go @@ -6,8 +6,8 @@ import ( "strconv" "time" - "github.com/bwmarrin/discordgo" - "github.com/dustinpianalto/prepbot/internal/discord_utils" + "github.com/dustinpianalto/discordgo" + "gitea.wayfinderak.com/wayfinderak/prepbot/internal/discord_utils" ) var joinChannelID = "768571410133418037" @@ -44,8 +44,6 @@ func OnGuildMemberAddLogging(s *discordgo.Session, member *discordgo.GuildMember Inline: false, } - joinTime, _ := member.JoinedAt.Parse() - embed := &discordgo.MessageEmbed{ Title: title, Description: fmt.Sprintf("%v (%v) Has Joined the Server", member.User.Mention(), member.User.ID), @@ -53,9 +51,9 @@ func OnGuildMemberAddLogging(s *discordgo.Session, member *discordgo.GuildMember Thumbnail: thumb, Footer: &discordgo.MessageEmbedFooter{ Text: fmt.Sprintf("Current Member Count: %v", guild.MemberCount), - IconURL: guild.IconURL(), + IconURL: guild.IconURL("1024"), }, - Timestamp: joinTime.Format(time.RFC3339), + Timestamp: member.JoinedAt.Format(time.RFC3339), Fields: []*discordgo.MessageEmbedField{field}, } s.ChannelMessageSendEmbed(joinChannelID, embed) @@ -117,7 +115,7 @@ func OnGuildMemberRemoveLogging(s *discordgo.Session, member *discordgo.GuildMem Thumbnail: thumb, Footer: &discordgo.MessageEmbedFooter{ Text: fmt.Sprintf("Current Member Count: %v", guild.MemberCount), - IconURL: guild.IconURL(), + IconURL: guild.IconURL("1024"), }, Timestamp: timeNow.Format(time.RFC3339), } diff --git a/internal/exts/messages/message_events.go b/internal/exts/messages/message_events.go index f4a5408..05b1ac3 100644 --- a/internal/exts/messages/message_events.go +++ b/internal/exts/messages/message_events.go @@ -5,8 +5,9 @@ import ( "os" "regexp" "strings" + neturl "net/url" - "github.com/bwmarrin/discordgo" + "github.com/dustinpianalto/discordgo" ) func CleanAmazonURLs(s *discordgo.Session, message *discordgo.MessageCreate) { @@ -25,14 +26,11 @@ func CleanAmazonURLs(s *discordgo.Session, message *discordgo.MessageCreate) { if len(urls) != 0 { for _, url := range urls { - if strings.Contains(url, "ref=") || strings.Contains(url, "?") { - parts := strings.Split(url, "/") - new := strings.Join(parts[:len(parts)-1], "/") - if strings.Contains(new, "ref=") { - parts = strings.Split(new, "ref=") - new = parts[0] - } - content = strings.ReplaceAll(content, url, new) + u, _ := neturl.Parse(url) + u.RawQuery = "" + u.Fragment = "" + if ( url != u.String() ) { + content = strings.ReplaceAll(content, url, u.String()) } } _, err := sendWebhook(s, message, message.ChannelID, content)