diff --git a/internal/api/batch_photos.go b/internal/api/batch_photos.go index 2ff465672..4a60d535e 100644 --- a/internal/api/batch_photos.go +++ b/internal/api/batch_photos.go @@ -22,9 +22,9 @@ import ( "github.com/photoprism/photoprism/pkg/i18n" ) -// BatchPhotosArchive moves multiple pictures to the archive. +// BatchPhotosArchive moves multiple photos to the archive. // -// @Summary moves multiple pictures to the archive +// @Summary moves multiple photos to the archive // @Id BatchPhotosArchive // @Tags Photos // @Accept json @@ -94,9 +94,9 @@ func BatchPhotosArchive(router *gin.RouterGroup) { }) } -// BatchPhotosRestore restores multiple pictures from the archive. +// BatchPhotosRestore restores multiple photos from the archive. // -// @Summary restores multiple pictures from the archive +// @Summary restores multiple photos from the archive // @Id BatchPhotosRestore // @Tags Photos // @Accept json @@ -164,9 +164,9 @@ func BatchPhotosRestore(router *gin.RouterGroup) { }) } -// BatchPhotosApprove approves multiple pictures that are currently under review. +// BatchPhotosApprove approves multiple photos that are currently under review. // -// @Summary approves multiple pictures that are currently under review +// @Summary approves multiple photos that are currently under review // @Id BatchPhotosApprove // @Tags Photos // @Accept json @@ -224,9 +224,9 @@ func BatchPhotosApprove(router *gin.RouterGroup) { }) } -// BatchPhotosPrivate toggles private state of multiple pictures. +// BatchPhotosPrivate toggles private state of multiple photos. // -// @Summary toggles private state of multiple pictures +// @Summary toggles private state of multiple photos // @Id BatchPhotosPrivate // @Tags Photos // @Accept json @@ -284,7 +284,7 @@ func BatchPhotosPrivate(router *gin.RouterGroup) { }) } -// BatchPhotosDelete permanently removes multiple pictures from the archive. +// BatchPhotosDelete permanently removes multiple photos from the archive. // // @Summary permanently removes multiple or all photos from the archive // @Id BatchPhotosDelete diff --git a/internal/api/batch_photos_edit.go b/internal/api/batch_photos_edit.go index c5975d047..9cc91b97d 100644 --- a/internal/api/batch_photos_edit.go +++ b/internal/api/batch_photos_edit.go @@ -14,9 +14,9 @@ import ( "github.com/photoprism/photoprism/pkg/i18n" ) -// BatchPhotosEdit returns the metadata of multiple pictures so that it can be edited. +// BatchPhotosEdit returns and updates the metadata of multiple photos. // -// @Summary returns the metadata of multiple pictures so that it can be edited +// @Summary returns and updates the metadata of multiple photos // @Id BatchPhotosEdit // @Tags Photos // @Accept json diff --git a/internal/api/swagger.json b/internal/api/swagger.json index 2a377b850..b2210a0f8 100644 --- a/internal/api/swagger.json +++ b/internal/api/swagger.json @@ -1179,7 +1179,7 @@ "tags": [ "Photos" ], - "summary": "approves multiple pictures that are currently under review", + "summary": "approves multiple photos that are currently under review", "operationId": "BatchPhotosApprove", "parameters": [ { @@ -1243,7 +1243,7 @@ "tags": [ "Photos" ], - "summary": "moves multiple pictures to the archive", + "summary": "moves multiple photos to the archive", "operationId": "BatchPhotosArchive", "parameters": [ { @@ -1371,7 +1371,7 @@ "tags": [ "Photos" ], - "summary": "returns the metadata of multiple pictures so that it can be edited", + "summary": "returns and updates the metadata of multiple photos", "operationId": "BatchPhotosEdit", "parameters": [ { @@ -1441,7 +1441,7 @@ "tags": [ "Photos" ], - "summary": "toggles private state of multiple pictures", + "summary": "toggles private state of multiple photos", "operationId": "BatchPhotosPrivate", "parameters": [ { @@ -1511,7 +1511,7 @@ "tags": [ "Photos" ], - "summary": "restores multiple pictures from the archive", + "summary": "restores multiple photos from the archive", "operationId": "BatchPhotosRestore", "parameters": [ { @@ -5330,9 +5330,6 @@ "batch.PhotosRequest": { "type": "object", "properties": { - "filter": { - "type": "string" - }, "photos": { "type": "array", "items": { @@ -7240,9 +7237,6 @@ "type": "string" } }, - "filter": { - "type": "string" - }, "labels": { "type": "array", "items": { @@ -7983,14 +7977,6 @@ 1000000, 1000000000, 60000000000, - 3600000000000, - -9223372036854775808, - 9223372036854775807, - 1, - 1000, - 1000000, - 1000000000, - 60000000000, 3600000000000 ], "x-enum-varnames": [ @@ -8009,14 +7995,6 @@ "Millisecond", "Second", "Minute", - "Hour", - "minDuration", - "maxDuration", - "Nanosecond", - "Microsecond", - "Millisecond", - "Second", - "Minute", "Hour" ] }, diff --git a/internal/form/batch/selection.go b/internal/form/batch/selection.go index c577edda5..01e459218 100644 --- a/internal/form/batch/selection.go +++ b/internal/form/batch/selection.go @@ -4,9 +4,8 @@ import "strings" // PhotosRequest represents items selected in the user interface. type PhotosRequest struct { - Return bool `json:"return,omitempty"` - Filter string `json:"filter,omitempty"` Photos []string `json:"photos"` + Return bool `json:"return,omitempty"` Values *PhotosForm `json:"values,omitempty"` } diff --git a/internal/form/selection.go b/internal/form/selection.go index ff1608768..360b31672 100644 --- a/internal/form/selection.go +++ b/internal/form/selection.go @@ -5,7 +5,6 @@ import "strings" // Selection represents items selected in the user interface. type Selection struct { All bool `json:"all"` - Filter string `json:"filter"` Files []string `json:"files"` Photos []string `json:"photos"` Albums []string `json:"albums"`