feat: support expandalbe quote

其实没支持, 我也不知道为什么它发出去之后就是折叠不了的

Author: krau

bot/bot.go

@@ -15,7 +15,7 @@ func RunPolling() {
 	}
 	Logger.Info("Start polling")
 	updates, err := telegram.Bot.UpdatesViaLongPolling(&telego.GetUpdatesParams{
-		Offset: -1,
+		Offset: -100,
 		AllowedUpdates: []string{
 			telego.MessageUpdates,
 			telego.ChannelPostUpdates,

bot/handlers_admin.go

@@ -411,8 +411,8 @@ func setArtworkTags(ctx context.Context, bot *telego.Bot, message telego.Message
 	bot.EditMessageCaption(&telego.EditMessageCaptionParams{
 		ChatID:    telegram.ChannelChatID,
 		MessageID: artwork.Pictures[0].TelegramInfo.MessageID,
-		Caption:   telegram.GetArtworkMarkdownCaption(artwork),
-		ParseMode: telego.ModeMarkdownV2,
+		Caption:   telegram.GetArtworkHTMLCaption(artwork),
+		ParseMode: telego.ModeHTML,
 	})
 	telegram.ReplyMessage(bot, message, "更新作品标签成功")
 }

bot/handlers_common.go

@@ -297,15 +297,14 @@ func getArtworkInfo(ctx context.Context, bot *telego.Bot, message telego.Message
 
 	photo := telegoutil.Photo(message.Chat.ChatID(), inputFile).
 		WithReplyParameters(&telego.ReplyParameters{MessageID: message.MessageID}).
-		WithParseMode(telego.ModeMarkdownV2)
+		WithParseMode(telego.ModeHTML)
 
 	deletedModel, _ := service.GetDeletedByURL(ctx, sourceURL)
-	artworkInfoCaption := telegram.GetArtworkMarkdownCaption(artwork)
+	artworkInfoCaption := telegram.GetArtworkHTMLCaption(artwork)
 	if deletedModel != nil && hasPermission {
-		photo.WithCaption(artworkInfoCaption + common.EscapeMarkdown(fmt.Sprintf("\n\n这是一个在 %s 删除的作品\n\n"+
-			"如果发布则会取消删除", deletedModel.DeletedAt.Time().Format("2006-01-02 15:04:05"))))
+		photo.WithCaption(artworkInfoCaption + fmt.Sprintf("\n\n这是一个在 %s 删除的作品\n如果发布则会取消删除", deletedModel.DeletedAt.Time().Format("2006-01-02 15:04:05")))
 	} else {
-		photo.WithCaption(telegram.GetArtworkMarkdownCaption(artwork))
+		photo.WithCaption(artworkInfoCaption)
 	}
 	if isAlreadyPosted {
 		photo.WithReplyMarkup(telegram.GetPostedPictureReplyMarkup(artwork.Pictures[0]))

cmd/version.go

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

common/strings.go

@@ -29,6 +29,14 @@ func EscapeMarkdown(text string) string {
 	return re.ReplaceAllString(text, "\\$1")
 }
 
+func EscapeHTML(text string) string {
+	return strings.NewReplacer(
+		"<", "&lt;",
+		">", "&gt;",
+		"&", "&amp;",
+	).Replace(text)
+}
+
 // 解析字符串为二维数组, 如果以字符串以引号包裹, 则无视分隔符
 //
 // ParseStringTo2DArray("1,2,3;4,5,6", ",", ";") => [][]string{{"1", "2", "3"}, {"4", "5", "6"}}

go.mod

@@ -1,6 +1,6 @@
 module ManyACG
 
-go 1.22.2
+go 1.22.3
 
 require (
 	github.com/blang/semver v3.5.1+incompatible
@@ -18,12 +18,12 @@ require (
 
 require (
 	github.com/andybalholm/brotli v1.1.0 // indirect
-	github.com/bytedance/sonic v1.11.6 // indirect
+	github.com/bytedance/sonic v1.11.8 // indirect
 	github.com/bytedance/sonic/loader v0.1.1 // indirect
 	github.com/cloudflare/circl v1.3.8 // indirect
 	github.com/cloudwego/base64x v0.1.4 // indirect
 	github.com/cloudwego/iasm v0.2.0 // indirect
-	github.com/fasthttp/router v1.5.0 // indirect
+	github.com/fasthttp/router v1.5.1 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.3 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
@@ -58,7 +58,7 @@ require (
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.12 // indirect
 	github.com/ulikunitz/xz v0.5.12 // indirect
-	github.com/valyala/fasthttp v1.52.0 // indirect
+	github.com/valyala/fasthttp v1.54.0 // indirect
 	github.com/valyala/fastjson v1.6.4 // indirect
 	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
 	github.com/xdg-go/scram v1.1.2 // indirect
@@ -83,7 +83,7 @@ require (
 	github.com/imroc/req/v3 v3.43.4
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
-	github.com/mymmrac/telego v0.29.2
+	github.com/mymmrac/telego v0.30.2
 	github.com/pelletier/go-toml/v2 v2.2.2 // indirect
 	github.com/sagikazarmark/locafero v0.4.0 // indirect
 	github.com/sagikazarmark/slog-shim v0.1.0 // indirect

go.sum

@@ -2,8 +2,8 @@ github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1
 github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY=
 github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ=
 github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
-github.com/bytedance/sonic v1.11.6 h1:oUp34TzMlL+OY1OUWxHqsdkgC/Zfc85zGqw9siXjrc0=
-github.com/bytedance/sonic v1.11.6/go.mod h1:LysEHSvpvDySVdC2f87zGWf6CIKJcAvqab1ZaiQtds4=
+github.com/bytedance/sonic v1.11.8 h1:Zw/j1KfiS+OYTi9lyB3bb0CFxPJVkM17k1wyDG32LRA=
+github.com/bytedance/sonic v1.11.8/go.mod h1:LysEHSvpvDySVdC2f87zGWf6CIKJcAvqab1ZaiQtds4=
 github.com/bytedance/sonic/loader v0.1.1 h1:c+e5Pt1k/cy5wMveRDyk2X4B9hF4g7an8N3zCYjJFNM=
 github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
 github.com/cloudflare/circl v1.3.8 h1:j+V8jJt09PoeMFIu2uh5JUyEaIHTXVOHslFoLNAKqwI=
@@ -19,8 +19,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/fasthttp/router v1.5.0 h1:3Qbbo27HAPzwbpRzgiV5V9+2faPkPt3eNuRaDV6LYDA=
-github.com/fasthttp/router v1.5.0/go.mod h1:FddcKNXFZg1imHcy+uKB0oo/o6yE9zD3wNguqlhWDak=
+github.com/fasthttp/router v1.5.1 h1:uViy8UYYhm5npJSKEZ4b/ozM//NGzVCfJbh6VJ0VKr8=
+github.com/fasthttp/router v1.5.1/go.mod h1:WrmsLo3mrerZP2VEXRV1E8nL8ymJFYCDTr4HmnB8+Zs=
 github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
 github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
@@ -117,8 +117,8 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/montanaflynn/stats v0.7.1 h1:etflOAAHORrCC44V+aR6Ftzort912ZU+YLiSTuV8eaE=
 github.com/montanaflynn/stats v0.7.1/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow=
-github.com/mymmrac/telego v0.29.2 h1:5+fQ/b8d8Ld6ihCJ0OLe1CwUdT3t1sIUl3RaSaSvRJs=
-github.com/mymmrac/telego v0.29.2/go.mod h1:BsKr+GF9BHqaVaLBwsZeDnfuJcJx2olWuDEtKm4zHMc=
+github.com/mymmrac/telego v0.30.2 h1:CqGlqX0hkgz9qMwdA3q+aZtSonqMOKQQrFLn/oUOTaw=
+github.com/mymmrac/telego v0.30.2/go.mod h1:U6cWJBgRCzGt+s0q77x/Dh2+i+u56VTAAYKlMenhuFc=
 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ=
 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
@@ -188,8 +188,8 @@ github.com/ulikunitz/xz v0.5.12 h1:37Nm15o69RwBkXM0J6A5OlE67RZTfzUxTj8fB3dfcsc=
 github.com/ulikunitz/xz v0.5.12/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
-github.com/valyala/fasthttp v1.52.0 h1:wqBQpxH71XW0e2g+Og4dzQM8pk34aFYlA1Ga8db7gU0=
-github.com/valyala/fasthttp v1.52.0/go.mod h1:hf5C4QnVMkNXMspnsUlfM3WitlgYflyhHYoKol/szxQ=
+github.com/valyala/fasthttp v1.54.0 h1:cCL+ZZR3z3HPLMVfEYVUMtJqVaui0+gu7Lx63unHwS0=
+github.com/valyala/fasthttp v1.54.0/go.mod h1:6dt4/8olwq9QARP/TDuPmWyWcl4byhpvTJ4AAtcz+QM=
 github.com/valyala/fastjson v1.6.4 h1:uAUNq9Z6ymTgGhcm0UynUAB6tlbakBrz6CQFax3BXVQ=
 github.com/valyala/fastjson v1.6.4/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLrsQns1aXY=
 github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c=

sources/pixiv/types.go

@@ -137,7 +137,7 @@ func (resp *PixivAjaxResp) ToArtwork() (*types.Artwork, error) {
 	}
 	return &types.Artwork{
 		Title:       resp.Body.IlustTitle,
-		Description: htmlRe.ReplaceAllString(resp.Body.Description, ""),
+		Description: htmlRe.ReplaceAllString(strings.ReplaceAll(resp.Body.Description, "<br />", "\n"), ""),
 		R18:         r18,
 		SourceType:  types.SourceTypePixiv,
 		SourceURL:   "https://www.pixiv.net/artworks/" + resp.Body.IllustId,

telegram/artwork.go

@@ -39,7 +39,7 @@ func PostArtwork(bot *telego.Bot, artwork *types.Artwork, storage storage.Storag
 		}
 		photo := telegoutil.MediaPhoto(telegoutil.File(telegoutil.NameReader(bytes.NewReader(fileBytes), picture.StorageInfo.Path)))
 		if i == 0 {
-			photo = photo.WithCaption(GetArtworkMarkdownCaption(artwork)).WithParseMode(telego.ModeMarkdownV2)
+			photo = photo.WithCaption(GetArtworkHTMLCaption(artwork)).WithParseMode(telego.ModeHTML)
 		}
 		if artwork.R18 {
 			photo = photo.WithHasSpoiler()

telegram/utils.go

@@ -105,12 +105,8 @@ func GetArtworkMarkdownCaption(artwork *types.Artwork) string {
 	caption := fmt.Sprintf("[*%s*](%s)", common.EscapeMarkdown(artwork.Title), artwork.SourceURL)
 	caption += "\n" + "*Author:* " + common.EscapeMarkdown(artwork.Artist.Name)
 	if artwork.Description != "" {
-		desc := strings.ReplaceAll(artwork.Description, "\n", " ")
-		if len(desc) > 500 {
-			caption += "\n\n>" + common.EscapeMarkdown(desc) + "\\.\\.\\."
-		} else {
-			caption += "\n\n>" + common.EscapeMarkdown(desc)
-		}
+		desc := strings.ReplaceAll(artwork.Description, "\n", "\n>")
+		caption += "\n\n>" + common.EscapeMarkdown(desc)
 	}
 	tags := ""
 	for _, tag := range artwork.Tags {
@@ -123,6 +119,23 @@ func GetArtworkMarkdownCaption(artwork *types.Artwork) string {
 	return caption
 }
 
+func GetArtworkHTMLCaption(artwork *types.Artwork) string {
+	caption := fmt.Sprintf("<a href=\"%s\"><b>%s</b></a>", artwork.SourceURL, common.EscapeHTML(artwork.Title))
+	caption += "\n" + "<b>Author:</b> " + common.EscapeHTML(artwork.Artist.Name)
+	if artwork.Description != "" {
+		caption += fmt.Sprintf("\n\n<blockquote expandable=true>%s</blockquote>", common.EscapeHTML(artwork.Description))
+	}
+	tags := ""
+	for _, tag := range artwork.Tags {
+		tag = ReplaceChars(tag, []string{":", "：", "-", "（", "）", "「", "」", "*"}, "_")
+		tag = ReplaceChars(tag, []string{"?"}, "")
+		tag = ReplaceChars(tag, []string{"/"}, " "+"#")
+		tags += "#" + strings.Join(strings.Split(common.EscapeHTML(tag), " "), "") + " "
+	}
+	caption += "\n\n" + tags
+	return caption
+}
+
 func ReplyMessage(bot *telego.Bot, message telego.Message, text string) (*telego.Message, error) {
 	return bot.SendMessage(telegoutil.Message(message.Chat.ChatID(), text).
 		WithReplyParameters(&telego.ReplyParameters{