Images Album (#3021)

* feat: add `AlbumID` field to messages

VERSION

@@ -1 +1 @@
-0.116.0
+0.117.0

protocol/common/message.go

@@ -160,6 +160,8 @@ type Message struct {
 	AudioPath string `json:"audioPath,omitempty"`
 	// ImageLocalURL is the local url of the image
 	ImageLocalURL string `json:"imageLocalUrl,omitempty"`
+	// AlbumID for a collage of images
+	AlbumID string `json:"albumId,omitempty"`
 	// AudioLocalURL is the local url of the audio
 	AudioLocalURL string `json:"audioLocalUrl,omitempty"`
 	// StickerLocalURL is the local url of the sticker
@@ -229,6 +231,7 @@ func (m *Message) MarshalJSON() ([]byte, error) {
 		EnsName                  string                           `json:"ensName"`
 		DisplayName              string                           `json:"displayName"`
 		Image                    string                           `json:"image,omitempty"`
+		AlbumID                  string                           `json:"albumId,omitempty"`
 		Audio                    string                           `json:"audio,omitempty"`
 		AudioDurationMs          uint64                           `json:"audioDurationMs,omitempty"`
 		CommunityID              string                           `json:"communityId,omitempty"`
@@ -269,6 +272,7 @@ func (m *Message) MarshalJSON() ([]byte, error) {
 		EnsName:                  m.EnsName,
 		DisplayName:              m.DisplayName,
 		Image:                    m.ImageLocalURL,
+		AlbumID:                  m.AlbumID,
 		Audio:                    m.AudioLocalURL,
 		CommunityID:              m.CommunityID,
 		Timestamp:                m.Timestamp,

protocol/message_persistence.go

@@ -64,6 +64,7 @@ func (db sqlitePersistence) tableUserMessagesAllFields() string {
 		sticker_hash,
 		image_payload,
 		image_type,
+		album_id,
 		image_base64,
 		audio_payload,
 		audio_type,
@@ -114,6 +115,7 @@ func (db sqlitePersistence) tableUserMessagesAllFieldsJoin() string {
 		m1.sticker_hash,
 		m1.image_payload,
 		m1.image_type,
+		m1.album_id,
 		COALESCE(m1.audio_duration_ms,0),
 		m1.community_id,
 		m1.mentions,
@@ -187,6 +189,7 @@ func (db sqlitePersistence) tableUserMessagesScanAllFields(row scanner, message
 	var alias sql.NullString
 	var identicon sql.NullString
 	var communityID sql.NullString
+	var albumID sql.NullString
 	var gapFrom sql.NullInt64
 	var gapTo sql.NullInt64
 	var editedAt sql.NullInt64
@@ -226,6 +229,7 @@ func (db sqlitePersistence) tableUserMessagesScanAllFields(row scanner, message
 		&sticker.Hash,
 		&image.Payload,
 		&image.Type,
+		&message.AlbumID,
 		&audio.DurationMs,
 		&communityID,
 		&serializedMentions,
@@ -325,6 +329,10 @@ func (db sqlitePersistence) tableUserMessagesScanAllFields(row scanner, message
 		message.CommunityID = communityID.String
 	}
 
+	if albumID.Valid {
+		message.AlbumID = albumID.String
+	}
+
 	if serializedMentions != nil {
 		err := json.Unmarshal(serializedMentions, &message.Mentions)
 		if err != nil {
@@ -442,6 +450,7 @@ func (db sqlitePersistence) tableUserMessagesAllValues(message *common.Message)
 		sticker.Hash,
 		image.Payload,
 		image.Type,
+		message.AlbumID,
 		message.Base64Image,
 		audio.Payload,
 		audio.Type,