Merge pull request #4 from a-kataev/feature/send-edit-delete

feature: send edit delete

.github/workflows/go-test.yml → .github/workflows/_go-test.yml

@@ -8,8 +8,8 @@ jobs:
     name: test
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-go@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
+          go-version: '1.22'
       - run: go test -race -v ./...

.github/workflows/_golangci-lint.yml

@@ -0,0 +1,15 @@
+name: golangci-lint
+
+on:
+  workflow_call:
+
+jobs:
+  golangci-lint:
+    name: run
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version: '1.22'
+      - uses: golangci/golangci-lint-action@v4

.github/workflows/goreleaser.yml → .github/workflows/_goreleaser.yml

@@ -11,11 +11,11 @@ jobs:
     name: release
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-go@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
         with:
-          go-version: '1.21'
-      - uses: goreleaser/goreleaser-action@v1
+          go-version: '1.22'
+      - uses: goreleaser/goreleaser-action@v5
         with:
           args: release --clean
         env:

.github/workflows/release.yml

@@ -10,11 +10,11 @@ on:
 
 jobs:
   go-test:
-    uses: ./.github/workflows/go-test.yml
+    uses: ./.github/workflows/_go-test.yml
   golangci-lint:
-    uses: ./.github/workflows/golangci-lint.yml
+    uses: ./.github/workflows/_golangci-lint.yml
   goreleaser:
     needs:
       - go-test
       - golangci-lint
-    uses: ./.github/workflows/goreleaser.yml
+    uses: ./.github/workflows/_goreleaser.yml

.github/workflows/test.yml

@@ -8,6 +8,6 @@ on:
 
 jobs:
   go-test:
-    uses: ./.github/workflows/go-test.yml
+    uses: ./.github/workflows/_go-test.yml
   golangci-lint:
-    uses: ./.github/workflows/golangci-lint.yml
+    uses: ./.github/workflows/_golangci-lint.yml

.gitignore

@@ -1,2 +1 @@
 *.out
-dist/

.golangci.yaml

@@ -1,10 +1,11 @@
 run:
   timeout: 2m
   modules-download-mode: readonly
-  go: 1.21
+  go: "1.22"
 
 output:
-  format: colored-line-number
+  formats:
+    - format: colored-line-number
   sort-results: true
 
 linters-settings:
@@ -13,14 +14,10 @@ linters-settings:
     statements: 50
   varnamelen:
     min-name-length: 2
-  cyclop:
-    max-complexity: 15
   exhaustruct:
     exclude:
       - 'net/http\..*'
       - github.com/a-kataev/tg.Chat
-  wsl:
-    allow-assign-and-anything: true
   tagliatelle:
     case:
       rules:
@@ -44,6 +41,7 @@ linters:
     - bodyclose
     - containedctx
     - contextcheck
+    - copyloopvar
     - cyclop
     ## - deadcode # deprecated
     - decorder
@@ -55,7 +53,6 @@ linters:
     - errcheck
     - errchkjson
     - errname
-    - errorlint
     - execinquery
     - exhaustive
     ## - exhaustivestruct # deprecated
@@ -69,6 +66,7 @@ linters:
     - gocheckcompilerdirectives
     - gochecknoglobals
     - gochecknoinits
+    - gochecksumtype
     - gocognit
     - goconst
     - gocritic
@@ -79,27 +77,29 @@ linters:
     - gofmt
     - gofumpt
     - goheader
-    - goimports
     ## - golint # deprecated
     - gomnd
     - gomoddirectives
     - gomodguard
     - goprintffuncname
     - gosec
     - gosimple
+    - gosmopolitan
     - govet
     - grouper
     ## - ifshort # deprecated
-    - importas
+    - inamedparam
     - ineffassign
     - interfacebloat
     ## - interfacer # deprecated
+    - intrange
     - ireturn
     - lll
     - loggercheck
     - maintidx
     - makezero
     ## - maligned # deprecated
+    - mirror
     - misspell
     - musttag
     - nakedret
@@ -112,32 +112,31 @@ linters:
     - nonamedreturns
     ## - nosnakecase # deprecated
     - nosprintfhostport
