1 files changed, 60 insertions, 11 deletions

diff --git a/internal/db/bundb/mention.go b/internal/db/bundb/mention.go
index 3a543f3c2..e64d6dac4 100644
--- a/internal/db/bundb/mention.go
+++ b/internal/db/bundb/mention.go
@@ -19,8 +19,10 @@ package bundb
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/superseriousbusiness/gotosocial/internal/db"
+	"github.com/superseriousbusiness/gotosocial/internal/gtscontext"
 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
 	"github.com/superseriousbusiness/gotosocial/internal/log"
 	"github.com/superseriousbusiness/gotosocial/internal/state"
@@ -32,20 +34,13 @@ type mentionDB struct {
 	state *state.State
 }
 
-func (m *mentionDB) newMentionQ(i interface{}) *bun.SelectQuery {
-	return m.conn.
-		NewSelect().
-		Model(i).
-		Relation("Status").
-		Relation("OriginAccount").
-		Relation("TargetAccount")
-}
-
 func (m *mentionDB) GetMention(ctx context.Context, id string) (*gtsmodel.Mention, db.Error) {
-	return m.state.Caches.GTS.Mention().Load("ID", func() (*gtsmodel.Mention, error) {
+	mention, err := m.state.Caches.GTS.Mention().Load("ID", func() (*gtsmodel.Mention, error) {
 		var mention gtsmodel.Mention
 
-		q := m.newMentionQ(&mention).
+		q := m.conn.
+			NewSelect().
+			Model(&mention).
 			Where("? = ?", bun.Ident("mention.id"), id)
 
 		if err := q.Scan(ctx); err != nil {
@@ -54,6 +49,38 @@ func (m *mentionDB) GetMention(ctx context.Context, id string) (*gtsmodel.Mentio
 
 		return &mention, nil
 	}, id)
+	if err != nil {
+		return nil, err
+	}
+
+	// Set the mention originating status.
+	mention.Status, err = m.state.DB.GetStatusByID(
+		gtscontext.SetBarebones(ctx),
+		mention.StatusID,
+	)
+	if err != nil {
+		return nil, fmt.Errorf("error populating mention status: %w", err)
+	}
+
+	// Set the mention origin account model.
+	mention.OriginAccount, err = m.state.DB.GetAccountByID(
+		gtscontext.SetBarebones(ctx),
+		mention.OriginAccountID,
+	)
+	if err != nil {
+		return nil, fmt.Errorf("error populating mention origin account: %w", err)
+	}
+
+	// Set the mention target account model.
+	mention.TargetAccount, err = m.state.DB.GetAccountByID(
+		gtscontext.SetBarebones(ctx),
+		mention.TargetAccountID,
+	)
+	if err != nil {
+		return nil, fmt.Errorf("error populating mention target account: %w", err)
+	}
+
+	return mention, nil
 }
 
 func (m *mentionDB) GetMentions(ctx context.Context, ids []string) ([]*gtsmodel.Mention, db.Error) {
@@ -73,3 +100,25 @@ func (m *mentionDB) GetMentions(ctx context.Context, ids []string) ([]*gtsmodel.
 
 	return mentions, nil
 }
+
+func (m *mentionDB) PutMention(ctx context.Context, mention *gtsmodel.Mention) error {
+	return m.state.Caches.GTS.Mention().Store(mention, func() error {
+		_, err := m.conn.NewInsert().Model(mention).Exec(ctx)
+		return m.conn.ProcessError(err)
+	})
+}
+
+func (m *mentionDB) DeleteMentionByID(ctx context.Context, id string) error {
+	if _, err := m.conn.
+		NewDelete().
+		Table("mentions").
+		Where("? = ?", bun.Ident("id"), id).
+		Exec(ctx); err != nil {
+		return m.conn.ProcessError(err)
+	}
+
+	// Invalidate mention from the lookup cache.
+	m.state.Caches.GTS.Mention().Invalidate("ID", id)
+
+	return nil
+}