public/photoview
1
0
Fork 0
mirror of https://git.vectorsigma.ru/public/photoview.git synced 2026-08-03 18:29:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add date filter to timeline + fix #302

Browse Source
This commit is contained in:
viktorstrate
2021-09-25 17:11:54 +02:00
parent 2c0baa6bdf
commit 69bf8a01c4
16 changed files with 354 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
api/graphql/resolvers/media.go
View File

@@ -8,6 +8,7 @@ import (
api "github.com/photoview/photoview/api/graphql"
"github.com/photoview/photoview/api/graphql/auth"
"github.com/photoview/photoview/api/graphql/models"
"github.com/photoview/photoview/api/graphql/models/actions"
"github.com/photoview/photoview/api/scanner/face_detection"
"github.com/pkg/errors"
"gorm.io/gorm/clause"
@@ -19,29 +20,7 @@ func (r *queryResolver) MyMedia(ctx context.Context, order *models.Ordering, pag
return nil, errors.New("unauthorized")
}
if err := user.FillAlbums(r.Database); err != nil {
return nil, err
}
userAlbumIDs := make([]int, len(user.Albums))
for i, album := range user.Albums {
userAlbumIDs[i] = album.ID
}
var media []*models.Media
query := r.Database.
Joins("Album").
Where("albums.id IN (?)", userAlbumIDs).
Where("media.id IN (?)", r.Database.Model(&models.MediaURL{}).Select("id").Where("media_url.media_id = media.id"))
query = models.FormatSQL(query, order, paginate)
if err := query.Find(&media).Error; err != nil {
return nil, err
}
return media, nil
return actions.MyMedia(r.Database, user, order, paginate)
}
func (r *queryResolver) Media(ctx context.Context, id int, tokenCredentials *models.ShareTokenCredentials) (*models.Media, error) {