-    - paralleltest
+    - perfsprint
     - prealloc
     - predeclared
     - promlinter
+    - protogetter
     - reassign
     - revive
     - rowserrcheck
     ## - scopelint # deprecated
-    - sqlclosecheck
+    - sloglint
+    - spancheck
     - staticcheck
     ## - structcheck # deprecated
-    - stylecheck
+    - tagalign
     - tagliatelle
     - tenv
-    - testableexamples
-    - testpackage
     - thelper
     - tparallel
-    - typecheck
     - unconvert
     - unparam
-    - unused
     - usestdlibvars
     ## - varcheck # deprecated
     - varnamelen
     - wastedassign
     - whitespace
     - wrapcheck
     - wsl
+    - zerologlint

CODEOWNERS

@@ -0,0 +1 @@
+* @a-kataev

cmd/tg/main.go

@@ -12,6 +12,12 @@ import (
 	"github.com/a-kataev/tg"
 )
 
+func logFatal(log *slog.Logger, msg string) {
+	log.Error(msg)
+
+	os.Exit(1)
+}
+
 func main() {
 	fset := flag.NewFlagSet("", flag.ContinueOnError)
 	fset.SetOutput(io.Discard)
@@ -27,12 +33,6 @@ func main() {
 
 	log := slog.New(slog.NewJSONHandler(os.Stdout, nil))
 
-	logFatal := func(msg string) {
-		log.Error(msg)
-
-		os.Exit(1)
-	}
-
 	err := fset.Parse(os.Args[1:])
 	if err != nil {
 		if errors.Is(flag.ErrHelp, err) {
@@ -43,7 +43,7 @@ func main() {
 			os.Exit(1)
 		}
 
-		logFatal(err.Error())
+		logFatal(log, err.Error())
 	}
 
 	if *token == "" {
@@ -54,40 +54,40 @@ func main() {
 		stdin, err := io.ReadAll(io.LimitReader(os.Stdin, int64(tg.MaxTextSize)))
 		if err != nil {
 			if !errors.Is(err, io.EOF) {
-				logFatal(err.Error())
+				logFatal(log, err.Error())
 			}
 		}
 
 		*text = string(stdin)
 	}
 
-	tgb, err := tg.NewTG(*token)
+	client, err := tg.NewClient(*token)
 	if err != nil {
-		logFatal(err.Error())
+		logFatal(log, err.Error())
 	}
 
 	ctx := context.Background()
 
-	bot, err := tgb.GetMe(ctx)
+	bot, err := client.GetMe(ctx)
 	if err != nil {
-		logFatal(err.Error())
+		logFatal(log, err.Error())
 	}
 
 	log = log.With(slog.String("bot_name", bot.UserName))
 
-	msg, err := tgb.SendMessage(ctx, *chatID, *text,
-		tg.ChatParseMode(tg.ParseMode(*parseMode)),
-		tg.ChatMessageThreadID(*messageThreadID),
-		tg.ChatDisableWebPagePreview(*disableWebPagePreview),
-		tg.ChatDisableNotification(*disableNotification),
-		tg.ChatProtectContent(*protectContent),
+	msg, err := client.SendMessage(ctx, *chatID, *text,
+		tg.ParseModeSendOption(tg.ParseMode(*parseMode)),
+		tg.MessageThreadIDSendOption(*messageThreadID),
+		tg.DisableWebPagePreviewSendOption(*disableWebPagePreview),
+		tg.DisableNotificationSendOption(*disableNotification),
+		tg.ProtectContentSendOption(*protectContent),
 	)
 	if err != nil {
-		logFatal(err.Error())
+		logFatal(log, err.Error())
 	}
 
 	log.Info("Success send message",
 		slog.Int64("chat_id", *chatID),
-		slog.Int("message_id", msg.MessageID),
+		slog.Any("message_id", msg.MessageID),
 	)
 }

go.mod

@@ -1,6 +1,6 @@
 module github.com/a-kataev/tg
 
-go 1.21
+go 1.22
 
 require github.com/stretchr/testify v1.9.0