pkg/msgconv/from-signal.go

@@ -502,11 +502,6 @@ func (mc *MessageConverter) convertAttachmentToMatrix(ctx context.Context, index
 
 func (mc *MessageConverter) convertStickerToMatrix(ctx context.Context, sticker *signalpb.DataMessage_Sticker, attMap AttachmentMap) *bridgev2.ConvertedMessagePart {
 	converted, err := mc.reuploadAttachment(ctx, sticker.GetData(), attMap)
-	hasPack := len(sticker.GetPackId()) == PackIDLength && len(sticker.GetPackKey()) == PackKeyLength && !bytes.Equal(sticker.GetPackId(), zeroPackID)
-	if err != nil && hasPack && (errors.Is(err, signalmeow.ErrAttachmentNotFound) || errors.Is(err, ErrAttachmentNotInBackup) || errors.Is(err, ErrBackupNotSupported)) {
-		zerolog.Ctx(ctx).Debug().Err(err).Msg("Sticker attachment is unavailable, downloading it from the sticker pack")
-		converted, err = mc.reuploadStickerFromPack(ctx, sticker)
-	}
 	if err != nil {
 		zerolog.Ctx(ctx).Err(err).Msg("Failed to handle sticker")
 		return &bridgev2.ConvertedMessagePart{
@@ -524,7 +519,7 @@ func (mc *MessageConverter) convertStickerToMatrix(ctx context.Context, sticker
 		converted.Content.Info.Height = 200
 	}
 	converted.Content.Body = sticker.GetEmoji()
-	if hasPack {
+	if len(sticker.GetPackId()) == PackIDLength && len(sticker.GetPackKey()) == PackKeyLength && !bytes.Equal(sticker.GetPackId(), zeroPackID) {
 		converted.Content.Info.BridgedSticker = &event.BridgedSticker{
 			Network: StickerSourceID,
 			ID:      strconv.FormatUint(uint64(sticker.GetStickerId()), 10),
@@ -537,49 +532,6 @@ func (mc *MessageConverter) convertStickerToMatrix(ctx context.Context, sticker
 	return converted
 }
 
-func (mc *MessageConverter) reuploadStickerFromPack(ctx context.Context, sticker *signalpb.DataMessage_Sticker) (*bridgev2.ConvertedMessagePart, error) {
-	att := sticker.GetData()
-	content := &event.MessageEventContent{
-		Body: att.GetFileName(),
-		Info: &event.FileInfo{
-			MimeType: att.GetContentType(),
-			Width:    int(att.GetWidth()),
-			Height:   int(att.GetHeight()),
-		},
-	}
-	if mc.DirectMedia {
-		mediaID, err := signalid.DirectMediaSticker{
-			PackID:    sticker.GetPackId(),
-			PackKey:   sticker.GetPackKey(),
-			StickerID: sticker.GetStickerId(),
-		}.AsMediaID()
-		if err != nil {
-			return nil, err
-		}
-		content.URL, content.File, err = mc.Bridge.GenerateContentURI(ctx, getPortal(ctx).MXID, mediaID)
-		if err != nil {
-			return nil, err
-		}
-	} else {
-		data, err := signalmeow.DownloadStickerPackItem(ctx, sticker.GetPackId(), sticker.GetPackKey(), sticker.GetStickerId())
-		if err != nil {
-			return nil, fmt.Errorf("failed to download sticker from pack: %w", err)
-		}
-		if content.Info.MimeType == "" {
-			content.Info.MimeType = http.DetectContentType(data)
-		}
-		content.Info.Size = len(data)
-		content.URL, content.File, err = getIntent(ctx).UploadMedia(ctx, getPortal(ctx).MXID, data, content.Body, content.Info.MimeType)
-		if err != nil {
-			return nil, fmt.Errorf("failed to upload sticker from pack: %w", err)
-		}
-	}
-	return &bridgev2.ConvertedMessagePart{
-		Type:    event.EventMessage,
-		Content: content,
-	}, nil
-}
-
 func (mc *MessageConverter) downloadSignalLongText(ctx context.Context, att *signalpb.AttachmentPointer, attMap AttachmentMap) (*string, error) {
 	data, err := mc.downloadAttachment(ctx, att, attMap, nil)
 	if err != nil {