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

commands/imagepack: deduplicate mxcs in same pack

Browse Source
This commit is contained in:
Tulir Asokan
2026-03-29 22:12:23 +03:00
parent 58d99a806a
commit a5a3b9f380
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/connector/imagepack.go
+8 -6
View File
@@ -357,21 +357,23 @@ func (t *TelegramClient) synchronizeEmojiPack(ctx context.Context, ce *commands.
ID: set.Set.ID, ID: set.Set.ID,
AccessHash: set.Set.AccessHash, AccessHash: set.Set.AccessHash,
} }
existingMXCs := make(map[id.ContentURIString]*tg.InputDocument, len(set.Documents)) deletedMXCs := make(map[id.ContentURIString]*tg.InputDocument, len(set.Documents))
existingMXCs := make(exmaps.Set[id.ContentURIString], len(set.Documents))
for _, doc := range set.Documents { for _, doc := range set.Documents {
file, err := t.main.Store.TelegramFile.GetByLocationID(ctx, store.TelegramFileLocationID(strconv.FormatInt(doc.GetID(), 10))) file, err := t.main.Store.TelegramFile.GetByLocationID(ctx, store.TelegramFileLocationID(strconv.FormatInt(doc.GetID(), 10)))
if err != nil { if err != nil {
return "", fmt.Errorf("failed to get cached file for doc %d: %w", doc.GetID(), err) return "", fmt.Errorf("failed to get cached file for doc %d: %w", doc.GetID(), err)
} else if file != nil { } else if file != nil {
existingMXCs[file.MXC] = doc.(*tg.Document).AsInput() deletedMXCs[file.MXC] = doc.(*tg.Document).AsInput()
existingMXCs.Add(file.MXC)
} }
} }
for shortcode, img := range pack.Images { for shortcode, img := range pack.Images {
_, exists := existingMXCs[img.URL] if existingMXCs.Has(img.URL) {
if exists { delete(deletedMXCs, img.URL)
delete(existingMXCs, img.URL)
continue continue
} }
existingMXCs.Add(img.URL)
item, saveCache, err := t.synchronizeEmoji(ctx, shortcode, img, isEmojiPack) item, saveCache, err := t.synchronizeEmoji(ctx, shortcode, img, isEmojiPack)
if err != nil { if err != nil {
ce.Reply("Failed to reupload %s: %v", shortcode, err) ce.Reply("Failed to reupload %s: %v", shortcode, err)
@@ -391,7 +393,7 @@ func (t *TelegramClient) synchronizeEmojiPack(ctx context.Context, ce *commands.
} }
rawSet = rawNewSet rawSet = rawNewSet
} }
for mxc, inputDoc := range existingMXCs { for mxc, inputDoc := range deletedMXCs {
_, err = t.client.API().StickersRemoveStickerFromSet(ctx, inputDoc) _, err = t.client.API().StickersRemoveStickerFromSet(ctx, inputDoc)
if err != nil { if err != nil {
return "", fmt.Errorf("failed to remove %s/%d from set: %w", mxc, inputDoc.ID, err) return "", fmt.Errorf("failed to remove %s/%d from set: %w", mxc, inputDoc.ID, err)