mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-10-29 22:12:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

rename KVStore uses as storage to differentiate between upcoming store package

Browse source 
Signed-off-by: kim (grufwub) <grufwub@gmail.com>
This commit is contained in:
kim (grufwub) 2021-09-11 20:18:06 +01:00
commit 7f36688643
9 changed files with 36 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

22
internal/media/handler.go
View file

@ -84,19 +84,19 @@ type Handler interface {
}
type mediaHandler struct {
config *config.Config
db db.DB
store *kv.KVStore
log *logrus.Logger
config *config.Config
db db.DB
storage *kv.KVStore
log *logrus.Logger
}
// New returns a new handler with the given config, db, storage, and logger
func New(config *config.Config, database db.DB, store *kv.KVStore, log *logrus.Logger) Handler {
func New(config *config.Config, database db.DB, storage *kv.KVStore, log *logrus.Logger) Handler {
return &mediaHandler{
config: config,
db: database,
store: store,
log: log,
config: config,
db: database,
storage: storage,
log: log,
}
}
@ -257,12 +257,12 @@ func (mh *mediaHandler) ProcessLocalEmoji(ctx context.Context, emojiBytes []byte
emojiStaticPath := fmt.Sprintf("%s/%s/%s/%s/%s.png", mh.config.StorageConfig.BasePath, instanceAccount.ID, Emoji, Static, newEmojiID)
// Store the original emoji
if err := mh.store.Put(emojiPath, original.image); err != nil {
if err := mh.storage.Put(emojiPath, original.image); err != nil {
return nil, fmt.Errorf("storage error: %s", err)
}
// Store the static emoji
if err := mh.store.Put(emojiStaticPath, static.image); err != nil {
if err := mh.storage.Put(emojiStaticPath, static.image); err != nil {
return nil, fmt.Errorf("storage error: %s", err)
}