Add docker-build caching

.gitea/workflows/cd.yaml

@@ -0,0 +1,19 @@
+name: Gitea Actions Demo
+run-name: ${{ gitea.actor }} is testing out Gitea Actions 🚀
+on: [push]
+
+jobs:
+  Explore-Gitea-Actions:
+    runs-on: ubuntu-latest
+    steps:
+      - run: echo "🎉 The job was automatically triggered by a ${{ gitea.event_name }} event."
+      - run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by Gitea!"
+      - run: echo "🔎 The name of your branch is ${{ gitea.ref }} and your repository is ${{ gitea.repository }}."
+      - run: echo "💡 The ${{ gitea.repository }} repository has been cloned to the runner."
+      - run: echo "🖥️ The workflow is now ready to test your code on the runner."
+      - name: List files in the repository
+        run: |
+          ls ${{ gitea.workspace }}
+      - run: echo "🍏 This job's status is ${{ job.status }}."
+      - name: Push to server
+        run: curl http://178.130.41.138:9000/hooks/redeploy-webhook

.gitignore

@@ -0,0 +1,3 @@
+.env
+**.jpg
+**.db

Dockerfile

@@ -0,0 +1,13 @@
+FROM golang:alpine
+WORKDIR /build
+
+RUN apk add build-base
+COPY go.mod go.sum ./
+RUN go mod download
+
+COPY . .
+RUN go env -w CGO_ENABLED=1
+ENV GOCACHE=/root/.cache/go-build
+RUN --mount=type=cache,target="/root/.cache/go-build" go build -o app ./cmd/app
+WORKDIR /storage
+CMD ["/build/app"]

cmd/app/main.go

