From 4438431aff952dcafbf65608e5a43a66a58d6fc8 Mon Sep 17 00:00:00 2001
From: Joel Takvorian <jtakvori@redhat.com>
Date: Sun, 7 Aug 2022 15:05:45 +0200
Subject: [PATCH 1/2] Do not show discovery menu when spotify is not used

Fixes #856
---
 src/js/components/Sidebar.js | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/js/components/Sidebar.js b/src/js/components/Sidebar.js
index 2578bfec..73697a13 100755
--- a/src/js/components/Sidebar.js
+++ b/src/js/components/Sidebar.js
@@ -85,11 +85,11 @@ const Sidebar = () => {
             </Link>
           </section>
 
-          <section className="sidebar__menu__section">
-            <title className="sidebar__menu__section__title">
-              <I18n path="sidebar.discover" />
-            </title>
-            {spotify_available && (
+          {spotify_available && (
+            <section className="sidebar__menu__section">
+              <title className="sidebar__menu__section__title">
+                <I18n path="sidebar.discover" />
+              </title>
               <Link
                 to="/discover/recommendations"
                 className="sidebar__menu__item"
@@ -98,22 +98,20 @@ const Sidebar = () => {
                 <Icon name="explore" type="material" />
                 <I18n path="sidebar.discover" />
               </Link>
-            )}
-            <Link to="/discover/moods" className="sidebar__menu__item" activeClassName="sidebar__menu__item--active">
-              <Icon name="mood" type="material" />
-              <I18n path="sidebar.moods" />
-            </Link>
-            {spotify_available && (
+              <Link to="/discover/moods" className="sidebar__menu__item" activeClassName="sidebar__menu__item--active">
+                <Icon name="mood" type="material" />
+                <I18n path="sidebar.moods" />
+              </Link>
               <Link to="/discover/featured-playlists" className="sidebar__menu__item" activeClassName="sidebar__menu__item--active">
                 <Icon name="star" type="material" />
                 <I18n path="sidebar.featured_playlists" />
               </Link>
-            )}
-            <Link to="/discover/new-releases" className="sidebar__menu__item" activeClassName="sidebar__menu__item--active">
-              <Icon name="new_releases" type="material" />
-              <I18n path="sidebar.new_releases" />
-            </Link>
-          </section>
+              <Link to="/discover/new-releases" className="sidebar__menu__item" activeClassName="sidebar__menu__item--active">
+                <Icon name="new_releases" type="material" />
+                <I18n path="sidebar.new_releases" />
+              </Link>
+            </section>
+          )}
 
           <section className="sidebar__menu__section">
             <title className="sidebar__menu__section__title">

From cfca0b95d437f0f279663a9894c043c07f0df9bc Mon Sep 17 00:00:00 2001
From: Joel Takvorian <jtakvori@redhat.com>
Date: Sun, 7 Aug 2022 15:49:57 +0200
Subject: [PATCH 2/2] Distinguish "missing spotify token" vs "spotify not
 enabled"

---
 src/js/components/Sidebar.js | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/js/components/Sidebar.js b/src/js/components/Sidebar.js
index 73697a13..77bf3682 100755
--- a/src/js/components/Sidebar.js
+++ b/src/js/components/Sidebar.js
@@ -66,7 +66,8 @@ const StatusIcon = () => {
 
 const Sidebar = () => {
   const dispatch = useDispatch();
-  const spotify_available = useSelector((state) => state.spotify.access_token);
+  const spotify_enabled = useSelector((state) => state.spotify.enabled);
+  const spotify_has_token = useSelector((state) => state.spotify.access_token);
 
   const close = () => dispatch(toggleSidebar(false));
 
@@ -85,27 +86,31 @@ const Sidebar = () => {
             </Link>
           </section>
 
-          {spotify_available && (
+          {spotify_enabled && (
             <section className="sidebar__menu__section">
               <title className="sidebar__menu__section__title">
                 <I18n path="sidebar.discover" />
               </title>
-              <Link
-                to="/discover/recommendations"
-                className="sidebar__menu__item"
-                activeClassName="sidebar__menu__item--active"
-              >
-                <Icon name="explore" type="material" />
-                <I18n path="sidebar.discover" />
-              </Link>
+              {spotify_has_token && (
+                <Link
+                  to="/discover/recommendations"
+                  className="sidebar__menu__item"
+                  activeClassName="sidebar__menu__item--active"
+                >
+                  <Icon name="explore" type="material" />
+                  <I18n path="sidebar.discover" />
+                </Link>
+              )}
               <Link to="/discover/moods" className="sidebar__menu__item" activeClassName="sidebar__menu__item--active">
                 <Icon name="mood" type="material" />
                 <I18n path="sidebar.moods" />
               </Link>
-              <Link to="/discover/featured-playlists" className="sidebar__menu__item" activeClassName="sidebar__menu__item--active">
-                <Icon name="star" type="material" />
-                <I18n path="sidebar.featured_playlists" />
-              </Link>
+              {spotify_has_token && (
+                <Link to="/discover/featured-playlists" className="sidebar__menu__item" activeClassName="sidebar__menu__item--active">
+                  <Icon name="star" type="material" />
+                  <I18n path="sidebar.featured_playlists" />
+                </Link>
+              )}
               <Link to="/discover/new-releases" className="sidebar__menu__item" activeClassName="sidebar__menu__item--active">
                 <Icon name="new_releases" type="material" />
                 <I18n path="sidebar.new_releases" />