Attachments & Quotes に対応

docs/v3-api.yaml

@@ -72,6 +72,8 @@ paths:
         - $ref: "#/components/parameters/untilInQuery"
         - $ref: "#/components/parameters/inclusiveInQuery"
         - $ref: "#/components/parameters/orderInQuery"
+        - $ref: "#/components/parameters/includeAttachments"
+        - $ref: "#/components/parameters/includeQuotes"
       responses:
         "200":
           description: OK
@@ -8241,6 +8243,21 @@ components:
         type: boolean
       required: false
       description: 削除されたメッセージを除外するかどうか(デフォルト false)
+    includeAttachments:
+      in: query
+      name: include-attachments
+      schema:
+        type: boolean
+      required: false
+      description: 添付ファイルを含めるかどうか (デフォルト false)
+    includeQuotes:
+      in: query
+      name: include-quotes
+      schema:
+        type: boolean
+      required: false
+      description: 引用メッセージを含めるかどうか (デフォルト false)
+
 
 tags:
   - name: user

model/messages.go

@@ -23,6 +23,24 @@ type Message struct {
 	Pin     *Pin           `gorm:"constraint:pins_message_id_messages_id_foreign,OnUpdate:CASCADE,OnDelete:CASCADE"`
 }
 
+type MessageNew struct {
+	ID        uuid.UUID      `gorm:"type:char(36);not null;primaryKey"`
+	UserID    uuid.UUID      `gorm:"type:char(36);not null;"`
+	ChannelID uuid.UUID      `gorm:"type:char(36);not null;index:idx_messages_channel_id_deleted_at_created_at,priority:1"`
+	Text      string         `gorm:"type:TEXT COLLATE utf8mb4_bin NOT NULL"`
+	CreatedAt time.Time      `gorm:"precision:6;index;index:idx_messages_channel_id_deleted_at_created_at,priority:3;index:idx_messages_deleted_at_created_at,priority:2"`
+	UpdatedAt time.Time      `gorm:"precision:6;index:idx_messages_deleted_at_updated_at,priority:2"`
+	DeletedAt gorm.DeletedAt `gorm:"precision:6;index:idx_messages_channel_id_deleted_at_created_at,priority:2;index:idx_messages_deleted_at_created_at,priority:1;index:idx_messages_deleted_at_updated_at,priority:1"`
+
+	User    *User          `gorm:"constraint:messages_user_id_users_id_foreign,OnUpdate:CASCADE,OnDelete:CASCADE"`
+	Channel *Channel       `gorm:"constraint:messages_channel_id_channels_id_foreign,OnUpdate:CASCADE,OnDelete:CASCADE"`
+	Stamps  []MessageStamp `gorm:"constraint:messages_stamps_message_id_messages_id_foreign,OnUpdate:CASCADE,OnDelete:CASCADE;foreignkey:MessageID"`
+	Pin     *Pin           `gorm:"constraint:pins_message_id_messages_id_foreign,OnUpdate:CASCADE,OnDelete:CASCADE"`
+
+	Attachments []*FileMeta
+	Quotes      []*Message
+}
+
 // TableName DBの名前を指定するメソッド
 func (m Message) TableName() string {
 	return "messages"

repository/message.go

@@ -27,6 +27,9 @@ type MessagesQuery struct {
 	Asc                      bool
 	ExcludeDMs               bool
 	DisablePreload           bool
+	IncludeAttachments       bool
+	IncludeQuotes            bool
+	IncludeOGPs              bool
 }
 
 // ChannelLatestMessagesQuery GetChannelLatestMessages用クエリ

service/message/manager.go

@@ -46,7 +46,7 @@ type Manager interface {
 	//
 	// 成功した場合、メッセージとnilを返します。
 	// DBによるエラーを返すことがあります。
-	GetIn(ctx context.Context, ids []uuid.UUID) ([]Message, error)
+	GetIn(ctx context.Context, ids []uuid.UUID, ia bool, iq bool) ([]MessageNew, error)
 	// GetTimeline タイムラインを取得します
 	//
 	// 成功した場合、タイムラインとnilを返します。

service/message/manager_impl.go

@@ -14,6 +14,7 @@ import (
 	"github.com/traPtitech/traQ/repository"
 	"github.com/traPtitech/traQ/service/channel"
 	"github.com/traPtitech/traQ/utils"
+	messageParse "github.com/traPtitech/traQ/utils/message"
 	"github.com/traPtitech/traQ/utils/optional"
 )
 
@@ -64,13 +65,43 @@ func (m *manager) get(ctx context.Context, id uuid.UUID) (*message, error) {
 	return m.cache.Get(ctx, id)
 }
 
-func (m *manager) GetIn(ctx context.Context, ids []uuid.UUID) ([]Message, error) {
-	messages, _, err := m.R.GetMessages(ctx, repository.MessagesQuery{IDIn: optional.From(ids)})
+func (m *manager) GetIn(ctx context.Context, ids []uuid.UUID, ia bool, iq bool) ([]MessageNew, error) {
+	messages, _, err := m.R.GetMessages(ctx, repository.MessagesQuery{IDIn: optional.From(ids), IncludeAttachments: ia, IncludeQuotes: iq})
 	if err != nil {
 		return nil, err
 	}
-	ret := utils.Map(messages, func(m *model.Message) Message {
-		return &message{Model: m}
+	ret := utils.Map(messages, func(mm *model.Message) MessageNew {
+		parseResult := messageParse.Parse(mm.Text)
+		pRa := parseResult.Attachments
+		aR := []*model.FileMeta{}
+		for i := 0; i < len(pRa); i++ {
+			attachment, err := m.R.GetFileMeta(ctx, pRa[i])
+			if err != nil {
+				break
+			}
+			aR = append(aR, attachment)
+		}
+		pRc := parseResult.Citation
+		quotes, _, err := m.R.GetMessages(ctx, repository.MessagesQuery{IDIn: optional.From((pRc))})
+		if err != nil {
+			return nil
+		}
+		mn := &model.MessageNew{
+			ID:          mm.ID,
+			UserID:      mm.UserID,
+			ChannelID:   mm.ChannelID,
+			Text:        mm.Text,
+			CreatedAt:   mm.CreatedAt,
+			UpdatedAt:   mm.UpdatedAt,
+			DeletedAt:   mm.DeletedAt,
+			User:        mm.User,
+			Channel:     mm.Channel,
+			Stamps:      mm.Stamps,
+			Pin:         mm.Pin,
+			Attachments: aR,
+			Quotes:      quotes,
+		}
+		return &messageNew{Model: mn}
 	})
 	return ret, nil
 }

service/message/model.go

@@ -21,3 +21,18 @@
 
 	json.Marshaler
 }
+
+type MessageNew interface {
+	GetID() uuid.UUID
+	GetUserID() uuid.UUID
+	GetChannelID() uuid.UUID
+	GetText() string
+	GetCreatedAt() time.Time
+	GetUpdatedAt() time.Time
+	GetStamps() []model.MessageStamp
+	GetPin() *model.Pin
+	GetAttachments() []*model.FileMeta
+	GetQuotes() []*model.Message
+
+	json.Marshaler
+}

service/message/model_impl.go

@@ -21,42 +21,87 @@ type message struct {
 	sync.RWMutex
 }
 
+type messageNew struct {
+	Model *model.MessageNew
+
+	stampMap      map[uuid.UUID]map[uuid.UUID]model.MessageStamp
+	stampMapDirty bool
+
+	sync.RWMutex
+}
+
 func (m *message) GetID() uuid.UUID {
 	m.RLock()
 	defer m.RUnlock()
 	return m.Model.ID
 }
 
+func (m *messageNew) GetID() uuid.UUID {
+	m.RLock()
+	defer m.RUnlock()
+	return m.Model.ID
+}
+
 func (m *message) GetUserID() uuid.UUID {
 	m.RLock()
 	defer m.RUnlock()
 	return m.Model.UserID
 }
 
+func (m *messageNew) GetUserID() uuid.UUID {
+	m.RLock()
+	defer m.RUnlock()
+	return m.Model.UserID
+}
+
 func (m *message) GetChannelID() uuid.UUID {
 	m.RLock()
 	defer m.RUnlock()
 	return m.Model.ChannelID
 }
 
+func (m *messageNew) GetChannelID() uuid.UUID {
+	m.RLock()
+	defer m.RUnlock()
+	return m.Model.ChannelID
+}
+
 func (m *message) GetText() string {
 	m.RLock()
 	defer m.RUnlock()
 	return m.Model.Text
 }
 
+func (m *messageNew) GetText() string {
+	m.RLock()
+	defer m.RUnlock()
+	return m.Model.Text
+}
+
 func (m *message) GetCreatedAt() time.Time {
 	m.RLock()
 	defer m.RUnlock()
 	return m.Model.CreatedAt
 }
 
+func (m *messageNew) GetCreatedAt() time.Time {
+	m.RLock()
+	defer m.RUnlock()
+	return m.Model.CreatedAt
+}
+
 func (m *message) GetUpdatedAt() time.Time {
 	m.RLock()
 	defer m.RUnlock()
 	return m.Model.UpdatedAt
 }
 
+func (m *messageNew) GetUpdatedAt() time.Time {
+	m.RLock()
+	defer m.RUnlock()
+	return m.Model.UpdatedAt
+}
+
 func (m *message) GetStamps() []model.MessageStamp {
 	m.Lock()
 	defer m.Unlock()
@@ -76,6 +121,37 @@ func (m *message) GetStamps() []model.MessageStamp {
 	return result
 }
 
+func (m *messageNew) GetStamps() []model.MessageStamp {
+	m.Lock()
+	defer m.Unlock()
+	if !m.stampMapDirty {
+		return m.Model.Stamps
+	}
+
+	result := make([]model.MessageStamp, 0)
+	for _, us := range m.stampMap {
+		for _, ms := range us {
+			result = append(result, ms)
+		}
+	}
+
+	m.Model.Stamps = result
+	m.stampMapDirty = false
+	return result
+}
+
+func (m *messageNew) GetAttachments() []*model.FileMeta {
+	m.RLock()
+	defer m.RUnlock()
+	return m.Model.Attachments
+}
+
+func (m *messageNew) GetQuotes() []*model.Message {
+	m.RLock()
+	defer m.RUnlock()
+	return m.Model.Quotes
+}
+
 func (m *message) initStampMap() {
 	m.stampMap = map[uuid.UUID]map[uuid.UUID]model.MessageStamp{}
 	for _, ms := range m.Model.Stamps {
@@ -124,6 +200,12 @@ func (m *message) GetPin() *model.Pin {
 	return m.Model.Pin
 }
 
+func (m *messageNew) GetPin() *model.Pin {
+	m.RLock()
+	defer m.RUnlock()
+	return m.Model.Pin
+}
+
 func (m *message) MarshalJSON() ([]byte, error) {
 	type obj struct {
 		ID        uuid.UUID              `json:"id"`
@@ -151,3 +233,31 @@ func (m *message) MarshalJSON() ([]byte, error) {
 	m.RUnlock()
 	return jsonIter.ConfigFastest.Marshal(v)
 }
+
+func (m *messageNew) MarshalJSON() ([]byte, error) {
+	type obj struct {
+		ID        uuid.UUID              `json:"id"`
+		UserID    uuid.UUID              `json:"userId"`
+		ChannelID uuid.UUID              `json:"channelId"`
+		Content   string                 `json:"content"`
+		CreatedAt time.Time              `json:"createdAt"`
+		UpdatedAt time.Time              `json:"updatedAt"`
+		Pinned    bool                   `json:"pinned"`
+		Stamps    []model.MessageStamp   `json:"stamps"`
+		ThreadID  optional.Of[uuid.UUID] `json:"threadId"` // TODO
+	}
+	stamps := m.GetStamps()
+	m.RLock()
+	v := &obj{
+		ID:        m.Model.ID,
+		UserID:    m.Model.UserID,
+		ChannelID: m.Model.ChannelID,
+		Content:   m.Model.Text,
+		CreatedAt: m.Model.CreatedAt,
+		UpdatedAt: m.Model.UpdatedAt,
+		Pinned:    m.Model.Pin != nil,
+		Stamps:    stamps,
+	}
+	m.RUnlock()
+	return jsonIter.ConfigFastest.Marshal(v)
+}

service/search/es_result.go

@@ -57,12 +57,12 @@ func (e *esEngine) parseResultFromResponse(searchRes esSearchResponse) (Result,
 		return uuid.Must(uuid.FromString(hit.ID))
 	})
 
-	messages, err := e.mm.GetIn(context.Background(), messageIDs)
+	messages, err := e.mm.GetIn(context.Background(), messageIDs, true, true)
 	if err != nil {
 		return nil, err
 	}
 
-	messagesMap := lo.SliceToMap(messages, func(m message.Message) (uuid.UUID, message.Message) {
+	messagesMap := lo.SliceToMap(messages, func(m message.MessageNew) (uuid.UUID, message.Message) {
 		return m.GetID(), m
 	})
 	// sort result