Merge pull request #16 from graynk/bump-and-reply

Bump versions, reply everywhere to support topics

Author: graynk

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.18-bullseye as build
+FROM golang:1.19-bullseye as build
 WORKDIR /go/src/distortioner
 COPY app .
 RUN go test ./...

app/distorters/animation.go

@@ -38,7 +38,7 @@ func DistortVideo(filename, output string, progressChan chan string) {
 	if err != nil {
 		progressChan <- Failed
 		return
-	} else if duration > 30 {
+	} else if duration > 60 {
 		progressChan <- TooLong
 		return
 	}

app/distortioner.go

@@ -13,6 +13,7 @@ import (
 
 	"go.uber.org/zap"
 	tb "gopkg.in/telebot.v3"
+	"gopkg.in/telebot.v3/middleware"
 
 	"github.com/graynk/distortioner/distorters"
 	"github.com/graynk/distortioner/stats"
@@ -107,7 +108,7 @@ func (d DistorterBot) handleRegularStickerDistortion(c tb.Context) error {
 }
 
 func (d DistorterBot) handleVideoStickerDistortion(c tb.Context) error {
-	return c.Send("You can go vote for this suggestion, for .webm stickers handling to become somewhat tolerable https://bugs.telegram.org/c/14858")
+	return c.Reply("You can go vote for this suggestion, for .webm stickers handling to become somewhat tolerable https://bugs.telegram.org/c/14858")
 }
 
 func (d DistorterBot) handleStickerDistortion(c tb.Context) error {
@@ -176,9 +177,9 @@ func (d DistorterBot) handleVideoNoteDistortion(c tb.Context) error {
 		failed := err != nil
 		if failed {
 			if progressMessage != nil && progressMessage.Text != distorters.TooLong {
+				d.logger.Error(err)
 				d.DoneMessageWithRepeater(b, progressMessage, failed)
 			}
-			d.logger.Error(err)
 			return
 		}
 		defer os.Remove(output)
@@ -195,7 +196,7 @@ func (d DistorterBot) handleVideoNoteDistortion(c tb.Context) error {
 func (d DistorterBot) handleVoiceDistortion(c tb.Context) error {
 	m := c.Message()
 	if m.Voice.FileSize > MaxSizeMb {
-		return c.Send(m.Chat, distorters.TooBig)
+		return c.Reply(distorters.TooBig)
 	}
 	filename, err := tools.JustGetTheFile(c.Bot(), m)
 	if err != nil {
@@ -222,7 +223,7 @@ func (d DistorterBot) handleReplyDistortion(c tb.Context) error {
 		if m.FromGroup() {
 			msg += "\nYou might also need to make chat history visible for new members if your group is private."
 		}
-		return c.Send(msg)
+		return c.Reply(msg)
 	}
 	original := m.ReplyTo
 	update := c.Update()
@@ -255,7 +256,7 @@ func (d DistorterBot) handleStatRequest(c tb.Context, db *stats.DistortionerDB,
 	stat, err := db.GetStat(period)
 	if err != nil {
 		d.logger.Error(err)
-		return c.Send(err.Error())
+		return c.Reply(err.Error())
 	}
 	header := "Stats for the past %s"
 	switch period {
@@ -282,15 +283,15 @@ _Photos_: %d
 _Text messages_: %d
 `,
 		stat.Sticker, stat.Animation, stat.Video, stat.VideoNote, stat.Voice, stat.Photo, stat.Text)
-	return c.Send(message+details, tb.ModeMarkdown)
+	return c.Reply(message+details, tb.ModeMarkdown)
 }
 
 func (d DistorterBot) handleQueueStats(c tb.Context) error {
 	if c.Message().Sender.ID != d.adminID {
 		return nil
 	}
 	length, users := d.videoWorker.QueueStats()
-	return c.Send(fmt.Sprintf("Currently in queue: %d requests from %d users", length, users))
+	return c.Reply(fmt.Sprintf("Currently in queue: %d requests from %d users", length, users))
 }
 
 func main() {
@@ -346,7 +347,7 @@ func main() {
 					logger.Warn("can't send anything at all", zap.Int64("chat_id", m.Chat.ID))
 					return false
 				} else if (!permissions.CanSendMedia && tools.IsMedia(m.ReplyTo)) || (!permissions.CanSendOther && tools.IsNonMediaMedia(m.ReplyTo)) {
-					b.Send(m.Chat, NotEnoughRights)
+					b.Reply(m, NotEnoughRights)
 					return false
 				}
 			}
@@ -362,8 +363,9 @@ func main() {
 		return
 	}
 
+	b.Use(middleware.Recover())
 	b.Handle("/start", func(c tb.Context) error {
-		return c.Send("Send me a picture, a sticker, a voice message, a video[note] or a GIF and I'll distort it")
+		return c.Reply("Send me a picture, a sticker, a voice message, a video[note] or a GIF and I'll distort it")
 	})
 
 	b.Handle("/daily", d.ApplyShutdownMiddleware(func(c tb.Context) error {

app/go.mod

@@ -1,20 +1,20 @@
 module github.com/graynk/distortioner
 
-go 1.18
+go 1.19
 
 require (
 	github.com/google/uuid v1.3.0
-	github.com/mattn/go-sqlite3 v1.14.13
+	github.com/mattn/go-sqlite3 v1.14.16
 	github.com/pkg/errors v0.9.1
-	github.com/stretchr/testify v1.7.1
-	go.uber.org/zap v1.21.0
-	gopkg.in/telebot.v3 v3.0.0
+	github.com/stretchr/testify v1.8.0
+	go.uber.org/zap v1.23.0
+	gopkg.in/telebot.v3 v3.1.2
 )
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	go.uber.org/atomic v1.9.0 // indirect
+	go.uber.org/atomic v1.10.0 // indirect
 	go.uber.org/multierr v1.8.0 // indirect
-	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )