Add preview card storing to the database

This commit is contained in:
kaimanhub 2025-03-30 20:24:15 +03:00
commit 6169351d22
12 changed files with 228 additions and 55 deletions

View file

@ -58,6 +58,7 @@ type DBService struct {
db.AdvancedMigration
db.Application
db.Basic
db.Card
db.Conversation
db.Domain
db.Emoji
@ -186,6 +187,10 @@ func NewBunDBService(ctx context.Context, state *state.State) (db.DB, error) {
Basic: &basicDB{
db: db,
},
Card: &cardDB{
db: db,
state: state,
},
Conversation: &conversationDB{
db: db,
state: state,

87
internal/db/bundb/card.go Normal file
View file

@ -0,0 +1,87 @@
// GoToSocial
// Copyright (C) GoToSocial Authors admin@gotosocial.org
// SPDX-License-Identifier: AGPL-3.0-or-later
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
package bundb
import (
"context"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
"github.com/superseriousbusiness/gotosocial/internal/state"
"github.com/uptrace/bun"
)
type cardDB struct {
db *bun.DB
state *state.State
}
func (c *cardDB) PutCard(ctx context.Context, card *gtsmodel.Card) error {
return c.state.Caches.DB.Card.Store(card, func() error {
_, err := c.db.NewInsert().Model(card).Exec(ctx)
return err
})
}
func (c *cardDB) GetCardByID(ctx context.Context, id string) (*gtsmodel.Card, error) {
return c.state.Caches.DB.Card.LoadOne("ID", func() (*gtsmodel.Card, error) {
var card gtsmodel.Card
q := c.db.
NewSelect().
Model(&card).
Where("? = ?", bun.Ident("card.id"), id)
if err := q.Scan(ctx); err != nil {
return nil, err
}
return &card, nil
}, id)
}
func (c *cardDB) UpdateCard(ctx context.Context, card *gtsmodel.Card, columns ...string) error {
return c.state.Caches.DB.Card.Store(card, func() error {
return c.db.RunInTx(ctx, nil, func(ctx context.Context, tx bun.Tx) error {
_, err := tx.NewUpdate().
Model(card).
Column(columns...).
Where("? = ?", bun.Ident("id"), card.ID).
Exec(ctx)
return err
})
})
}
func (c *cardDB) DeleteCardByID(ctx context.Context, id string) error {
// Delete card with ID from the database.
if err := c.db.RunInTx(ctx, nil, func(ctx context.Context, tx bun.Tx) error {
// Delete card from database.
if _, err := tx.NewDelete().
Table("cards").
Where("? = ?", bun.Ident("id"), id).
Exec(ctx); err != nil {
return err
}
return nil
}); err != nil {
return err
}
return nil
}

View file

@ -297,6 +297,16 @@ func (s *statusDB) PopulateStatus(ctx context.Context, status *gtsmodel.Status)
}
}
if !status.CardPopulated() {
status.Card, err = s.state.DB.GetCardByID(
gtscontext.SetBarebones(ctx),
status.CardID,
)
if err != nil {
errs.Appendf("error populating status preview card: %w", err)
}
}
if status.CreatedWithApplicationID != "" && status.CreatedWithApplication == nil {
// Populate the status' expected CreatedWithApplication (not always set).
// Don't error on ErrNoEntries, as the application may have been cleaned up.

39
internal/db/card.go Normal file
View file

@ -0,0 +1,39 @@
// GoToSocial
// Copyright (C) GoToSocial Authors admin@gotosocial.org
// SPDX-License-Identifier: AGPL-3.0-or-later
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
package db
import (
"context"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
)
// Card contains functions for getting Cards, creating Cards, and checking various other fields on Cards.
type Card interface {
// GetCardByID fetches the Card from the database with matching id column.
GetCardByID(ctx context.Context, id string) (*gtsmodel.Card, error)
// PutCard stores one Card in the database.
PutCard(ctx context.Context, Card *gtsmodel.Card) error
// UpdateCard updates one Card in the database.
UpdateCard(ctx context.Context, Card *gtsmodel.Card, columns ...string) error
// DeleteCardByID deletes one Card from the database.
DeleteCardByID(ctx context.Context, id string) error
}

View file

@ -29,6 +29,7 @@ type DB interface {
AdvancedMigration
Application
Basic
Card
Conversation
Domain
Emoji