From 5011b975796877f83e860feb93cda67c5afd2b4d Mon Sep 17 00:00:00 2001
From: DariusIII <dkrisan@gmail.com>
Date: Fri, 23 Nov 2018 10:25:28 +0100
Subject: [PATCH] Fix MyMovies RSS feed

---
 Blacklight/http/RSS.php                     | 8 ++++----
 Changelog                                   | 2 ++
 app/Http/Controllers/MyMoviesController.php | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Blacklight/http/RSS.php b/Blacklight/http/RSS.php
index cb5b5b934..631894bf4 100755
--- a/Blacklight/http/RSS.php
+++ b/Blacklight/http/RSS.php
@@ -186,14 +186,14 @@ class RSS extends Capabilities
      * Get movies for RSS.
      *
      *
-     * @param       $limit
+     * @param int   $limit
      * @param int   $userID
      * @param array $excludedCats
      *
      * @return \Illuminate\Database\Eloquent\Builder[]|\Illuminate\Database\Eloquent\Collection|mixed
      * @throws \Exception
      */
-    public function getMyMoviesRss($limit, $userID = 0, array $excludedCats = [])
+    public function getMyMoviesRss($limit = 0, $userID = 0, array $excludedCats = [])
     {
         $sql = sprintf(
             "
@@ -205,7 +205,7 @@ class RSS extends Capabilities
 				LEFT JOIN categories c ON c.id = r.categories_id
 				INNER JOIN categories cp ON cp.id = c.parentid
 				LEFT JOIN groups g ON g.id = r.groups_id
-				LEFT JOIN movieinfo mi ON mi.imdbid = r.imdbid
+				LEFT JOIN movieinfo mi ON mi.id = r.movieinfo_id
 				WHERE %s %s
 				AND r.nzbstatus = %d
 				AND r.categories_id BETWEEN %d AND %d
@@ -229,7 +229,7 @@ class RSS extends Capabilities
             Category::MOVIE_ROOT,
             Category::MOVIE_OTHER,
             $this->releases->showPasswords(),
-            ' LIMIT '.($limit > 100 ? 100 : $limit).' OFFSET 0'
+            $limit > 0 ? ' LIMIT '.($limit > 100 ? 100 : $limit).' OFFSET 0' : ''
         );
 
         $expiresAt = now()->addMinutes(config('nntmux.cache_expiry_medium'));
diff --git a/Changelog b/Changelog
index 69edd5bcf..07d0192f2 100755
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,5 @@
+2018-11-23 DariusIII
+	* Fix: Fix MyMovies RSS feed
 2018-11-22 DariusIII
 	* Chg: Update RSS class
 	* Chg: Rename .php-cs to .php-cs.dist
diff --git a/app/Http/Controllers/MyMoviesController.php b/app/Http/Controllers/MyMoviesController.php
index 9653fa46c..b630c9b29 100644
--- a/app/Http/Controllers/MyMoviesController.php
+++ b/app/Http/Controllers/MyMoviesController.php
@@ -59,7 +59,7 @@ class MyMoviesController extends BasePageController
 
                 if ($action === 'doadd') {
                     $category = ($request->has('category') && \is_array($request->input('category')) && ! empty($request->input('category'))) ? $request->input('category') : [];
-                    UserMovie::addMovie($this->userdata->id, $imdbid, $category);
+                    UserMovie::addMovie($this->userdata->id, str_pad($imdbid, 7, '0', STR_PAD_LEFT), $category);
                     if ($request->has('from')) {
                         return redirect($request->input('from'));
                     }