.gitea/workflows/cd.yaml

@@ -1,19 +0,0 @@
-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

Dockerfile

@@ -7,7 +7,6 @@ RUN go mod download
 
 COPY . .
 RUN go env -w CGO_ENABLED=1
-ENV GOCACHE=/root/.cache/go-build
+RUN go build -o app ./cmd/app
-RUN --mount=type=cache,target="/root/.cache/go-build" go build -o app ./cmd/app
 WORKDIR /storage
 CMD ["/build/app"]

cmd/app/main.go

@@ -122,7 +122,6 @@ func ProcessUpdate(bc BotController, update tgbotapi.Update) {
             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"),
@@ -155,8 +154,7 @@ func ProcessUpdate(bc BotController, update tgbotapi.Update) {
             } 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" && len(args) > 0 && args[0] == bc.cfg.AdminPass {
+            } else if possibleCommand == "/secret" && 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)
@@ -176,7 +174,6 @@ func ProcessUpdate(bc BotController, update tgbotapi.Update) {
                     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
@@ -187,7 +184,7 @@ func ProcessUpdate(bc BotController, update tgbotapi.Update) {
                 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() && user.State != "leaveticket" {
+            } else if user.IsEffectiveAdmin() {
                 if user.State != "start" {
                     if strings.HasPrefix(user.State, "imgset:") {
                         Literal := strings.Split(user.State, ":")[1]
@@ -285,29 +282,7 @@ func ProcessUpdate(bc BotController, update tgbotapi.Update) {
                     bc.db.Model(&user).Update("state", "leaveticket")
                     bc.bot.Send(tgbotapi.NewMessage(user.ID, bc.GetBotContent("leaveticket_message")))
                 } else {
-                    link, err := bc.GetBotContentVerbose("channel_link")
+                    bc.bot.Send(tgbotapi.NewMessage(user.ID, bc.GetBotContent("subscribe_message")))
-                    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:") {
@@ -336,15 +311,12 @@ func ProcessUpdate(bc BotController, update tgbotapi.Update) {
                         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" {

docker-compose.yml

@@ -10,6 +10,5 @@ services:
       context: .
       dockerfile: Dockerfile
     restart: always
-    env_file: ".env"
     volumes:
       - ./storage:/storage