Update main

.github/workflows/go.yml

@@ -0,0 +1,16 @@
+name: Golang CI
+on: [push, pull_request]
+jobs:
+  build:
+    name: Build and test
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-go@v4
+      with:
+        go-version: 1.19
+    - name: Build
+      run: make
+    - name: Test
+      run: make test
+

.github/workflows/golangci-lint.yml

@@ -0,0 +1,55 @@
+name: golangci-lint
+on:
+  push:
+    branches:
+      - master
+      - dev
+  pull_request:
+
+permissions:
+  contents: read
+  # Optional: allow read access to pull request. Use with `only-new-issues` option.
+  # pull-requests: read
+
+jobs:
+  golangci:
+    name: lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v4
+        with:
+          go-version: '1.20'
+          cache: false
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v3
+        with:
+          # Require: The version of golangci-lint to use.
+          # When `install-mode` is `binary` (default) the value can be v1.2 or v1.2.3 or `latest` to use the latest version.
+          # When `install-mode` is `goinstall` the value can be v1.2.3, `latest`, or the hash of a commit.
+          version: v1.53
+
+          # Optional: working directory, useful for monorepos
+          # working-directory: somedir
+
+          # Optional: golangci-lint command line arguments.
+          #
+          # Note: By default, the `.golangci.yml` file should be at the root of the repository.
+          # The location of the configuration file can be changed by using `--config=`
+          # args: --timeout=30m --config=/my/path/.golangci.yml --issues-exit-code=0 
+
+          # Optional: show only new issues if it's a pull request. The default value is `false`.
+          # only-new-issues: true
+
+          # Optional: if set to true, then all caching functionality will be completely disabled,
+          #           takes precedence over all other caching options.
+          # skip-cache: true
+
+          # Optional: if set to true, then the action won't cache or restore ~/go/pkg.
+          # skip-pkg-cache: true
+
+          # Optional: if set to true, then the action won't cache or restore ~/.cache/go-build.
+          # skip-build-cache: true
+
+          # Optional: The mode to install golangci-lint. It can be 'binary' or 'goinstall'.
+          # install-mode: "goinstall"

.github/workflows/publish.yml

@@ -0,0 +1,31 @@
+name: Deploy
+on:
+  push:
+    branches: ['dev']
+
+env:
+  IMAGE_NAME: 'codeinu/shibesbot'
+
+jobs:
+  build-and-push-images:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-go@v2
+      with:
+        go-version: 1.16
+    - name: Log in to the Container registry
+      uses: docker/login-action@v1
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
+    - name: Build and push
+      uses: docker/build-push-action@v2
+      with:
+        context: .
+        push: true
+        tags: ${{ env.IMAGE_NAME }}:dev

.gitignore

@@ -12,3 +12,6 @@
 
 # Project-local glide cache, RE: https://github.com/Masterminds/glide/issues/736
 .glide/
+
+.vscode
+bin/

Dockerfile

@@ -0,0 +1,9 @@
+FROM golang:1.21 AS build
+WORKDIR $GOPATH/src/github.com/codeinuit/shibesbot
+COPY . .
+RUN CGO_ENABLED=0 GOOS=linux go build -o app ./cmd/shibesbot
+
+FROM alpine:3.19
+WORKDIR /root/
+COPY --from=build /go/src/github.com/codeinuit/shibesbot/app .
+ENTRYPOINT ["./app"]

Makefile

@@ -1,16 +1,15 @@
 BINARY = shibes
 
-SRC_DIRECTORY = src/
-BIN_DIRECTORY = .
-SRC =   $(SRC_DIRECTORY)shibes.go     \
-        $(SRC_DIRECTORY)discord.go     \
-        $(SRC_DIRECTORY)dogequests.go     \
+BIN_DIRECTORY = bin
 
 
 all: $(BINARY)
 
 $(BINARY): clean