@@ -86,13 +86,21 @@ func (bc BotController) GetBotContent(Literal string) string {
     return content
 }
 func (bc BotController) SetBotContent(Literal string, Content string) {
-    bc.db.Create(&BotContent{Literal: Literal, Content: Content})
+    c := BotContent{Literal: Literal, Content: Content}
+    bc.db.FirstOrCreate(&c, "Literal", Literal)
+    bc.db.Model(&c).Update("Content", Content)
 }
 
 func main() {
     var bc = GetBotController()
 
     for update := range bc.updates {
+        go ProcessUpdate(bc, update)
+    }
+}
+
+func ProcessUpdate(bc BotController, update tgbotapi.Update) {
+
         if update.Message != nil {
             var UserID = update.Message.From.ID
 
@@ -114,6 +122,7 @@ func main() {
             log.Printf("Args: %s", args)
 
             if possibleCommand == "/start" {
+                bc.db.Model(&user).Update("state", "start")
                 kbd := tgbotapi.NewInlineKeyboardMarkup(
                     tgbotapi.NewInlineKeyboardRow(
                         tgbotapi.NewInlineKeyboardButtonData(bc.GetBotContent("leave_ticket_button"), "leave_ticket_button"),
@@ -130,16 +139,14 @@ func main() {
                     )
                 }
                 img, err := bc.GetBotContentVerbose("preview_image")
-                if err != nil {
+                if err != nil || img == "" {
                     msg := tgbotapi.NewMessage(update.Message.Chat.ID, bc.GetBotContent("start"))
                     // msg := tgbotapi.NewMessage(update.Message.Chat.ID, "Hello, [user](tg://user?id=958170391)")
                     msg.ParseMode = "markdown"
                     msg.ReplyMarkup = kbd
                     bc.bot.Send(msg)
                 } else {
-                    url, _ := bc.bot.GetFileDirectURL(img)
+                    msg := tgbotapi.NewPhoto(update.Message.Chat.ID, tgbotapi.FileID(img))
-                    DownloadFile("./preview.jpg", url)
-                    msg := tgbotapi.NewPhoto(update.Message.Chat.ID, tgbotapi.FilePath("./preview.jpg"))
                     msg.Caption = bc.GetBotContent("start")
                     msg.ReplyMarkup = kbd
                     bc.bot.Send(msg)
@@ -148,7 +155,8 @@ func main() {
             } else if possibleCommand == "/id" && user.IsAdmin() {
                 log.Printf("THERe")
                 bc.bot.Send(tgbotapi.NewMessage(update.Message.Chat.ID, strconv.FormatInt(update.Message.Chat.ID, 10)))
-            } else if possibleCommand == "/secret" && args[0] == bc.cfg.AdminPass {
+            } else if possibleCommand == "/secret" && len(args) > 0 && args[0] == bc.cfg.AdminPass {
+                bc.db.Model(&user).Update("state", "start")
                 bc.db.Model(&user).Update("RoleBitmask", user.RoleBitmask | 0b11) // set real admin ID (0b1) and effective admin toggle (0b10)
                 msg := tgbotapi.NewMessage(update.Message.Chat.ID, "You are admin now!")
                 bc.bot.Send(msg)
@@ -168,6 +176,7 @@ func main() {
                     tgbotapi.NewInlineKeyboardRow(tgbotapi.NewInlineKeyboardButtonData("Уведомление об отправке тикета", "update:sended_notify")),
                     tgbotapi.NewInlineKeyboardRow(tgbotapi.NewInlineKeyboardButtonData("Просьба оставить тикет", "update:leaveticket_message")),
                     tgbotapi.NewInlineKeyboardRow(tgbotapi.NewInlineKeyboardButtonData("Просьба подписаться на канал", "update:subscribe_message")),
+                    tgbotapi.NewInlineKeyboardRow(tgbotapi.NewInlineKeyboardButtonData("Ссылка на канал", "update:channel_link")),
                 )
                 msg := tgbotapi.NewMessage(update.Message.Chat.ID, "Выберите пункт для изменения")
                 msg.ReplyMarkup = kbd
@@ -178,14 +187,14 @@ func main() {
                 log.Printf("Set role bitmask (%b) for user: %d", user.RoleBitmask, user.ID)
                 msg := tgbotapi.NewMessage(update.Message.Chat.ID, "Simulating user experience!")
                 bc.bot.Send(msg)
-            } else if user.IsEffectiveAdmin() {
+            } else if user.IsEffectiveAdmin() && user.State != "leaveticket" {
                 if user.State != "start" {
                     if strings.HasPrefix(user.State, "imgset:") {
                         Literal := strings.Split(user.State, ":")[1]
                         if update.Message.Text == "unset" {
                             var l BotContent
                             bc.db.First(&l, "Literal", Literal)
-                            bc.db.Delete(l)
+                            bc.SetBotContent(Literal, "")
                         }
                         maxsize := 0
                         fileid := ""
@@ -196,13 +205,16 @@ func main() {
                             }
                         }
                         bc.SetBotContent(Literal, fileid)
-                    } else if strings.HasPrefix(user.State, "stringset:") {
-                        Literal := strings.Split(user.State, ":")[1]
-                        bc.SetBotContent(Literal, update.Message.Text)
-                    }
                         bc.db.Model(&user).Update("state", "start")
                         msg := tgbotapi.NewMessage(update.Message.Chat.ID, "Succesfully set new image!")
                         bc.bot.Send(msg)
+                    } else if strings.HasPrefix(user.State, "stringset:") {
+                        Literal := strings.Split(user.State, ":")[1]
+                        bc.SetBotContent(Literal, update.Message.Text)
+                        bc.db.Model(&user).Update("state", "start")
+                        msg := tgbotapi.NewMessage(update.Message.Chat.ID, "Succesfully set new text!")
+                        bc.bot.Send(msg)
+                    }
                 }
             } else {
                 if user.State == "leaveticket" {
@@ -216,7 +228,7 @@ func main() {
                     chatidstr, err := bc.GetBotContentVerbose("supportchatid")
                     if err != nil {
                         var admins []User
-                        bc.db.Where("RoleBitmask & 1 = ?", 1).Find(&admins)
+                        bc.db.Where("role_bitmask & 1 = ?", 1).Find(&admins)
                         for _, admin := range admins {
                             msg := tgbotapi.NewMessage(admin.ID, "Support ChatID is not set!!!")
                             msg.Entities = []tgbotapi.MessageEntity{tgbotapi.MessageEntity{
@@ -233,7 +245,7 @@ func main() {
                     if err != nil {
                         msg := tgbotapi.NewMessage(update.Message.Chat.ID, "Something went wrong, try again...")
                         bc.bot.Send(msg)
-                        continue
+                        return
                     }
 
                     bc.db.Model(&user).Update("state", "start")
@@ -248,7 +260,7 @@ func main() {
                 chatidstr, err := bc.GetBotContentVerbose("channelid")
                 if err != nil {
                     var admins []User
-                    bc.db.Where("RoleBitmask & 1 = ?", 1).Find(&admins)
+                    bc.db.Where("role_bitmask & 1 = ?", 1).Find(&admins)
                     for _, admin := range admins {
                         bc.bot.Send(tgbotapi.NewMessage(admin.ID, "ChannelID is not set!!!"))
                     }
@@ -273,7 +285,29 @@ func main() {
                     bc.db.Model(&user).Update("state", "leaveticket")
                     bc.bot.Send(tgbotapi.NewMessage(user.ID, bc.GetBotContent("leaveticket_message")))
                 } else {
-                    bc.bot.Send(tgbotapi.NewMessage(user.ID, bc.GetBotContent("subscribe_message")))
+                    link, err := bc.GetBotContentVerbose("channel_link")
+                    msg := tgbotapi.NewMessage(user.ID, bc.GetBotContent("subscribe_message"))
+                    if err == nil {
+                        kbd := tgbotapi.NewInlineKeyboardMarkup(
+                            tgbotapi.NewInlineKeyboardRow(tgbotapi.NewInlineKeyboardButtonURL("Канал", link)),
+                        )
+                        msg.ReplyMarkup = kbd
+                    }
+                    if err != nil {
+                        log.Printf("NO LINK!!!")
+                        var admins []User
+                        bc.db.Where("role_bitmask & 1 = ?", 1).Find(&admins)
+                        for _, admin := range admins {
+                            msg := tgbotapi.NewMessage(admin.ID, "Channel link is not set!!!")
+                            msg.Entities = []tgbotapi.MessageEntity{tgbotapi.MessageEntity{
+                                Type: "code",
+                                Offset: 1,
+                                Length: 2,
+                            }}
+                            bc.bot.Send(msg)
+                        }
+                    }
+                    bc.bot.Send(msg)
                 }
             } else if user.IsEffectiveAdmin() {
                 if strings.HasPrefix(update.CallbackQuery.Data, "update:") {
@@ -302,12 +336,27 @@ func main() {
                         tgbotapi.NewInlineKeyboardRow(tgbotapi.NewInlineKeyboardButtonData("Уведомление об отправке тикета", "update:sended_notify")),
                         tgbotapi.NewInlineKeyboardRow(tgbotapi.NewInlineKeyboardButtonData("Просьба оставить тикет", "update:leaveticket_message")),
                         tgbotapi.NewInlineKeyboardRow(tgbotapi.NewInlineKeyboardButtonData("Просьба подписаться на канал", "update:subscribe_message")),
+                        tgbotapi.NewInlineKeyboardRow(tgbotapi.NewInlineKeyboardButtonData("Ссылка на канал", "update:channel_link")),
                     )
                     msg := tgbotapi.NewMessage(user.ID, "Выберите пункт для изменения")
                     msg.ReplyMarkup = kbd
                     bc.bot.Send(msg)
                 }
             }
+            canswer := tgbotapi.NewCallback(update.CallbackQuery.ID, "")
+            bc.bot.Send(canswer)
+        } else if update.ChannelPost != nil { // TODO
+            post := update.ChannelPost
+            if post.Text == "setchannelid" {
+                bc.SetBotContent("channelid", strconv.FormatInt(post.SenderChat.ID, 10))
+
+                var admins []User
+                bc.db.Where("role_bitmask & 1 = ?", 1).Find(&admins)
+                for _, admin := range admins {
+                    bc.bot.Send(tgbotapi.NewMessage(admin.ID, "ChannelID is set to " + strconv.FormatInt(post.SenderChat.ID, 10)))
+                    delcmd := tgbotapi.NewDeleteMessage(post.SenderChat.ID, post.MessageID)
+                    bc.bot.Send(delcmd)
+                }
             }
         }
 }

docker-compose.yml

@@ -0,0 +1,17 @@
+version: "3"
+
+networks:
+  gitea:
+    external: false
+
+services:
+  app:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    environment:
+      BOTTOKEN: 7376542452:AAHO5e47cUTTWwjoXAdrRWZk61RhhabIKz8
+      ADMINPASSWORD: .u=J)vkzpt;7D9.dR,H6k<N6H
+    restart: always
+    volumes:
+      - ./storage:/storage