Move utils into shared folder
This commit is contained in:
parent
500bf48295
commit
c25f27e82e
22 changed files with 111 additions and 137 deletions
|
@ -5,8 +5,9 @@ import (
|
|||
"time"
|
||||
|
||||
"github.com/rs/zerolog/log"
|
||||
"git.mstar.dev/mstar/linstrom/util"
|
||||
"gorm.io/gorm"
|
||||
|
||||
"git.mstar.dev/mstar/linstrom/shared"
|
||||
)
|
||||
|
||||
// Note represents an ActivityPub note
|
||||
|
@ -41,7 +42,7 @@ type Note struct {
|
|||
}
|
||||
|
||||
func (s *Storage) FindNoteById(id string) (*Note, error) {
|
||||
defer util.Untrace(util.Trace(&log.Logger))
|
||||
defer shared.Untrace(shared.Trace(&log.Logger))
|
||||
note := &Note{}
|
||||
cacheNote, err := s.cacheNoteIdToData(id)
|
||||
switch err {
|
||||
|
@ -70,7 +71,7 @@ func (s *Storage) FindNoteById(id string) (*Note, error) {
|
|||
}
|
||||
|
||||
func (s *Storage) FindNotesByFuzzyContent(fuzzyContent string) ([]Note, error) {
|
||||
defer util.Untrace(util.Trace(&log.Logger))
|
||||
defer shared.Untrace(shared.Trace(&log.Logger))
|
||||
notes := []Note{}
|
||||
// TODO: Figure out if cache can be used here too
|
||||
err := s.db.Where("raw_content LIKE %?%", fuzzyContent).Find(notes).Error
|
||||
|
@ -81,7 +82,7 @@ func (s *Storage) FindNotesByFuzzyContent(fuzzyContent string) ([]Note, error) {
|
|||
}
|
||||
|
||||
func (s *Storage) FindNotesByAuthorHandle(handle string) ([]Note, error) {
|
||||
defer util.Untrace(util.Trace(&log.Logger))
|
||||
defer shared.Untrace(shared.Trace(&log.Logger))
|
||||
acc, err := s.FindAccountByFullHandle(handle)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("account with handle %s not found: %w", handle, err)
|
||||
|
@ -90,7 +91,7 @@ func (s *Storage) FindNotesByAuthorHandle(handle string) ([]Note, error) {
|
|||
}
|
||||
|
||||
func (s *Storage) FindNotesByAuthorId(id string) ([]Note, error) {
|
||||
defer util.Untrace(util.Trace(&log.Logger))
|
||||
defer shared.Untrace(shared.Trace(&log.Logger))
|
||||
notes := []Note{}
|
||||
err := s.db.Where("creator = ?", id).Find(notes).Error
|
||||
switch err {
|
||||
|
@ -104,7 +105,7 @@ func (s *Storage) FindNotesByAuthorId(id string) ([]Note, error) {
|
|||
}
|
||||
|
||||
func (s *Storage) UpdateNote(note *Note) error {
|
||||
defer util.Untrace(util.Trace(&log.Logger))
|
||||
defer shared.Untrace(shared.Trace(&log.Logger))
|
||||
if note == nil || note.ID == "" {
|
||||
return ErrInvalidData
|
||||
}
|
||||
|
@ -133,7 +134,7 @@ func (s *Storage) CreateNoteLocal(
|
|||
accessLevel NoteAccessLevel,
|
||||
tags []string,
|
||||
) (*Note, error) {
|
||||
defer util.Untrace(util.Trace(&log.Logger))
|
||||
defer shared.Untrace(shared.Trace(&log.Logger))
|
||||
// TODO: Implement me
|
||||
panic("not implemented")
|
||||
}
|
||||
|
@ -151,13 +152,13 @@ func (s *Storage) CreateNoteRemote(
|
|||
tags []string,
|
||||
originId string,
|
||||
) (*Note, error) {
|
||||
defer util.Untrace(util.Trace(&log.Logger))
|
||||
defer shared.Untrace(shared.Trace(&log.Logger))
|
||||
// TODO: Implement me
|
||||
panic("not implemented")
|
||||
}
|
||||
|
||||
func (s *Storage) DeleteNote(id string) {
|
||||
defer util.Untrace(util.Trace(&log.Logger))
|
||||
defer shared.Untrace(shared.Trace(&log.Logger))
|
||||
s.cache.Delete(cacheNoteIdToNotePrefix + id)
|
||||
s.db.Delete(Note{ID: id})
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue