Merge branch 'dev' into 360-api-keys-support

package.json

@@ -1,6 +1,6 @@
 {
   "name": "watcharr",
-  "version": "1.34.0",
+  "version": "1.35.0",
   "private": true,
   "scripts": {
     "dev": "vite dev",

server/activity.go

@@ -11,23 +11,27 @@ import (
 type ActivityType string
 
 var (
-	ADDED_WATCHED          ActivityType = "ADDED_WATCHED"
-	REMOVED_WATCHED        ActivityType = "REMOVED_WATCHED"
-	RATING_CHANGED         ActivityType = "RATING_CHANGED"
-	STATUS_CHANGED         ActivityType = "STATUS_CHANGED"
-	THOUGHTS_CHANGED       ActivityType = "THOUGHTS_CHANGED"
-	THOUGHTS_REMOVED       ActivityType = "THOUGHTS_REMOVED"
-	IMPORTED_WATCHED       ActivityType = "IMPORTED_WATCHED"
-	IMPORTED_RATING        ActivityType = "IMPORTED_RATING"        // Imported rating, but with no rating acts as original import of content to old platform (where they are importing from) activity
-	IMPORTED_ADDED_WATCHED ActivityType = "IMPORTED_ADDED_WATCHED" // Imported watched date, so we can save the original watch dates of content from users old platform (where they are importing from).
-	SEASON_ADDED           ActivityType = "SEASON_ADDED"
-	SEASON_REMOVED         ActivityType = "SEASON_REMOVED"
-	SEASON_RATING_CHANGED  ActivityType = "SEASON_RATING_CHANGED"
-	SEASON_STATUS_CHANGED  ActivityType = "SEASON_STATUS_CHANGED"
-	EPISODE_ADDED          ActivityType = "EPISODE_ADDED"
-	EPISODE_REMOVED        ActivityType = "EPISODE_REMOVED"
-	EPISODE_RATING_CHANGED ActivityType = "EPISODE_RATING_CHANGED"
-	EPISODE_STATUS_CHANGED ActivityType = "EPISODE_STATUS_CHANGED"
+	ADDED_WATCHED             ActivityType = "ADDED_WATCHED"
+	REMOVED_WATCHED           ActivityType = "REMOVED_WATCHED"
+	RATING_CHANGED            ActivityType = "RATING_CHANGED"
+	STATUS_CHANGED            ActivityType = "STATUS_CHANGED"
+	THOUGHTS_CHANGED          ActivityType = "THOUGHTS_CHANGED"
+	THOUGHTS_REMOVED          ActivityType = "THOUGHTS_REMOVED"
+	IMPORTED_WATCHED          ActivityType = "IMPORTED_WATCHED"
+	IMPORTED_WATCHED_JF       ActivityType = "IMPORTED_WATCHED_JF"
+	IMPORTED_RATING           ActivityType = "IMPORTED_RATING"        // Imported rating, but with no rating acts as original import of content to old platform (where they are importing from) activity
+	IMPORTED_ADDED_WATCHED    ActivityType = "IMPORTED_ADDED_WATCHED" // Imported watched date, so we can save the original watch dates of content from users old platform (where they are importing from).
+	IMPORTED_ADDED_WATCHED_JF ActivityType = "IMPORTED_ADDED_WATCHED_JF"
+	SEASON_ADDED              ActivityType = "SEASON_ADDED"
+	SEASON_ADDED_JF           ActivityType = "SEASON_ADDED_JF"
+	SEASON_REMOVED            ActivityType = "SEASON_REMOVED"
+	SEASON_RATING_CHANGED     ActivityType = "SEASON_RATING_CHANGED"
+	SEASON_STATUS_CHANGED     ActivityType = "SEASON_STATUS_CHANGED"
+	EPISODE_ADDED             ActivityType = "EPISODE_ADDED"
+	EPISODE_ADDED_JF          ActivityType = "EPISODE_ADDED_JF"
+	EPISODE_REMOVED           ActivityType = "EPISODE_REMOVED"
+	EPISODE_RATING_CHANGED    ActivityType = "EPISODE_RATING_CHANGED"
+	EPISODE_STATUS_CHANGED    ActivityType = "EPISODE_STATUS_CHANGED"
 )
 
 type Activity struct {

server/jellyfin.go

@@ -8,26 +8,71 @@ import (
 	"log/slog"
 	"net/http"
 	"net/url"
+	"time"
+
+	"github.com/gin-gonic/gin"
 )
 
 type JellyfinItemSearchResponse struct {
 	Items []JellyfinItems `json:"Items"`
 }
 
 type JellyfinItems struct {
+	Name        string `json:"Name"`
 	Type        string `json:"Type"`
 	ServerID    string `json:"ServerId"`
 	Id          string `json:"Id"`
 	ProviderIds struct {
 		Tmdb string `json:"Tmdb"`
 	} `json:"ProviderIds"`
+	UserData struct {
+		Rating                float64   `json:"Rating"`
+		PlayedPercentage      float64   `json:"PlayedPercentage"`
+		UnplayedItemCount     int64     `json:"UnplayedItemCount"`
+		PlaybackPositionTicks int64     `json:"PlaybackPositionTicks"`
+		PlayCount             int64     `json:"PlayCount"`
+		IsFavorite            bool      `json:"IsFavorite"`
+		Likes                 bool      `json:"Likes"`
+		LastPlayedDate        time.Time `json:"LastPlayedDate"`
+		Played                bool      `json:"Played"`
+		Key                   string    `json:"Key"`
+		ItemId                string    `json:"ItemId"`
+	} `json:"UserData"`
+	RecursiveItemCount int64 `json:"RecursiveItemCount"`
 }
 
 type JFContentFindResponse struct {
 	HasContent bool   `json:"hasContent"`
 	Url        string `json:"url"`
 }
 
+// Jellyfin access middleware, ensures user is a jellyfin user.
+// To be ran after AuthRequired middleware with extra data.
+func JellyfinAccessRequired() gin.HandlerFunc {
+	return func(c *gin.Context) {
+		userId := c.MustGet("userId").(uint)
+		slog.Debug("JellyfinAccessRequired middleware hit", "user_id", userId)
+		userType := c.MustGet("userType").(UserType)
+		userThirdPartyId := c.MustGet("userThirdPartyId").(string)
+		userThirdPartyAuth := c.MustGet("userThirdPartyAuth").(string)
+		if Config.JELLYFIN_HOST == "" {
+			slog.Error("JellyfinAccessRequired: Request made to login via Jellyfin, but JELLYFIN_HOST has not been configured.")
+			c.AbortWithStatus(401)
+			return
+		}
+		if userType != JELLYFIN_USER || userThirdPartyId == "" {
+			slog.Error("JellyfinAccessRequired: User is not a jellyfin user..", "user_type", userType, "user_third_party_id", userThirdPartyId)
+			c.AbortWithStatus(401)
+			return
+		}
+		if userThirdPartyAuth == "" {
+			slog.Error("JellyfinAccessRequired: User has no thirdPartyAuth token..")
+			c.AbortWithStatus(401)
+			return
+		}
+	}
+}
+
 func jellyfinAPIRequest(method string, ep string, p map[string]string, username string, userToken string, resp interface{}) error {
 	if Config.JELLYFIN_HOST == "" {
 		slog.Error("jellyfinAPIRequest: JELLYFIN_HOST not configured.")
@@ -97,18 +142,6 @@ func jellyfinContentFind(
 	contentName string,
 	contentTmdbId string,
 ) (JFContentFindResponse, error) {
-	if Config.JELLYFIN_HOST == "" {
-		slog.Error("Request made to login via Jellyfin, but JELLYFIN_HOST has not been configured.")
-		return JFContentFindResponse{}, errors.New("jellyfin login not enabled")
-	}
-	if userType != JELLYFIN_USER || userThirdPartyId == "" {
-		slog.Error("User is not a jellyfin user..", "user_type", userType, "user_third_party_id", userThirdPartyId)
-		return JFContentFindResponse{}, errors.New("not jellyfin user")
-	}
-	if userThirdPartyAuth == "" {
-		slog.Error("User has no thirdPartyAuth token..")
-		return JFContentFindResponse{}, errors.New("user has no jellyfin auth token")
-	}
 	if contentType == "" || contentName == "" {
 		slog.Error("Bad request", "content_type", contentType, "content_name", contentName)
 		return JFContentFindResponse{}, errors.New("content type or name not provided")