.github/workflows/main.yml

@@ -21,44 +21,30 @@ jobs:
         id: get_version
         uses: battila7/get-version-action@v2.0.0
 
-      - name: install buildx
+      - name: Build container image
-        id: buildx
-        uses: crazy-max/ghaction-docker-buildx@v1
-        with:
-          version: latest
-
-      - 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: Docker Build & Push
         env:
           IMAGE_TAG: ${{ steps.get_version.outputs.version-without-v }}
-        run: |
+        run: docker build -t registry.digitalocean.com/djpianalto/prepbot:$IMAGE_TAG .
-          docker buildx build --push \
+
-          --tag ${{ secrets.DR_URL }}/prepbot:$IMAGE_TAG \
+      - name: Install doctl
-          --platform linux/amd64,linux/arm/v7,linux/arm64 . 
+        uses: digitalocean/action-doctl@v2
+        with:
+          token: ${{ secrets.DIGITALOCEAN_ACCESS_TOKEN }}
+
+      - name: Login to DigitalOcean Container Registry with short-lived credentials
+        run: doctl registry login --expiry-seconds 600
+
+      - name: Push image to DigitalOcean Container Registry
+        run: docker push registry.digitalocean.com/djpianalto/prepbot
 
       - name: Update deployment file
-        run: TAG=${{ steps.get_version.outputs.version-without-v }} && sed -i 's|<IMAGE>|${{ secrets.DR_URL }}/prepbot:'${TAG}'|' $GITHUB_WORKSPACE/deployment.yml
+        run: TAG=${{ steps.get_version.outputs.version-without-v }} && sed -i 's|<IMAGE>|registry.digitalocean.com/djpianalto/prepbot:'${TAG}'|' $GITHUB_WORKSPACE/deployment.yml
 
-      - uses: azure/k8s-set-context@v1
+      - name: Save DigitalOcean kubeconfig with short-lived credentials
-        with:
+        run: doctl kubernetes cluster kubeconfig save --expiry-seconds 600 discord-bots
-          method: kubeconfig
-          kubeconfig: ${{ secrets.KUBE_CONFIG }}
-        id: setcontext
 
-      - name: Deploy to Kubernetes
+      - name: Deploy to DigitalOcean Kubernetes
         run: kubectl apply -f $GITHUB_WORKSPACE/deployment.yml
 
       - name: Verify deployment
-        run: kubectl rollout status -n discord-bots deployment/prepbot
+        run: kubectl rollout status deployment/prepbot

cmd/prepbot/main.go

@@ -8,7 +8,6 @@ import (
 
 	"github.com/bwmarrin/discordgo"
 	"github.com/dustinpianalto/disgoman"
-	"github.com/dustinpianalto/prepbot/internal/exts/members"
 	"github.com/dustinpianalto/prepbot/internal/exts/messages"
 )
 
@@ -41,8 +40,6 @@ func main() {
 	}
 
 	dg.AddHandler(messages.CleanAmazonURLs)
-	dg.AddHandler(members.OnGuildMemberAddLogging)
-	dg.AddHandler(members.OnGuildMemberRemoveLogging)
 
 	err = dg.Open()
 	if err != nil {

deployment.yml

@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: prepbot
-  namespace: discord-bots
+  namespace: default
   labels:
     app: prepbot
 spec:
@@ -23,28 +23,9 @@ spec:
       containers:
         - name: prepbot
           image: <IMAGE>
-          resources:
-            requests:
-              memory: "512Mi"
-              cpu: "1"
-            limits:
-              memory: "1Gi"
-              cpu: "2"
           env:
             - name: DISCORD_TOKEN
               valueFrom:
                 secretKeyRef:
                   name: prepbot
                   key: discord_token
-            - name: LINK_CHANNEL
-              valueFrom:
-                secretKeyRef:
-                  name: prepbot
-                  key: link_channel
-            - name: CHAT_CHANNEL
-              valueFrom:
-                secretKeyRef:
-                  name: prepbot
-                  key: chat_channel
-      imagePullSecrets:
-        - name: registry-1

internal/discord_utils/date_strings.go

@@ -1,64 +0,0 @@
-package discord_utils
-
-import (
-	"fmt"
-	"time"
-)
-
-func ParseDateString(inTime time.Time) string {
-	d := time.Now().Sub(inTime)
-	s := int64(d.Seconds())
-	days := s / 86400
-	s = s - (days * 86400)
-	hours := s / 3600
-	s = s - (hours * 3600)
-	minutes := s / 60
-	seconds := s - (minutes * 60)
-	dateString := ""
-	if days != 0 {
-		dateString += fmt.Sprintf("%v days ", days)
-	}
-	if hours != 0 {
-		dateString += fmt.Sprintf("%v hours ", hours)
-	}
-	if minutes != 0 {
-		dateString += fmt.Sprintf("%v minutes ", minutes)
-	}
-	if seconds != 0 {
-		dateString += fmt.Sprintf("%v seconds ", seconds)
-	}
-	if dateString != "" {
-		dateString += " ago."
-	} else {
-		dateString = "Now"
-	}
-	stamp := inTime.Format("2006-01-02 15:04:05")
-	return fmt.Sprintf("%v\n%v", dateString, stamp)
-}
-
-func ParseDurationString(inDur time.Duration) string {
-	s := int64(inDur.Seconds())
-	days := s / 86400
-	s = s - (days * 86400)
-	hours := s / 3600
-	s = s - (hours * 3600)
-	minutes := s / 60
-	seconds := s - (minutes * 60)
-	durString := ""
-	if days != 0 {
-		durString += fmt.Sprintf("%v days ", days)
-	}
-	if hours != 0 {
-		durString += fmt.Sprintf("%v hours ", hours)
-	}
-	if minutes != 0 {
-		durString += fmt.Sprintf("%v minutes ", minutes)
-	}
-	if seconds != 0 {
-		durString += fmt.Sprintf("%v seconds ", seconds)
-	}
-	if durString == "" {
-		durString = "0 seconds"
-	}
-	return fmt.Sprintf("%v", durString)
-}

internal/discord_utils/snowflake.go

@@ -1,32 +0,0 @@
-package discord_utils
-
-import "time"
-
-type Snowflake struct {
-	CreationTime time.Time
-	WorkerID     int8
-	ProcessID    int8
-	Increment    int16
-}
-
-func ParseSnowflake(s int64) Snowflake {
-	const (
-		DISCORD_EPOCH   = 1420070400000
-		TIME_BITS_LOC   = 22
-		WORKER_ID_LOC   = 17
-		WORKER_ID_MASK  = 0x3E0000
-		PROCESS_ID_LOC  = 12
-		PROCESS_ID_MASK = 0x1F000
-		INCREMENT_MASK  = 0xFFF
-	)
-	creationTime := time.Unix(((s>>TIME_BITS_LOC)+DISCORD_EPOCH)/1000.0, 0)
-	workerID := (s & WORKER_ID_MASK) >> WORKER_ID_LOC
-	processID := (s & PROCESS_ID_MASK) >> PROCESS_ID_LOC
-	increment := s & INCREMENT_MASK
-	return Snowflake{
-		CreationTime: creationTime,
-		WorkerID:     int8(workerID),
-		ProcessID:    int8(processID),
-		Increment:    int16(increment),
-	}
-}

internal/exts/members/member_logging.go

@@ -1,125 +0,0 @@
-package members
-
-import (
-	"fmt"
-	"log"
-	"strconv"
-	"time"
-
-	"github.com/bwmarrin/discordgo"
-	"github.com/dustinpianalto/prepbot/internal/discord_utils"
-)
-
-var joinChannelID = "768571410133418037"
-
-func OnGuildMemberAddLogging(s *discordgo.Session, member *discordgo.GuildMemberAdd) {
-	defer func() {
-		if r := recover(); r != nil {
-			log.Println("Recovered from panic in OnGuildMemberAddLogging", r)
-		}
-	}()
-	guild, err := s.State.Guild(member.GuildID)
-	if err != nil {
-		log.Println(err)
-		return
-	}
-
-	var title string
-	if member.User.Bot {
-		title = "Bot Joined"
-	} else {
-		title = "Member Joined"
-	}
-
-	thumb := &discordgo.MessageEmbedThumbnail{
-		URL: member.User.AvatarURL(""),
-	}
-
-	int64ID, _ := strconv.ParseInt(member.User.ID, 10, 64)
-	snow := discord_utils.ParseSnowflake(int64ID)
-
-	field := &discordgo.MessageEmbedField{
-		Name:   "User was created:",
-		Value:  discord_utils.ParseDateString(snow.CreationTime),
-		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),
-		Color:       0x0cc56a,
-		Thumbnail:   thumb,
-		Footer: &discordgo.MessageEmbedFooter{
-			Text:    fmt.Sprintf("Current Member Count: %v", guild.MemberCount),
-			IconURL: guild.IconURL(),
-		},
-		Timestamp: joinTime.Format(time.RFC3339),
-		Fields:    []*discordgo.MessageEmbedField{field},
-	}
-	s.ChannelMessageSendEmbed(joinChannelID, embed)
-}
-
-func OnGuildMemberRemoveLogging(s *discordgo.Session, member *discordgo.GuildMemberRemove) {
-	defer func() {
-		if r := recover(); r != nil {
-			log.Println("Recovered from panic in OnGuildMemberAddLogging", r)
-		}
-	}()
-	timeNow := time.Now()
-	guild, err := s.State.Guild(member.GuildID)
-	if err != nil {
-		log.Println(err)
-		return
-	}
-
-	var title string
-	if member.User.Bot {
-		title = "Bot Left"
-	} else {
-		title = "Member Left"
-	}
-
-	thumb := &discordgo.MessageEmbedThumbnail{
-		URL: member.User.AvatarURL(""),
-	}
-
-	desc := ""
-	al, err := s.GuildAuditLog(member.GuildID, "", "", 20, 1)
-	if err != nil {
-		log.Println(err)
-	} else {
-		for _, log := range al.AuditLogEntries {
-			if log.TargetID == member.User.ID {
-				int64ID, _ := strconv.ParseInt(log.ID, 10, 64)
-				logSnow := discord_utils.ParseSnowflake(int64ID)
-				if timeNow.Sub(logSnow.CreationTime).Seconds() <= 10 {
-					user, err := s.User(log.UserID)
-					if err == nil {
-						desc = fmt.Sprintf("%v (%v) was Kicked by: %v\nReason: %v", member.User.String(), member.User.ID, user.String(), log.Reason)
-					} else {
-						desc = fmt.Sprintf("%v (%v) was Kicked by: %v\nReason: %v", member.User.String(), member.User.ID, log.UserID, log.Reason)
-					}
-					break
-				}
-			}
-		}
-	}
-	if desc == "" {
-		desc = fmt.Sprintf("%v (%v) Has Left the Server", member.User.String(), member.User.ID)
-	}
-
-	embed := &discordgo.MessageEmbed{
-		Title:       title,
-		Description: desc,
-		Color:       0xff9431,
-		Thumbnail:   thumb,
-		Footer: &discordgo.MessageEmbedFooter{
-			Text:    fmt.Sprintf("Current Member Count: %v", guild.MemberCount),
-			IconURL: guild.IconURL(),
-		},
-		Timestamp: timeNow.Format(time.RFC3339),
-	}
-	s.ChannelMessageSendEmbed(joinChannelID, embed)
-}

internal/exts/messages/message_events.go

@@ -2,7 +2,6 @@ package messages
 
 import (
 	"log"
-	"os"
 	"regexp"
 	"strings"
 
@@ -50,8 +49,8 @@ func CleanAmazonURLs(s *discordgo.Session, message *discordgo.MessageCreate) {
 }
 
 func moveNewsLinks(s *discordgo.Session, message *discordgo.MessageCreate) {
-	linkChannel := os.Getenv("LINK_CHANNEL")
+	linkChannel := "784855106239332352"
-	chatChannel := os.Getenv("CHAT_CHANNEL")
+	chatChannel := "777679317878177804"
 	if message.ChannelID == chatChannel {
 		_, err := sendWebhook(s, message, linkChannel, message.Content)
 		if err != nil {