.github/workflows/main.yml

@@ -17,48 +17,46 @@ jobs:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v2
       
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: us-east-1
+
+      - name: Login to Amazon ECR
+        id: login-ecr
+        uses: aws-actions/amazon-ecr-login@v1
+      
       - 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: Docker Login
+      - name: Build, tag, and push image to Amazon ECR
-        # You may pin to the exact commit or the version.
+        id: build-image
-        # 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:
+          ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
+          ECR_REPOSITORY: prepbot
           IMAGE_TAG: ${{ steps.get_version.outputs.version-without-v }}
         run: |
-          docker buildx build --push \
+          docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG .
-          --tag ${{ secrets.DR_URL }}/prepbot:$IMAGE_TAG \
+          docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
-          --platform linux/amd64,linux/arm/v7,linux/arm64 . 
+          docker tag $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG $ECR_REGISTRY/$ECR_REPOSITORY:latest
+          docker push $ECR_REGISTRY/$ECR_REPOSITORY:latest
+          echo "::set-output name=image::$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG"
 
-      - name: Update deployment file
+      - name: Fill in the new image ID in the Amazon ECS task definition
-        run: TAG=${{ steps.get_version.outputs.version-without-v }} && sed -i 's|<IMAGE>|${{ secrets.DR_URL }}/prepbot:'${TAG}'|' $GITHUB_WORKSPACE/deployment.yml
+        id: task-def
-
+        uses: aws-actions/amazon-ecs-render-task-definition@v1
-      - uses: azure/k8s-set-context@v1
         with:
-          method: kubeconfig
+          task-definition: task-definition.json
-          kubeconfig: ${{ secrets.KUBE_CONFIG }}
+          container-name: "prepbot"
-        id: setcontext
+          image: ${{ steps.build-image.outputs.image }}
 
-      - name: Deploy to Kubernetes
+      - name: Deploy Amazon ECS task definition
-        run: kubectl apply -f $GITHUB_WORKSPACE/deployment.yml
+        uses: aws-actions/amazon-ecs-deploy-task-definition@v1
-
+        with:
-      - name: Verify deployment
+          task-definition: ${{ steps.task-def.outputs.task-definition }}
-        run: kubectl rollout status -n discord-bots deployment/prepbot
+          service: "prepbot"
+          cluster: "discord-bots"
+          wait-for-service-stability: true

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"
 )
 
@@ -40,9 +39,7 @@ func main() {
 		CheckPermissions: false,
 	}
 
-	dg.AddHandler(messages.CleanAmazonURLs)
+	dg.AddHandler(messages.OnMessage)
-	dg.AddHandler(members.OnGuildMemberAddLogging)
-	dg.AddHandler(members.OnGuildMemberRemoveLogging)
 
 	err = dg.Open()
 	if err != nil {

deployment.yml

@@ -1,50 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: prepbot
-  namespace: discord-bots
-  labels:
-    app: prepbot
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: prepbot
-  strategy:
-    rollingUpdate:
-      maxSurge: 1
-      maxUnavailable: 1
-  minReadySeconds: 120
-  template:
-    metadata:
-      labels:
-        app: prepbot
-    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,17 +2,16 @@ package messages
 
 import (
 	"log"
-	"os"
 	"regexp"
 	"strings"
 
 	"github.com/bwmarrin/discordgo"
 )
 
-func CleanAmazonURLs(s *discordgo.Session, message *discordgo.MessageCreate) {
+func OnMessage(s *discordgo.Session, message *discordgo.MessageCreate) {
 	defer func() {
 		if r := recover(); r != nil {
-			log.Println("Recovered from panic in CleanAmazonURLs")
+			log.Println("Recovered from panic in OnMessage")
 		}
 	}()
 	if message.Author.Bot {
@@ -22,48 +21,19 @@ func CleanAmazonURLs(s *discordgo.Session, message *discordgo.MessageCreate) {
 	amazonRegexString := `(http|https):\/\/((?:[\w-_\.]*)amazon(?:\.[\w\-_]+)+)([\w\/\-\.,@?^=%&~\+#]*[\w\-\@?^=%&/~\+#])?`
 	amazonRegex := regexp.MustCompile(amazonRegexString)
 	urls := amazonRegex.FindAllString(message.Content, -1)
-	if len(urls) != 0 {
+	if len(urls) == 0 {
-
+		return
-		for _, url := range urls {
+	}
-			if strings.Contains(url, "ref=") || strings.Contains(url, "?") {
+	for _, url := range urls {
-				parts := strings.Split(url, "/")
+		if strings.Contains(url, "ref=") || strings.Contains(url, "?") {
-				new := strings.Join(parts[:len(parts)-1], "/")
+			parts := strings.Split(url, "/")
-				if strings.Contains(new, "ref=") {
+			new := strings.Join(parts[:len(parts)-1], "/")
-					parts = strings.Split(new, "ref=")
+			content = strings.ReplaceAll(content, url, new)
-					new = parts[0]
-				}
-				content = strings.ReplaceAll(content, url, new)
-			}
-		}
-		_, err := sendWebhook(s, message, message.ChannelID, content)
-		if err == nil {
-			s.ChannelMessageDelete(message.ChannelID, message.ID)
 		}
 	}
-	message.Content = content
+	webhook, err := s.WebhookCreate(message.ChannelID, message.ID, "")
-	urlRegexString := `http[s]?:\/\/(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+`
-	urlRegex := regexp.MustCompile(urlRegexString)
-	urls = urlRegex.FindAllString(message.Content, -1)
-	if len(urls) != 0 {
-		moveNewsLinks(s, message)
-	}
-}
-
-func moveNewsLinks(s *discordgo.Session, message *discordgo.MessageCreate) {
-	linkChannel := os.Getenv("LINK_CHANNEL")
-	chatChannel := os.Getenv("CHAT_CHANNEL")
-	if message.ChannelID == chatChannel {
-		_, err := sendWebhook(s, message, linkChannel, message.Content)
-		if err != nil {
-			log.Println(err)
-		}
-	}
-}
-
-func sendWebhook(s *discordgo.Session, message *discordgo.MessageCreate, channelID, content string) (string, error) {
-	webhook, err := s.WebhookCreate(channelID, message.ID, "")
 	if err != nil {
-		return "", err
+		return
 	}
 	defer s.WebhookDelete(webhook.ID)
 	var name string
@@ -77,9 +47,9 @@ func sendWebhook(s *discordgo.Session, message *discordgo.MessageCreate, channel
 		Username:  name,
 		AvatarURL: message.Author.AvatarURL(""),
 	}
-	w, err := s.WebhookExecute(webhook.ID, webhook.Token, true, params)
+	_, err = s.WebhookExecute(webhook.ID, webhook.Token, true, params)
 	if err != nil {
-		return "", err
+		return
 	}
-	return w.ID, nil
+	s.ChannelMessageDelete(message.ChannelID, message.ID)
 }