-	go build -o $(BIN_DIRECTORY)/$(BINARY) $(SRC)
+	go build -o $(BIN_DIRECTORY)/$(BINARY) cmd/shibesbot/*.go
+
+test:
+	go test ./... -v
 
 clean:
 	rm -f bin/$(BINARY)

cmd/shibesbot/discord.go

@@ -0,0 +1,136 @@
+package main
+
+import (
+	"context"
+	"fmt"
+	"strconv"
+	"time"
+
+	"github.com/bwmarrin/discordgo"
+)
+
+var (
+	commands = []*discordgo.ApplicationCommand{
+		{
+			Name:        "shibes",
+			Description: "Returns an image of a Shiba",
+			Options: []*discordgo.ApplicationCommandOption{
+
+				{
+					Type:        discordgo.ApplicationCommandOptionString,
+					Name:        "count",
+					Description: "Ask for more pictures in one request",
+					Required:    false,
+				},
+			},
+		},
+		{
+			Name:        "shelp",
+			Description: "Returns helper",
+		},
+	}
+)
+
+func (sb *Shibesbot) initDiscord() error {
+	var err error
+
+	sb.session, err = discordgo.New("Bot " + sb.apiConfigurations.discordToken)
+	if err != nil {
+		return err
+	}
+
+	sb.session.AddHandler(func(s *discordgo.Session, i *discordgo.InteractionCreate) { sb.commandPicker(s, i) })
+	sb.session.AddHandlerOnce(func(s *discordgo.Session, i *discordgo.Ready) {
+		t := time.Now()
+		key := fmt.Sprintf("usage:%d%d%d", t.Day(), t.Month(), t.Year())
+		sb.dailyKey = key
+
+		count, err := sb.cache.Get(context.Background(), sb.dailyKey)
+		if err != nil {
+			sb.log.Warn("could not get daily counter from cache : ", err.Error())
+			return
+		}
+
+		countString, ok := count.(string)
+		if !ok {
+			sb.log.Warn("could not get daily counter from cache : conversion error")
+			return
+		}
+		countInt, err := strconv.Atoi(countString)
+		if err != nil {
+			sb.log.Warn("could not get daily counter from cache : ", err.Error())
+			return
+		}
+
+		sb.setDailyCounter(int64(countInt))
+	})
+
+	if err = sb.session.Open(); err != nil {
+		return err
+	}
+
+	sb.log.Debug("updating Discord command list")
+	for _, cmd := range commands {
+		sb.log.Debugf("adding command %s", cmd.Name)
+		if _, err := sb.session.ApplicationCommandCreate(sb.session.State.User.ID, "", cmd); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func (sb *Shibesbot) commandPicker(s *discordgo.Session, i *discordgo.InteractionCreate) {
+	sb.log.Info("command received: " + i.ApplicationCommandData().Name)
+	var response string
+	switch i.ApplicationCommandData().Name {
+	case "shibes":
+		response = sb.getShibes()
+	case "shelp":
+		err := s.InteractionRespond(i.Interaction, &discordgo.InteractionResponse{
+			Type: discordgo.InteractionResponseChannelMessageWithSource,
+			Data: &discordgo.InteractionResponseData{
+				Embeds: []*discordgo.MessageEmbed{getHelp()},
+			},
+		})
+		if err != nil {
+			sb.log.Error("could not answer to user help command: ", err.Error())
+		}
+	}
+
+	if err := s.InteractionRespond(i.Interaction, &discordgo.InteractionResponse{
+		Type: discordgo.InteractionResponseChannelMessageWithSource,
+		Data: &discordgo.InteractionResponseData{
+			Content: response,
+		},
+	}); err != nil {
+		sb.log.Error("could not answer to user help command: ", err.Error())
+		return
+	}
+
+	sb.updateDailyCounter()
+}
+
+func (sb *Shibesbot) updateDailyCounter() {
+	sb.mtx.RLock()
+	defer sb.mtx.RUnlock()
+	count, err := sb.cache.Incr(context.Background(), sb.dailyKey)
+	if err != nil {
+		sb.log.Warn("could not get daily counter from cache : ", err.Error())
+		return
+	}
+	countInt, ok := count.(int64)
+	if !ok {
+		sb.log.Warn("could not get daily counter from cache")
+		return
+	}
+
+	sb.setDailyCounter(countInt)
+}
+
+func (sb *Shibesbot) setDailyCounter(count int64) {
+	err := sb.session.UpdateGameStatus(0, fmt.Sprintf("used %d times today", count))
+	if err != nil {
+		sb.log.Warn("could not update daily counter: ", err.Error())
+	}
+}

cmd/shibesbot/dogequests.go

@@ -0,0 +1,65 @@
+package main
+
+import (
+	"net/http"
+
+	"encoding/json"
+
+	"github.com/bwmarrin/discordgo"
+)
+
+var (
+	Shibes ShibesData
+)
+
+type ShibesPictures struct {
+	Shibes []string
+	Total  int
+	Cursor int
+}
+
+type ShibesData struct {
+	Images ShibesPictures
+}
+
+func (sb *Shibesbot) getShibes() string {
+	if Shibes.Images.Cursor >= Shibes.Images.Total {
+		Shibes.Images.Cursor = 0
+		Shibes.Images.Total = 10
+		resp, err := http.Get("http://shibe.online/api/shibes?count=10")
+		if err != nil {
+			sb.log.Warn("could not get images from shibes.online: ", err.Error())
+			return ""
+		}
+		defer resp.Body.Close()
+		err = json.NewDecoder(resp.Body).Decode(&Shibes.Images.Shibes)
+		if err != nil {
+			sb.log.Warn("could not get images from shibes.online: ", err.Error())
+			return ""
+		}
+		sb.log.Info("Updated ", Shibes.Images.Total, " pictures from shibes.online")
+	}
+	Shibes.Images.Cursor++
+	return Shibes.Images.Shibes[Shibes.Images.Cursor-1]
+}
+
+func getHelp() *discordgo.MessageEmbed {
+	test := &discordgo.MessageEmbed{
+		Thumbnail: &discordgo.MessageEmbedThumbnail{
+			URL: "http://img.over-blog-kiwi.com/1/47/73/14/20160709/ob_bcc896_chiot-shiba-inu-a-vendre-2016.jpg",
+		},
+		Description: "Thanks for using Shibesbot on your Discord server !\n\n" +
+			"Our purpose is to distribute many **shibes** on your server, using http://shibe.online/ as puppy distributor.\n\n" +
+			"Are you enjoying this bot ? You can help us spread the doge ! https://github.com/P147x/discord-shibesbot",
+		Fields: []*discordgo.MessageEmbedField{
+			{
+				Name: "Available commands",
+				Value: "- *shibes* to get a random shibe !\n" +
+					"- *shelp* to get help",
+				Inline: false,
+			},
+		},
+		Title: "Hello shibes !",
+	}
+	return test
+}