From 14b34edca36ef09aabe2723f655af6ea597e4506 Mon Sep 17 00:00:00 2001 From: Lincoln Nogueira Date: Thu, 28 Dec 2023 20:50:15 -0300 Subject: [PATCH] chore: fix misuse of package path instead of filepath.path (#2684) As stated by https://pkg.go.dev/path, "path" is mainly for URLs, "path.filepath" for file systems --- plugin/telegram/attachment.go | 4 ++-- server/integration/telegram.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugin/telegram/attachment.go b/plugin/telegram/attachment.go index e252f3f0..b7ed7cb1 100644 --- a/plugin/telegram/attachment.go +++ b/plugin/telegram/attachment.go @@ -1,7 +1,7 @@ package telegram import ( - "path" + "path/filepath" "go.uber.org/zap" @@ -27,7 +27,7 @@ func (b Attachment) GetMimeType() string { return b.MimeType } - mime, ok := mimeTypes[path.Ext(b.FileName)] + mime, ok := mimeTypes[filepath.Ext(b.FileName)] if !ok { // Handle unknown file extension log.Warn("Unknown file type for ", zap.String("filename", b.FileName)) diff --git a/server/integration/telegram.go b/server/integration/telegram.go index fe423865..b7ee9390 100644 --- a/server/integration/telegram.go +++ b/server/integration/telegram.go @@ -4,7 +4,7 @@ import ( "bytes" "context" "fmt" - "path" + "path/filepath" "strconv" "unicode/utf16" @@ -85,7 +85,7 @@ func (t *TelegramHandler) MessageHandle(ctx context.Context, bot *telegram.Bot, // Fill the common field of create create := store.Resource{ CreatorID: creatorID, - Filename: path.Base(attachment.FileName), + Filename: filepath.Base(attachment.FileName), Type: attachment.GetMimeType(), Size: attachment.FileSize, MemoID: &memoMessage.ID,