feat: Add postArtworkCmd to handle artwork posting

Author: krau

bot/bot.go

@@ -44,17 +44,17 @@ func RunPolling() {
 	baseGroup.HandleMessageCtx(getPictureFile, telegohandler.Or(telegohandler.CommandEqual("file"), telegohandler.CommandEqual("files")), mentionIsBot)
 	baseGroup.HandleMessageCtx(randomPicture, telegohandler.Or(telegohandler.CommandEqual("setu"), telegohandler.CommandEqual("random")), mentionIsBot)
 	baseGroup.HandleMessageCtx(help, telegohandler.CommandEqual("help"), mentionIsBot)
-	baseGroup.HandleMessageCtx(getArtworkInfo, sourceUrlMatches)
 	baseGroup.HandleMessageCtx(searchPicture, telegohandler.CommandEqual("search"), mentionIsBot)
 	baseGroup.HandleMessageCtx(setAdmin, telegohandler.CommandEqual("set_admin"))
 	baseGroup.HandleMessageCtx(deletePicture, telegohandler.Or(telegohandler.CommandEqual("del"), telegohandler.CommandEqual("delete")))
 	baseGroup.HandleMessageCtx(fetchArtwork, telegohandler.CommandEqual("fetch"))
 	baseGroup.HandleMessageCtx(processPictures, telegohandler.CommandEqual("process_pictures"))
 	baseGroup.HandleMessageCtx(setArtworkR18, telegohandler.CommandEqual("r18"))
 	baseGroup.HandleMessageCtx(setArtworkTags, telegohandler.Or(telegohandler.CommandEqual("tags"), telegohandler.CommandEqual("addtags"), telegohandler.CommandEqual("deltags")))
+	baseGroup.HandleMessageCtx(postArtworkCmd, telegohandler.CommandEqual("post"))
 	baseGroup.HandleMessageCtx(batchPostArtwork, telegohandler.CommandEqual("batch_post"))
-
-	baseGroup.HandleCallbackQueryCtx(postArtwork, telegohandler.CallbackDataContains("post_artwork"))
+	baseGroup.HandleCallbackQueryCtx(postArtworkCb, telegohandler.CallbackDataContains("post_artwork"))
+	baseGroup.HandleMessageCtx(getArtworkInfo, sourceUrlMatches)
 	baseGroup.HandleInlineQueryCtx(inlineQuery)
 
 	botHandler.Start()

bot/handlers_admin.go

@@ -204,7 +204,7 @@ func fetchArtwork(ctx context.Context, bot *telego.Bot, message telego.Message)
 	telegram.ReplyMessage(bot, message, "开始拉取作品了")
 }
 
