iartamonov/mautrix-telegram
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

imagepack: populate cache when importing pack

Browse Source
This commit is contained in:
Tulir Asokan
2026-04-29 16:18:52 +03:00
parent c78b1abd2d
commit 64d80c3d1d
1 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/connector/imagepack.go
+21 -10
View File
@@ -450,16 +450,16 @@ func (tc *TelegramClient) fnDownloadEmojiPack(ce *commands.Event) {
ce.Reply("Can't bridge image packs if personal filtering spaces are disabled") ce.Reply("Can't bridge image packs if personal filtering spaces are disabled")
return return
} }
var input tg.InputStickerSetClass var shortName string
if match := addStickersRegex.FindStringSubmatch(ce.Args[0]); match != nil { if match := addStickersRegex.FindStringSubmatch(ce.Args[0]); match != nil {
input = &tg.InputStickerSetShortName{ShortName: match[1]} shortName = match[1]
} else if packShortcodeRegex.MatchString(ce.Args[0]) { } else if packShortcodeRegex.MatchString(ce.Args[0]) {
input = &tg.InputStickerSetShortName{ShortName: ce.Args[0]} shortName = ce.Args[0]
} else { } else {
ce.Reply("Invalid pack shortcode or link") ce.Reply("Invalid pack shortcode or link")
return return
} }
rawSet, err := tc.client.API().MessagesGetStickerSet(ce.Ctx, &tg.MessagesGetStickerSetRequest{Stickerset: input}) rawSet, err := tc.client.API().MessagesGetStickerSet(ce.Ctx, &tg.MessagesGetStickerSetRequest{Stickerset: &tg.InputStickerSetShortName{ShortName: shortName}})
if err != nil { if err != nil {
ce.Reply("Failed to get sticker set: %v", err) ce.Reply("Failed to get sticker set: %v", err)
return return
@@ -469,6 +469,7 @@ func (tc *TelegramClient) fnDownloadEmojiPack(ce *commands.Event) {
ce.Reply("Unexpected response type: %T", rawSet) ce.Reply("Unexpected response type: %T", rawSet)
return return
} }
tc.addStickerPackToCache(set, true)
linkType := "addstickers" linkType := "addstickers"
usage := event.ImagePackUsageSticker usage := event.ImagePackUsageSticker
if set.Set.Emojis { if set.Set.Emojis {
@@ -510,6 +511,7 @@ func (tc *TelegramClient) fnDownloadEmojiPack(ce *commands.Event) {
evtID := ce.React("\u23f3\ufe0f") evtID := ce.React("\u23f3\ufe0f")
defer redactReaction(ce, evtID) defer redactReaction(ce, evtID)
for i, rawDoc := range set.Documents { for i, rawDoc := range set.Documents {
// TODO use direct media
mxc, _, info, err := media.NewTransferer(tc.client.API()). mxc, _, info, err := media.NewTransferer(tc.client.API()).
WithStickerConfig(tc.main.Config.AnimatedSticker). WithStickerConfig(tc.main.Config.AnimatedSticker).
WithForceWebmStickerConvert(set.Set.Emojis). WithForceWebmStickerConvert(set.Set.Emojis).
@@ -665,16 +667,25 @@ func (tc *TelegramClient) GetCachedStickerPack(ctx context.Context, shortName st
} }
return nil, fmt.Errorf("unexpected response type for MessagesGetStickerSet: %T", resp) return nil, fmt.Errorf("unexpected response type for MessagesGetStickerSet: %T", resp)
} }
cache = &stickerPackCache{ cache = tc.addStickerPackToCache(set, false)
docs: set.MapDocuments().DocumentToMap(),
meta: set.Set,
}
tc.stickerPacksByName[strings.ToLower(set.Set.ShortName)] = cache
tc.stickerPacksByID[set.Set.ID] = cache
} }
return cache, nil return cache, nil
} }
func (tc *TelegramClient) addStickerPackToCache(set *tg.MessagesStickerSet, lock bool) *stickerPackCache {
if lock {
tc.stickerPackCacheLock.Lock()
defer tc.stickerPackCacheLock.Unlock()
}
cache := &stickerPackCache{
docs: set.MapDocuments().DocumentToMap(),
meta: set.Set,
}
tc.stickerPacksByName[strings.ToLower(set.Set.ShortName)] = cache
tc.stickerPacksByID[set.Set.ID] = cache
return cache
}
func (tc *TelegramClient) findOriginalStickerDocument(ctx context.Context, meta *event.BridgedSticker, forceClearCache bool) (tg.InputMediaClass, error) { func (tc *TelegramClient) findOriginalStickerDocument(ctx context.Context, meta *event.BridgedSticker, forceClearCache bool) (tg.InputMediaClass, error) {
if meta == nil || !strings.HasPrefix(meta.PackURL, StickerPackURLPrefix) { if meta == nil || !strings.HasPrefix(meta.PackURL, StickerPackURLPrefix) {
return nil, nil return nil, nil