fix: sticker metadata rendering failures due to corrupted EXIF chunk lengths

This commit is contained in:
Fd
2026-07-15 14:57:06 +07:00
parent 1e4c08d3af
commit 4711063715
+51 -35
View File
@@ -4,6 +4,7 @@ import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"log" "log"
"math/big"
"os" "os"
"path/filepath" "path/filepath"
"strings" "strings"
@@ -20,19 +21,61 @@ type exifData struct {
type webpExif struct { type webpExif struct {
AppId string `json:"app-id"` AppId string `json:"app-id"`
Ext exifData `json:"ext"` Ext *exifData `json:"ext,omitempty"`
}
// Added matching writeUIntLE from F-BOT_GO reference
func writeUIntLE(buffer []byte, value, offset, byteLength int64) {
slice := make([]byte, byteLength)
val := new(big.Int)
val.SetUint64(uint64(value))
valBytes := val.Bytes()
tmp := make([]byte, len(valBytes))
for i := range valBytes {
tmp[i] = valBytes[len(valBytes)-1-i]
}
copy(slice, tmp)
copy(buffer[offset:], slice)
}
func createMetadataBytes(packName, publisher string) []byte {
exifObj := webpExif{
AppId: "com.whatsapp.app",
Ext: &exifData{
StickerPackId: "com.whatsapp.app",
StickerPackName: packName,
StickerPackPublisher: publisher,
IsAvatarSticker: 0,
},
}
exifJson, err := json.Marshal(exifObj)
if err != nil {
log.Printf("Failed to marshal EXIF: %v", err)
return nil
}
// WebP EXIF JSON string representation inside the file
bit := []byte{0x49, 0x49, 0x2A, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01, 0x00, 0x41, 0x57, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00}
bit = append(bit, exifJson...)
// Crucial fix: Inject JSON string length at offset 14 (4 bytes)
writeUIntLE(bit, int64(len(exifJson)), 14, 4)
return bit
} }
func getOrCreateDefaultExif() string { func getOrCreateDefaultExif() string {
defaultExifPath := "temp/default.exif" defaultExifPath := "temp/default.exif"
// Create temp directory if it doesn't exist
if err := os.MkdirAll("temp", 0755); err != nil { if err := os.MkdirAll("temp", 0755); err != nil {
log.Printf("Failed to create temp directory: %v", err) log.Printf("Failed to create temp directory: %v", err)
return "" return ""
} }
if _, err := os.Stat(defaultExifPath); os.IsNotExist(err) { // ALWAYS recreate temp/default.exif just in case previous boots were corrupted
// This corrects broken instances locally instantly
packName := os.Getenv("STICKER_NAME") packName := os.Getenv("STICKER_NAME")
if packName == "" { if packName == "" {
packName = "Bot" packName = "Bot"
@@ -43,30 +86,16 @@ func getOrCreateDefaultExif() string {
publisher = "Bot" publisher = "Bot"
} }
exifObj := webpExif{ exifContent := createMetadataBytes(packName, publisher)
AppId: "com.whatsapp.app", if exifContent == nil {
Ext: exifData{
StickerPackId: "com.whatsapp.app",
StickerPackName: packName,
StickerPackPublisher: publisher,
IsAvatarSticker: 0,
},
}
exifJson, err := json.Marshal(exifObj)
if err != nil {
log.Printf("Failed to marshal default EXIF: %v", err)
return "" return ""
} }
// WebP EXIF JSON string representation inside the file
exifContent := append([]byte{0x49, 0x49, 0x2A, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01, 0x00, 0x41, 0x57, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00}, exifJson...)
if err := os.WriteFile(defaultExifPath, exifContent, 0644); err != nil { if err := os.WriteFile(defaultExifPath, exifContent, 0644); err != nil {
log.Printf("Failed to write default EXIF: %v", err) log.Printf("Failed to write default EXIF: %v", err)
return "" return ""
} }
}
return defaultExifPath return defaultExifPath
} }
@@ -88,24 +117,11 @@ func ResolveExif(args []string) (string, bool) {
return getOrCreateDefaultExif(), false return getOrCreateDefaultExif(), false
} }
exifObj := webpExif{ exifContent := createMetadataBytes(packName, publisher)
AppId: "com.whatsapp.app", if exifContent == nil {
Ext: exifData{
StickerPackId: "com.whatsapp.app",
StickerPackName: packName,
StickerPackPublisher: publisher,
IsAvatarSticker: 0,
},
}
exifJson, err := json.Marshal(exifObj)
if err != nil {
log.Printf("Failed to marshal dynamic EXIF: %v", err)
return getOrCreateDefaultExif(), false return getOrCreateDefaultExif(), false
} }
exifContent := append([]byte{0x49, 0x49, 0x2A, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01, 0x00, 0x41, 0x57, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00}, exifJson...)
id := uuid.New().String() id := uuid.New().String()
tempPath := filepath.Join("temp", fmt.Sprintf("%s.exif", id)) tempPath := filepath.Join("temp", fmt.Sprintf("%s.exif", id))