-func postArtwork(ctx context.Context, bot *telego.Bot, query telego.CallbackQuery) {
+func postArtworkCb(ctx context.Context, bot *telego.Bot, query telego.CallbackQuery) {
 	if !service.CheckAdminPermission(ctx, query.From.ID, types.PermissionPostArtwork) &&
 		!service.CheckAdminPermission(ctx, query.Message.GetChat().ID, types.PermissionPostArtwork) {
 		bot.AnswerCallbackQuery(&telego.AnswerCallbackQueryParams{
@@ -316,6 +316,71 @@ func postArtwork(ctx context.Context, bot *telego.Bot, query telego.CallbackQuer
 	})
 }
 
+func postArtworkCmd(ctx context.Context, bot *telego.Bot, message telego.Message) {
+	if !CheckPermissionInGroup(ctx, message, types.PermissionPostArtwork) {
+		telegram.ReplyMessage(bot, message, "你没有发布作品的权限")
+		return
+	}
+	_, _, args := telegoutil.ParseCommand(message.Text)
+	if len(args) == 0 && message.ReplyToMessage == nil {
+		telegram.ReplyMessage(bot, message, "请提供作品链接, 或回复一条消息")
+		return
+	}
+	var sourceURL string
+	if message.ReplyToMessage != nil {
+		sourceURL = FindSourceURLForMessage(message.ReplyToMessage)
+		if sourceURL == "" {
+			if len(args) == 0 {
+				telegram.ReplyMessage(bot, message, "不支持的链接")
+				return
+			}
+			sourceURL = sources.FindSourceURL(args[0])
+		}
+	}
+	if len(args) > 0 {
+		sourceURL = sources.FindSourceURL(args[0])
+	}
+	if sourceURL == "" {
+		telegram.ReplyMessage(bot, message, "不支持的链接")
+		return
+	}
+	artwork, _ := service.GetArtworkByURL(ctx, sourceURL)
+	if artwork != nil {
+		telegram.ReplyMessage(bot, message, "作品已存在")
+		return
+	}
+	msg, err := telegram.ReplyMessage(bot, message, "正在发布...")
+	if err == nil && msg != nil {
+		defer bot.DeleteMessage(telegoutil.Delete(msg.Chat.ChatID(), msg.MessageID))
+	}
+	cachedArtwork, err := service.GetCachedArtworkByURL(ctx, sourceURL)
+	if err != nil {
+		artwork, err = sources.GetArtworkInfo(sourceURL)
+		if err != nil {
+			Logger.Errorf("获取作品信息失败: %s", err)
+			telegram.ReplyMessage(bot, message, "获取作品信息失败: "+err.Error())
+			return
+		}
+	} else {
+		artwork = cachedArtwork.Artwork
+	}
+	if err := fetcher.PostAndCreateArtwork(ctx, artwork, bot, storage.GetStorage(), message.Chat.ID); err != nil {
+		telegram.ReplyMessage(bot, message, "发布失败: "+err.Error())
+		return
+	}
+	artwork, err = service.GetArtworkByURL(ctx, sourceURL)
+	if err != nil {
+		telegram.ReplyMessage(bot, message, "获取发布后的作品信息失败: "+err.Error())
+		return
+	}
+	bot.SendMessage(telegoutil.Message(telegoutil.ID(message.Chat.ID), "发布成功: "+artwork.Title).
+		WithReplyParameters(&telego.ReplyParameters{
+			ChatID:    message.Chat.ChatID(),
+			MessageID: message.MessageID,
+		},
+		).WithReplyMarkup(telegram.GetPostedPictureReplyMarkup(artwork.Pictures[0])))
+}
+
 func processPictures(ctx context.Context, bot *telego.Bot, message telego.Message) {
 	userAdmin, err := service.GetAdminByUserID(ctx, message.From.ID)
 	if err != nil {

cmd/version.go

@@ -7,7 +7,7 @@ import (
 )
 
 const (
-	Version string = "0.8.0"
+	Version string = "0.8.1"
 )
 
 var VersionCmd = &cobra.Command{

common/os.go

@@ -9,6 +9,7 @@ import (
 	. "ManyACG/logger"
 )
 
+// 创建文件, 自动创建目录
 func MkFile(path string, data []byte) error {
 	err := os.MkdirAll(filepath.Dir(path), os.ModePerm)
 	if err != nil {
@@ -17,6 +18,11 @@ func MkFile(path string, data []byte) error {
 	return os.WriteFile(path, data, os.ModePerm)
 }
 
+func FileExists(path string) bool {
+	_, err := os.Stat(path)
+	return err == nil
+}
+
 // 删除文件, 并清理空目录. 如果文件不存在则返回 nil
 func PurgeFile(path string) error {
 	if err := os.Remove(path); err != nil {

telegram/telegram.go

@@ -84,6 +84,10 @@ var (
 			Command:     "fetch",
 			Description: "开始一次拉取",
 		},
+		{
+			Command:     "post",
+			Description: "发布作品 <url>",
+		},
 		{
 			Command:     "process_pictures",
 			Description: "处理无哈希的图片",