Merge pull request #272 from nielsvanvelzen/userid-hook

Add userId default value hook
jellyfin · Jun 13, 2021 · 2b936a9 · 2b936a9
2 parents f2f46ef + 3eeac38
commit 2b936a9
Show file tree

Hide file tree

Showing 27 changed files with 238 additions and 77 deletions.
diff --git a/jellyfin-api/api/jellyfin-api.api b/jellyfin-api/api/jellyfin-api.api
diff --git a/...in-api/src/main/kotlin-generated/org/jellyfin/sdk/api/operations/DisplayPreferencesApi.kt b/...in-api/src/main/kotlin-generated/org/jellyfin/sdk/api/operations/DisplayPreferencesApi.kt
@@ -11,6 +11,7 @@ import kotlin.String
 import kotlin.Unit
 import org.jellyfin.sdk.api.client.KtorClient
 import org.jellyfin.sdk.api.client.Response
+import org.jellyfin.sdk.api.client.exception.MissingUserIdException
 import org.jellyfin.sdk.model.api.DisplayPreferencesDto
 
 public class DisplayPreferencesApi(
@@ -25,7 +26,7 @@ public class DisplayPreferencesApi(
 	 */
 	public suspend fun getDisplayPreferences(
 		displayPreferencesId: String,
-		userId: UUID,
+		userId: UUID = api.userId ?: throw MissingUserIdException(),
 		client: String
 	): Response<DisplayPreferencesDto> {
 		val pathParameters = mutableMapOf<String, Any?>()
@@ -48,7 +49,7 @@ public class DisplayPreferencesApi(
 	 */
 	public suspend fun updateDisplayPreferences(
 		displayPreferencesId: String,
-		userId: UUID,
+		userId: UUID = api.userId ?: throw MissingUserIdException(),
 		client: String,
 		`data`: DisplayPreferencesDto
 	): Response<Unit> {

diff --git a/jellyfin-api/src/main/kotlin-generated/org/jellyfin/sdk/api/operations/ImageApi.kt b/jellyfin-api/src/main/kotlin-generated/org/jellyfin/sdk/api/operations/ImageApi.kt
@@ -16,6 +16,7 @@ import kotlin.Unit
 import kotlin.collections.List
 import org.jellyfin.sdk.api.client.KtorClient
 import org.jellyfin.sdk.api.client.Response
+import org.jellyfin.sdk.api.client.exception.MissingUserIdException
 import org.jellyfin.sdk.model.api.ImageFormat
 import org.jellyfin.sdk.model.api.ImageInfo
 import org.jellyfin.sdk.model.api.ImageType
@@ -77,7 +78,7 @@ public class ImageApi(
 	 * @param index (Unused) Image index.
 	 */
 	public suspend fun deleteUserImage(
-		userId: UUID,
+		userId: UUID = api.userId ?: throw MissingUserIdException(),
 		imageType: ImageType,
 		index: Int? = null
 	): Response<Unit> {
@@ -100,7 +101,7 @@ public class ImageApi(
 	 * @param index (Unused) Image index.
 	 */
 	public suspend fun deleteUserImageByIndex(
-		userId: UUID,
+		userId: UUID = api.userId ?: throw MissingUserIdException(),
 		imageType: ImageType,
 		index: Int
 	): Response<Unit> {
@@ -1934,7 +1935,7 @@ public class ImageApi(
 	 * @param imageIndex Image index.
 	 */
 	public suspend fun getUserImage(
-		userId: UUID,
+		userId: UUID = api.userId ?: throw MissingUserIdException(),
 		imageType: ImageType,
 		tag: String? = null,
 		format: ImageFormat? = null,
@@ -2009,7 +2010,7 @@ public class ImageApi(
 	 * @param includeCredentials Add the access token to the url to make an authenticated request.
 	 */
 	public fun getUserImageUrl(
-		userId: UUID,
+		userId: UUID = api.userId ?: throw MissingUserIdException(),
 		imageType: ImageType,
 		tag: String? = null,
 		format: ImageFormat? = null,
@@ -2082,7 +2083,7 @@ public class ImageApi(
 	 * @param foregroundLayer Optional. Apply a foreground layer on top of the image.
 	 */
 	public suspend fun getUserImageByIndex(
-		userId: UUID,
+		userId: UUID = api.userId ?: throw MissingUserIdException(),
 		imageType: ImageType,
 		imageIndex: Int,
 		tag: String? = null,
@@ -2157,7 +2158,7 @@ public class ImageApi(
 	 * @param includeCredentials Add the access token to the url to make an authenticated request.
 	 */
 	public fun getUserImageByIndexUrl(
-		userId: UUID,
+		userId: UUID = api.userId ?: throw MissingUserIdException(),
 		imageType: ImageType,
 		imageIndex: Int,
 		tag: String? = null,
@@ -2211,7 +2212,7 @@ public class ImageApi(
 	 * @param index (Unused) Image index.
 	 */
 	public suspend fun postUserImage(
-		userId: UUID,
+		userId: UUID = api.userId ?: throw MissingUserIdException(),
 		imageType: ImageType,
 		index: Int? = null
 	): Response<Unit> {
@@ -2234,7 +2235,7 @@ public class ImageApi(
 	 * @param index (Unused) Image index.
 	 */
 	public suspend fun postUserImageByIndex(
-		userId: UUID,
+		userId: UUID = api.userId ?: throw MissingUserIdException(),
 		imageType: ImageType,
 		index: Int
 	): Response<Unit> {

diff --git a/jellyfin-api/src/main/kotlin-generated/org/jellyfin/sdk/api/operations/ItemsApi.kt b/jellyfin-api/src/main/kotlin-generated/org/jellyfin/sdk/api/operations/ItemsApi.kt
@@ -15,6 +15,7 @@ import kotlin.String
 import kotlin.collections.List
 import org.jellyfin.sdk.api.client.KtorClient
 import org.jellyfin.sdk.api.client.Response
+import org.jellyfin.sdk.api.client.exception.MissingUserIdException
 import org.jellyfin.sdk.model.api.BaseItemDtoQueryResult
 import org.jellyfin.sdk.model.api.ImageType
 import org.jellyfin.sdk.model.api.ItemFields
@@ -445,7 +446,7 @@ public class ItemsApi(
 	 * @param enableImages Optional, include image information in output.
 	 */
 	public suspend fun getItemsByUserId(
-		userId: UUID,
+		userId: UUID = api.userId ?: throw MissingUserIdException(),
 		maxOfficialRating: String? = null,
 		hasThemeSong: Boolean? = null,
 		hasThemeVideo: Boolean? = null,
@@ -639,7 +640,7 @@ public class ItemsApi(
 	 * @param enableImages Optional. Include image information in output.
 	 */
 	public suspend fun getResumeItems(
-		userId: UUID,
+		userId: UUID = api.userId ?: throw MissingUserIdException(),
 		startIndex: Int? = null,
 		limit: Int? = null,
 		searchTerm: String? = null,

diff --git a/jellyfin-api/src/main/kotlin-generated/org/jellyfin/sdk/api/operations/MediaInfoApi.kt b/jellyfin-api/src/main/kotlin-generated/org/jellyfin/sdk/api/operations/MediaInfoApi.kt
@@ -16,6 +16,7 @@ import kotlin.String
 import kotlin.Unit
 import org.jellyfin.sdk.api.client.KtorClient
 import org.jellyfin.sdk.api.client.Response
+import org.jellyfin.sdk.api.client.exception.MissingUserIdException
 import org.jellyfin.sdk.model.api.LiveStreamResponse
 import org.jellyfin.sdk.model.api.OpenLiveStreamDto
 import org.jellyfin.sdk.model.api.PlaybackInfoDto
@@ -73,7 +74,8 @@ public class MediaInfoApi(
 	 * @param itemId The item id.
 	 * @param userId The user id.
 	 */
-	public suspend fun getPlaybackInfo(itemId: UUID, userId: UUID): Response<PlaybackInfoResponse> {
+	public suspend fun getPlaybackInfo(itemId: UUID, userId: UUID = api.userId ?: throw
+			MissingUserIdException()): Response<PlaybackInfoResponse> {
 		val pathParameters = mutableMapOf<String, Any?>()
 		pathParameters["itemId"] = itemId
 		val queryParameters = mutableMapOf<String, Any?>()

diff --git a/jellyfin-api/src/main/kotlin-generated/org/jellyfin/sdk/api/operations/NotificationsApi.kt b/jellyfin-api/src/main/kotlin-generated/org/jellyfin/sdk/api/operations/NotificationsApi.kt
@@ -11,6 +11,7 @@ import kotlin.Unit
 import kotlin.collections.List
 import org.jellyfin.sdk.api.client.KtorClient
 import org.jellyfin.sdk.api.client.Response
+import org.jellyfin.sdk.api.client.exception.MissingUserIdException
 import org.jellyfin.sdk.model.api.AdminNotificationDto
 import org.jellyfin.sdk.model.api.NameIdPair
 import org.jellyfin.sdk.model.api.NotificationResultDto
@@ -57,7 +58,8 @@ public class NotificationsApi(
 	/**
 	 * Gets a user's notifications.
 	 */
-	public suspend fun getNotifications(userId: String): Response<NotificationResultDto> {
+	public suspend fun getNotifications(userId: String = api.userId.toString() ?: throw
+			MissingUserIdException()): Response<NotificationResultDto> {
 		val pathParameters = mutableMapOf<String, Any?>()
 		pathParameters["userId"] = userId
 		val queryParameters = emptyMap<String, Any?>()
@@ -70,7 +72,8 @@ public class NotificationsApi(
 	/**
 	 * Gets a user's notification summary.
 	 */
-	public suspend fun getNotificationsSummary(userId: String): Response<NotificationsSummaryDto> {
+	public suspend fun getNotificationsSummary(userId: String = api.userId.toString() ?: throw
+			MissingUserIdException()): Response<NotificationsSummaryDto> {
 		val pathParameters = mutableMapOf<String, Any?>()
 		pathParameters["userId"] = userId
 		val queryParameters = emptyMap<String, Any?>()
@@ -83,7 +86,8 @@ public class NotificationsApi(
 	/**
 	 * Sets notifications as read.
 	 */
-	public suspend fun setRead(userId: String): Response<Unit> {
+	public suspend fun setRead(userId: String = api.userId.toString() ?: throw
+			MissingUserIdException()): Response<Unit> {
 		val pathParameters = mutableMapOf<String, Any?>()
 		pathParameters["userId"] = userId
 		val queryParameters = emptyMap<String, Any?>()
@@ -96,7 +100,8 @@ public class NotificationsApi(
 	/**
 	 * Sets notifications as unread.
 	 */
-	public suspend fun setUnread(userId: String): Response<Unit> {
+	public suspend fun setUnread(userId: String = api.userId.toString() ?: throw
+			MissingUserIdException()): Response<Unit> {
 		val pathParameters = mutableMapOf<String, Any?>()
 		pathParameters["userId"] = userId
 		val queryParameters = emptyMap<String, Any?>()

diff --git a/jellyfin-api/src/main/kotlin-generated/org/jellyfin/sdk/api/operations/PlayStateApi.kt b/jellyfin-api/src/main/kotlin-generated/org/jellyfin/sdk/api/operations/PlayStateApi.kt
@@ -15,6 +15,7 @@ import kotlin.String
 import kotlin.Unit
 import org.jellyfin.sdk.api.client.KtorClient
 import org.jellyfin.sdk.api.client.Response
+import org.jellyfin.sdk.api.client.exception.MissingUserIdException
 import org.jellyfin.sdk.model.api.PlayMethod
 import org.jellyfin.sdk.model.api.PlaybackProgressInfo
 import org.jellyfin.sdk.model.api.PlaybackStartInfo
@@ -33,7 +34,7 @@ public class PlayStateApi(
 	 * @param datePlayed Optional. The date the item was played.
 	 */
 	public suspend fun markPlayedItem(
-		userId: UUID,
+		userId: UUID = api.userId ?: throw MissingUserIdException(),
 		itemId: UUID,
 		datePlayed: LocalDateTime? = null
 	): Response<UserItemDataDto> {
@@ -54,7 +55,8 @@ public class PlayStateApi(
 	 * @param userId User id.
 	 * @param itemId Item id.
 	 */
-	public suspend fun markUnplayedItem(userId: UUID, itemId: UUID): Response<UserItemDataDto> {
+	public suspend fun markUnplayedItem(userId: UUID = api.userId ?: throw MissingUserIdException(),
+			itemId: UUID): Response<UserItemDataDto> {
 		val pathParameters = mutableMapOf<String, Any?>()
 		pathParameters["userId"] = userId
 		pathParameters["itemId"] = itemId
@@ -83,7 +85,7 @@ public class PlayStateApi(
 	 * @param isMuted Indicates if the player is muted.
 	 */
 	public suspend fun onPlaybackProgress(
-		userId: UUID,
+		userId: UUID = api.userId ?: throw MissingUserIdException(),
 		itemId: UUID,
 		mediaSourceId: String? = null,
 		positionTicks: Long? = null,
@@ -132,7 +134,7 @@ public class PlayStateApi(
 	 * @param canSeek Indicates if the client can seek.
 	 */
 	public suspend fun onPlaybackStart(
-		userId: UUID,
+		userId: UUID = api.userId ?: throw MissingUserIdException(),
 		itemId: UUID,
 		mediaSourceId: String? = null,
 		audioStreamIndex: Int? = null,
@@ -172,7 +174,7 @@ public class PlayStateApi(
 	 * @param playSessionId The play session id.
 	 */
 	public suspend fun onPlaybackStopped(
-		userId: UUID,
+		userId: UUID = api.userId ?: throw MissingUserIdException(),
 		itemId: UUID,
 		mediaSourceId: String? = null,
 		nextMediaType: String? = null,

diff --git a/jellyfin-api/src/main/kotlin-generated/org/jellyfin/sdk/api/operations/PlaylistsApi.kt b/jellyfin-api/src/main/kotlin-generated/org/jellyfin/sdk/api/operations/PlaylistsApi.kt
@@ -15,6 +15,7 @@ import kotlin.Unit
 import kotlin.collections.List
 import org.jellyfin.sdk.api.client.KtorClient
 import org.jellyfin.sdk.api.client.Response
+import org.jellyfin.sdk.api.client.exception.MissingUserIdException
 import org.jellyfin.sdk.model.api.BaseItemDtoQueryResult
 import org.jellyfin.sdk.model.api.CreatePlaylistDto
 import org.jellyfin.sdk.model.api.ImageType
@@ -106,7 +107,7 @@ public class PlaylistsApi(
 	 */
 	public suspend fun getPlaylistItems(
 		playlistId: UUID,
-		userId: UUID,
+		userId: UUID = api.userId ?: throw MissingUserIdException(),
 		startIndex: Int? = null,
 		limit: Int? = null,
 		fields: List<ItemFields>? = emptyList(),

diff --git a/jellyfin-api/src/main/kotlin-generated/org/jellyfin/sdk/api/operations/SessionApi.kt b/jellyfin-api/src/main/kotlin-generated/org/jellyfin/sdk/api/operations/SessionApi.kt
@@ -15,6 +15,7 @@ import kotlin.Unit
 import kotlin.collections.List
 import org.jellyfin.sdk.api.client.KtorClient
 import org.jellyfin.sdk.api.client.Response
+import org.jellyfin.sdk.api.client.exception.MissingUserIdException
 import org.jellyfin.sdk.model.api.ClientCapabilitiesDto
 import org.jellyfin.sdk.model.api.GeneralCommand
 import org.jellyfin.sdk.model.api.GeneralCommandType
@@ -33,7 +34,8 @@ public class SessionApi(
 	 * @param sessionId The session id.
 	 * @param userId The user id.
 	 */
-	public suspend fun addUserToSession(sessionId: String, userId: UUID): Response<Unit> {
+	public suspend fun addUserToSession(sessionId: String, userId: UUID = api.userId ?: throw
+			MissingUserIdException()): Response<Unit> {
 		val pathParameters = mutableMapOf<String, Any?>()
 		pathParameters["sessionId"] = sessionId
 		pathParameters["userId"] = userId
@@ -208,7 +210,8 @@ public class SessionApi(
 	 * @param sessionId The session id.
 	 * @param userId The user id.
 	 */
-	public suspend fun removeUserFromSession(sessionId: String, userId: UUID): Response<Unit> {
+	public suspend fun removeUserFromSession(sessionId: String, userId: UUID = api.userId ?: throw
+			MissingUserIdException()): Response<Unit> {
 		val pathParameters = mutableMapOf<String, Any?>()
 		pathParameters["sessionId"] = sessionId
 		pathParameters["userId"] = userId

diff --git a/jellyfin-api/src/main/kotlin-generated/org/jellyfin/sdk/api/operations/SuggestionsApi.kt b/jellyfin-api/src/main/kotlin-generated/org/jellyfin/sdk/api/operations/SuggestionsApi.kt
@@ -13,6 +13,7 @@ import kotlin.String
 import kotlin.collections.List
 import org.jellyfin.sdk.api.client.KtorClient
 import org.jellyfin.sdk.api.client.Response
+import org.jellyfin.sdk.api.client.exception.MissingUserIdException
 import org.jellyfin.sdk.model.api.BaseItemDtoQueryResult
 
 public class SuggestionsApi(
@@ -29,7 +30,7 @@ public class SuggestionsApi(
 	 * @param enableTotalRecordCount Whether to enable the total record count.
 	 */
 	public suspend fun getSuggestions(
-		userId: UUID,
+		userId: UUID = api.userId ?: throw MissingUserIdException(),
 		mediaType: List<String>? = emptyList(),
 		type: List<String>? = emptyList(),
 		startIndex: Int? = null,