🎧 Your Personal Streaming Service
Go airsonicmadsonicmedia-servermusicmusic-servernavidromeopensubsonicraspberry-piself-hostedstreamerstreaming-apistreaming-audiosubsonicsubsonic-server
feat: add Rated At field - #4653 (#4660)
zacaj3294bcacfc08
diff --git a/db/migrations/20251109010105_add_annotation_rating_date.sql b/db/migrations/20251109010105_add_annotation_rating_date.sqlnew file mode 100644index 000000000..9dac46a5e--- /dev/null+++ b/db/migrations/20251109010105_add_annotation_rating_date.sql@@ -0,0 +1,7 @@+-- +goose Up+-- +goose StatementBegin+ALTER TABLE annotation ADD COLUMN rated_at datetime;+-- +goose StatementEnd++-- +goose Down+\ No newline at end of filediff --git a/model/annotation.go b/model/annotation.goindex 2ec72c1b7..fbff5f178 100644--- a/model/annotation.go+++ b/model/annotation.go@@ -6,6 +6,7 @@ type Annotations struct {PlayCount int64 `structs:"play_count" json:"playCount,omitempty"`PlayDate *time.Time `structs:"play_date" json:"playDate,omitempty" `Rating int `structs:"rating" json:"rating,omitempty" `+ RatedAt *time.Time `structs:"rated_at" json:"ratedAt,omitempty" `Starred bool `structs:"starred" json:"starred,omitempty" `StarredAt *time.Time `structs:"starred_at" json:"starredAt,omitempty"`}diff --git a/model/criteria/fields.go b/model/criteria/fields.goindex 70719cd6f..5381ae597 100644--- a/model/criteria/fields.go+++ b/model/criteria/fields.go@@ -44,6 +44,7 @@ var fieldMap = map[string]*mappedField{"loved": {field: "COALESCE(annotation.starred, false)"},"dateloved": {field: "annotation.starred_at"},"lastplayed": {field: "annotation.play_date"},+ "daterated": {field: "annotation.rated_at"},"playcount": {field: "COALESCE(annotation.play_count, 0)"},"rating": {field: "COALESCE(annotation.rating, 0)"},"mbz_album_id": {field: "media_file.mbz_album_id"},diff --git a/persistence/album_repository.go b/persistence/album_repository.goindex b1ce23e2b..dab255784 100644--- a/persistence/album_repository.go+++ b/persistence/album_repository.go@@ -106,6 +106,7 @@ func NewAlbumRepository(ctx context.Context, db dbx.Builder) model.AlbumReposito"random": "random","recently_added": recentlyAddedSort(),"starred_at": "starred, starred_at",+ "rated_at": "rating, rated_at",})return r}diff --git a/persistence/artist_repository.go b/persistence/artist_repository.goindex 6d08c27db..c9e38a1ee 100644--- a/persistence/artist_repository.go+++ b/persistence/artist_repository.go@@ -141,6 +141,7 @@ func NewArtistRepository(ctx context.Context, db dbx.Builder) model.ArtistReposir.setSortMappings(map[string]string{"name": "order_artist_name","starred_at": "starred, starred_at",+ "rated_at": "rating, rated_at","song_count": "stats->>'total'->>'m'","album_count": "stats->>'total'->>'a'","size": "stats->>'total'->>'s'",diff --git a/persistence/mediafile_repository.go b/persistence/mediafile_repository.goindex e7883947a..8f32accc6 100644--- a/persistence/mediafile_repository.go+++ b/persistence/mediafile_repository.go@@ -84,6 +84,7 @@ func NewMediaFileRepository(ctx context.Context, db dbx.Builder) model.MediaFile"created_at": "media_file.created_at","recently_added": mediaFileRecentlyAddedSort(),"starred_at": "starred, starred_at",+ "rated_at": "rating, rated_at",})return r}diff --git a/persistence/playlist_repository.go b/persistence/playlist_repository.goindex 046284e1f..a94f95a78 100644--- a/persistence/playlist_repository.go+++ b/persistence/playlist_repository.go@@ -388,6 +388,7 @@ func (r *playlistRepository) loadTracks(sel SelectBuilder, id string) (model.Pla"coalesce(play_count, 0) as play_count","play_date","coalesce(rating, 0) as rating",+ "rated_at","f.*","playlist_tracks.*","library.path as library_path",diff --git a/persistence/playlist_track_repository.go b/persistence/playlist_track_repository.goindex b3f9e0c07..666f227e2 100644--- a/persistence/playlist_track_repository.go+++ b/persistence/playlist_track_repository.go@@ -97,6 +97,7 @@ func (r *playlistTrackRepository) Read(id string) (interface{}, error) {"coalesce(rating, 0) as rating","starred_at","play_date",+ "rated_at","f.*","playlist_tracks.*",).diff --git a/persistence/sql_annotations.go b/persistence/sql_annotations.goindex 98ade6e21..108e9be94 100644--- a/persistence/sql_annotations.go+++ b/persistence/sql_annotations.go@@ -28,6 +28,7 @@ func (r sqlRepository) withAnnotation(query SelectBuilder, idField string) Selec"coalesce(rating, 0) as rating","starred_at","play_date",+ "rated_at",)if conf.Server.AlbumPlayCountMode == consts.AlbumPlayCountModeNormalized && r.tableName == "album" {query = query.Columns(@@ -77,7 +78,8 @@ func (r sqlRepository) SetStar(starred bool, ids ...string) error {}func (r sqlRepository) SetRating(rating int, itemID string) error {- return r.annUpsert(map[string]interface{}{"rating": rating}, itemID)+ ratedAt := time.Now()+ return r.annUpsert(map[string]interface{}{"rating": rating, "rated_at": ratedAt}, itemID)}func (r sqlRepository) IncPlayCount(itemID string, ts time.Time) error {diff --git a/ui/src/common/DateField.jsx b/ui/src/common/DateField.jsxindex fab15b53c..dce24a2b9 100644--- a/ui/src/common/DateField.jsx+++ b/ui/src/common/DateField.jsx@@ -1,10 +1,11 @@import React from 'react'+import { isDateSet } from '../utils/validations'import { DateField as RADateField } from 'react-admin'export const DateField = (props) => {const { record, source } = propsconst value = record?.[source]- if (value === '0001-01-01T00:00:00Z' || value === null) return null+ if (!isDateSet(value)) return nullreturn <RADateField {...props} />}diff --git a/ui/src/common/LoveButton.jsx b/ui/src/common/LoveButton.jsxindex f42d92ff4..c940acf12 100644--- a/ui/src/common/LoveButton.jsx+++ b/ui/src/common/LoveButton.jsx@@ -7,6 +7,7 @@ import { makeStyles } from '@material-ui/core/styles'import { useToggleLove } from './useToggleLove'import { useRecordContext } from 'react-admin'import config from '../config'+import { isDateSet } from '../utils/validations'const useStyles = makeStyles({love: {@@ -46,8 +47,13 @@ export const LoveButton = ({<ButtononClick={handleToggleLove}size={'small'}- disabled={disabled || loading || record?.missing}+ disabled={disabled || loading || record.missing}className={classes.love}+ title={+ isDateSet(record.starredAt)+ ? new Date(record.starredAt).toLocaleString()+ : undefined+ }{...rest}>{record.starred ? (diff --git a/ui/src/common/RatingField.jsx b/ui/src/common/RatingField.jsxindex b29c1eee8..f92b0d948 100644--- a/ui/src/common/RatingField.jsx+++ b/ui/src/common/RatingField.jsx@@ -2,6 +2,7 @@ import React, { useCallback } from 'react'import PropTypes from 'prop-types'import Rating from '@material-ui/lab/Rating'import { makeStyles } from '@material-ui/core/styles'+import { isDateSet } from '../utils/validations'import StarBorderIcon from '@material-ui/icons/StarBorder'import clsx from 'clsx'import { useRating } from './useRating'@@ -45,7 +46,14 @@ export const RatingField = ({)return (- <span onClick={(e) => stopPropagation(e)}>+ <span+ onClick={(e) => stopPropagation(e)}+ title={+ isDateSet(record.ratedAt)+ ? new Date(record.ratedAt).toLocaleString()+ : undefined+ }+ ><Ratingname={record.mediaFileId || record.id}className={clsx(diff --git a/ui/src/utils/validations.js b/ui/src/utils/validations.jsindex 8b163c156..792726e70 100644--- a/ui/src/utils/validations.js+++ b/ui/src/utils/validations.js@@ -10,3 +10,16 @@ export const urlValidate = (value) => {return 'ra.validation.url'}}++export function isDateSet(date) {+ if (!date) {+ return false+ }+ if (typeof date === 'string') {+ return date !== '0001-01-01T00:00:00Z'+ }+ if (date instanceof Date) {+ return date.toISOString() !== '0001-01-01T00:00:00Z'+ }+ return !!date+}diff --git a/ui/src/utils/validations.test.js b/ui/src/utils/validations.test.jsnew file mode 100644index 000000000..10f67d186--- /dev/null+++ b/ui/src/utils/validations.test.js@@ -0,0 +1,73 @@+import { isDateSet, urlValidate } from './validations'++describe('urlValidate', () => {+ it('returns undefined for valid URLs', () => {+ expect(urlValidate('https://example.com')).toBeUndefined()+ expect(urlValidate('http://localhost:3000')).toBeUndefined()+ expect(urlValidate('ftp://files.example.com')).toBeUndefined()+ })++ it('returns undefined for empty values', () => {+ expect(urlValidate('')).toBeUndefined()+ expect(urlValidate(null)).toBeUndefined()+ expect(urlValidate(undefined)).toBeUndefined()+ })++ it('returns error for invalid URLs', () => {+ expect(urlValidate('not-a-url')).toEqual('ra.validation.url')+ expect(urlValidate('example.com')).toEqual('ra.validation.url')+ expect(urlValidate('://missing-protocol')).toEqual('ra.validation.url')+ })+})++describe('isDateSet', () => {+ describe('with falsy values', () => {+ it('returns false for null', () => {+ expect(isDateSet(null)).toBe(false)+ })++ it('returns false for undefined', () => {+ expect(isDateSet(undefined)).toBe(false)+ })++ it('returns false for empty string', () => {+ expect(isDateSet('')).toBe(false)+ })+ })++ describe('with Go zero date string', () => {+ it('returns false for Go zero date', () => {+ expect(isDateSet('0001-01-01T00:00:00Z')).toBe(false)+ })+ })++ describe('with valid date strings', () => {+ it('returns true for ISO date strings', () => {+ expect(isDateSet('2024-01-15T10:30:00Z')).toBe(true)+ expect(isDateSet('2023-12-25T00:00:00Z')).toBe(true)+ })++ it('returns true for other date formats', () => {+ expect(isDateSet('2024-01-15')).toBe(true)+ })+ })++ describe('with Date objects', () => {+ it('returns true for valid Date objects', () => {+ expect(isDateSet(new Date())).toBe(true)+ expect(isDateSet(new Date('2024-01-15T10:30:00Z'))).toBe(true)+ })++ // Note: Date objects representing Go zero date would return true because+ // toISOString() adds milliseconds (0001-01-01T00:00:00.000Z).+ // In practice, dates from the API come as strings, not Date objects,+ // so this edge case doesn't occur.+ })++ describe('with other truthy values', () => {+ it('returns true for non-date truthy values', () => {+ expect(isDateSet(123)).toBe(true)+ expect(isDateSet({})).toBe(true)+ })+ })+})