Upload 11 files

app.py

@@ -227,80 +227,12 @@ def logout():
 @app.route('/settings')
 @login_required
 def settings():
-    from bson.objectid import ObjectId
-    user_id = session.get('user_id')
-    db = get_db()
-    users = db.users
-    user = users.find_one({'_id': ObjectId(user_id)})
-    has_oauth = bool(user and user.get('oauth_token'))
-        
-    return render_template('settings.html', has_oauth=has_oauth)
+    return render_template('settings.html')
 
 @app.route('/')
 @login_required
 def index():
-    from bson.objectid import ObjectId
-    user_id = session.get('user_id')
-    user = get_db().users.find_one({'_id': ObjectId(user_id)})
-    has_oauth = bool(user and user.get('oauth_token'))
-    return render_template('index.html', has_oauth=has_oauth)
-
-@app.route('/api/oauth/start', methods=['POST'])
-@login_required
-def api_oauth_start():
-    client_id = os.getenv('YOUTUBE_CLIENT_ID')
-    if not client_id:
-        return jsonify({"error": "YOUTUBE_CLIENT_ID not configured"}), 500
-        
-    data = {
-        "client_id": client_id,
-        "scope": "https://www.googleapis.com/auth/youtube"
-    }
-    resp = requests.post("https://oauth2.googleapis.com/device/code", data=data)
-    if resp.status_code != 200:
-        return jsonify({"error": "Failed to contact Google OAuth"}), 500
-        
-    return jsonify(resp.json())
-
-@app.route('/api/oauth/poll', methods=['POST'])
-@login_required
-def api_oauth_poll():
-    client_id = os.getenv('YOUTUBE_CLIENT_ID')
-    client_secret = os.getenv('YOUTUBE_CLIENT_SECRET')
-    device_code = request.json.get('device_code')
-    
-    if not client_id or not client_secret or not device_code:
-        return jsonify({"error": "Missing credentials"}), 400
-        
-    data = {
-        "client_id": client_id,
-        "client_secret": client_secret,
-        "device_code": device_code,
-        "grant_type": "urn:ietf:params:oauth:grant-type:device_code"
-    }
-    
-    resp = requests.post("https://oauth2.googleapis.com/token", data=data)
-    
-    if resp.status_code == 200:
-        token_data = resp.json()
-        token_data["client_id"] = client_id
-        token_data["client_secret"] = client_secret
-        from bson.objectid import ObjectId
-        db = get_db()
-        db.users.update_one({'_id': ObjectId(session['user_id'])}, {'$set': {'oauth_token': json.dumps(token_data)}})
-        return jsonify({"status": "success", "token": token_data})
-    else:
-        try:
-            err_data = resp.json()
-            err = err_data.get("error")
-            if err in ["authorization_pending", "slow_down"]:
-                return jsonify({"status": "pending"})
-            elif err == "expired_token":
-                return jsonify({"status": "expired"}), 400
-        except Exception:
-            pass
-            
-        return jsonify({"error": resp.text}), 500
+    return render_template('index.html')
 
 @app.route('/api/status')
 def api_status():
@@ -554,68 +486,10 @@ def api_voice():
             return jsonify({"speak": "Skipping.", "action": "next_native"})
         if song:
             try:
-                user_id = session.get('user_id')
-                user = None
-                if user_id:
-                    from bson.objectid import ObjectId
-                    user = get_db().users.find_one({'_id': ObjectId(user_id)})
-                    
-                has_oauth = False
                 # Inject a Chrome-impersonated session to bypass YouTube bot blocking on Hugging Face Spaces
                 custom_session = cffi_requests.Session(impersonate="chrome")
-                try:
-                    if user and user.get('oauth_token'):
-                        filepath = f"oauth_{user_id}.json"
-                        with open(filepath, 'w') as f:
-                            f.write(user['oauth_token'])
-                        ytmusic = YTMusic(filepath, requests_session=custom_session)
-                        has_oauth = True
-                        # Read back in case of refresh
-                        with open(filepath, 'r') as f:
-                            refreshed = f.read()
-                        if refreshed != user['oauth_token']:
-                            get_db().users.update_one({'_id': ObjectId(user_id)}, {'$set': {'oauth_token': refreshed}})
-                    else:
-                        ytmusic = YTMusic(requests_session=custom_session)
-                except Exception:
-                    ytmusic = YTMusic(requests_session=custom_session)
-                    
-                is_personal = any(phrase in song.lower() for phrase in ["my liked", "my playlist", "my mix", "my supermix"])
+                ytmusic = YTMusic(requests_session=custom_session)
                 
-                if is_personal:
-                    if not has_oauth:
-                        return jsonify({"speak": "Please link your Google Account in the settings first to access your personal library."})
-                        
-                    if "liked" in song.lower():
-                        playlist = ytmusic.get_liked_songs(limit=50)
-                        video_ids = [track['videoId'] for track in playlist['tracks'] if track.get('videoId')]
-                        return jsonify({"speak": "Playing your liked songs.", "action": "play_native", "video_ids": video_ids, "title": "Liked Songs"})
-                    
-                    elif "playlist" in song.lower() or "mix" in song.lower():
-                        # Extract requested playlist name
-                        pl_name = song.lower().replace("my playlist", "").replace("my mix", "").replace("my supermix", "my supermix").strip()
-                        if not pl_name:
-                            pl_name = "my supermix" if "supermix" in song.lower() else "mix"
-                            
-                        playlists = ytmusic.get_library_playlists(limit=50)
-                        best_match = None
-                        
-                        # Find closest match
-                        for pl in playlists:
-                            if pl_name in pl.get('title', '').lower() or pl.get('title', '').lower() in pl_name:
-                                best_match = pl
-                                break
-                                
-                        if not best_match and playlists:
-                            best_match = playlists[0] # fallback to first
-                            
-                        if best_match:
-                            tracks = ytmusic.get_playlist(best_match['playlistId'], limit=50)
-                            video_ids = [track['videoId'] for track in tracks.get('tracks', []) if track.get('videoId')]
-                            return jsonify({"speak": f"Playing {best_match.get('title')}.", "action": "play_native", "video_ids": video_ids, "title": best_match.get('title')})
-                        else:
-                            return jsonify({"speak": "I couldn't find that playlist in your library."})
-
                 # Generic search
                 results = ytmusic.search(f"{song} lyrics", filter="videos", limit=10)
                 video_ids = [res['videoId'] for res in results if 'videoId' in res]

templates/index.html

@@ -929,33 +929,7 @@
         </aside>
     </div>
 
-    <!-- OAuth Modal -->
-    <div id="cookieModal" class="modal-overlay">
-        <div class="modal-content">
-            <h2 style="font-size: 1.8rem; margin-bottom: 0.5rem; color: var(--primary);"><i class="fa-brands fa-youtube" style="color: #ff0000;"></i> YouTube Music Setup</h2>
-            <p style="color: var(--text-muted); margin-bottom: 2rem; font-size: 0.9rem; line-height: 1.5;">Welcome! To play music flawlessly, please link your YouTube Music account.</p>
-            
-            <div id="oauthInitState">
-                <button type="button" class="btn-glow" id="startOauthBtn" style="width: 100%; justify-content: center; padding: 1rem 2rem; font-size: 1.1rem; margin-bottom: 1rem;">Link Google Account</button>
-                <button type="button" class="btn-glow" id="closeModalBtn" style="width: 100%; justify-content: center; padding: 1rem 2rem; font-size: 1.1rem; background: #333333; color: white; border: 1px solid var(--glass-border);">Skip</button>
-            </div>
 
-            <div id="oauthCodeState" style="display: none; text-align: center;">
-                <p style="color: var(--text-main); margin-bottom: 1rem;">Go to the link below and enter this code:</p>
-                <div style="background: rgba(0,0,0,0.5); padding: 1rem; border-radius: 8px; margin-bottom: 1rem;">
-                    <a id="oauthLink" href="#" target="_blank" style="color: var(--primary); font-size: 1.2rem; display: block; margin-bottom: 0.5rem;">google.com/device</a>
-                    <div style="display: flex; align-items: center; justify-content: center; gap: 15px;">
-                        <h1 id="oauthCode" style="color: var(--warning); letter-spacing: 5px; font-size: 2rem; margin: 0;"></h1>
-                        <button type="button" id="copyOauthCodeBtn" style="background: none; border: none; color: var(--text-muted); cursor: pointer; font-size: 1.5rem; transition: color 0.2s; padding: 0;" title="Copy code">
-                            <i class="fa-regular fa-copy"></i>
-                        </button>
-                    </div>
-                </div>
-                <p style="color: var(--text-muted); font-size: 0.85rem; margin-bottom: 1.5rem;"><i class="fa-solid fa-circle-notch fa-spin"></i> Waiting for authorization...</p>
-                <button type="button" class="btn-glow" id="cancelOauthBtn" style="width: 100%; justify-content: center; background: #333333; color: white; border: 1px solid var(--glass-border);">Cancel</button>
-            </div>
-        </div>
-    </div>
 
     <!-- Chat FAB for Mobile -->
     <button id="chatFab" class="chat-fab" title="Open Chat">
@@ -1502,102 +1476,7 @@
             if (e.key === 'Enter') sendTextMessage();
         });
 
-        // OAuth Modal Logic
-        {% if not has_oauth %}
-        document.getElementById('cookieModal').style.display = 'flex';
-        {% endif %}
-        
-        let oauthPollInterval = null;
-
-        document.getElementById('closeModalBtn')?.addEventListener('click', () => {
-            document.getElementById('cookieModal').style.display = 'none';
-        });
-
-        document.getElementById('copyOauthCodeBtn').addEventListener('click', function() {
-            const code = document.getElementById('oauthCode').innerText;
-            if (code) {
-                navigator.clipboard.writeText(code).then(() => {
-                    const icon = this.querySelector('i');
-                    icon.classList.remove('fa-copy', 'fa-regular');
-                    icon.classList.add('fa-check', 'fa-solid');
-                    icon.style.color = 'var(--success)';
-                    setTimeout(() => {
-                        icon.classList.remove('fa-check', 'fa-solid');
-                        icon.classList.add('fa-copy', 'fa-regular');
-                        icon.style.color = '';
-                    }, 2000);
-                });
-            }
-        });
-        
-        document.getElementById('cancelOauthBtn')?.addEventListener('click', () => {
-            if(oauthPollInterval) clearInterval(oauthPollInterval);
-            document.getElementById('oauthInitState').style.display = 'block';
-            document.getElementById('oauthCodeState').style.display = 'none';
-        });
-
-        document.getElementById('startOauthBtn')?.addEventListener('click', async () => {
-            const btn = document.getElementById('startOauthBtn');
-            const originalText = btn.innerHTML;
-            btn.innerHTML = '<i class="fa-solid fa-circle-notch fa-spin"></i> Connecting...';
-            btn.disabled = true;
-
-            try {
-                const response = await fetch('/api/oauth/start', { method: 'POST' });
-                const data = await response.json();
-                
-                btn.innerHTML = originalText;
-                btn.disabled = false;
-
-                if (data.error) {
-                    alert('Error starting OAuth: ' + data.error);
-                    return;
-                }
-                
-                document.getElementById('oauthLink').href = data.verification_url;
-                document.getElementById('oauthLink').innerText = data.verification_url;
-                document.getElementById('oauthCode').innerText = data.user_code;
-                
-                document.getElementById('oauthInitState').style.display = 'none';
-                document.getElementById('oauthCodeState').style.display = 'block';
-
-                // Start polling
-                const deviceCode = data.device_code;
-                const interval = data.interval || 5;
-                
-                oauthPollInterval = setInterval(async () => {
-                    try {
-                        const pollRes = await fetch('/api/oauth/poll', {
-                            method: 'POST',
-                            headers: { 'Content-Type': 'application/json' },
-                            body: JSON.stringify({ device_code: deviceCode })
-                        });
-                        const pollData = await pollRes.json();
-                        
-                        if (pollData.status === 'success') {
-                            clearInterval(oauthPollInterval);
-                            alert('Successfully linked YouTube Music!');
-                            window.location.reload();
-                        } else if (pollData.status === 'expired') {
-                            clearInterval(oauthPollInterval);
-                            alert('Code expired. Please try again.');
-                            document.getElementById('cancelOauthBtn').click();
-                        } else if (pollData.error) {
-                            clearInterval(oauthPollInterval);
-                            alert('Error: ' + pollData.error);
-                            document.getElementById('cancelOauthBtn').click();
-                        }
-                    } catch(err) {
-                        console.error('Polling error', err);
-                    }
-                }, interval * 1000);
 
-            } catch(e) {
-                btn.innerHTML = originalText;
-                btn.disabled = false;
-                alert('Connection error');
-            }
-        });
 
     </script>
 </body>

templates/settings.html

@@ -175,125 +175,13 @@
         </div>
 
         <div class="instructions" style="text-align: center;">
-            {% if has_oauth %}
-                <h3 style="color: var(--success);"><i class="fa-solid fa-circle-check"></i> Account Linked</h3>
-                <p style="margin-top: 10px;">Your YouTube Music account is successfully linked!</p>
-            {% else %}
-                <h3 style="color: var(--warning);"><i class="fa-solid fa-triangle-exclamation"></i> Account Not Linked</h3>
-                <p style="margin-top: 10px;">Link your account to ensure high-quality music streaming.</p>
-            {% endif %}
+            <h3 style="color: var(--text-main);"><i class="fa-solid fa-info-circle"></i> Settings</h3>
+            <p style="margin-top: 10px;">OAuth has been completely removed from the system. No configuration is required.</p>
         </div>
 
         <div id="oauthInitState">
-            <button type="button" class="btn-glow" id="startOauthBtn" style="margin-bottom: 1rem;">
-                {% if has_oauth %}Relink Account{% else %}Link Google Account{% endif %}
-            </button>
             <a href="{{ url_for('index') }}" class="btn-glow btn-secondary">Back to Dashboard</a>
         </div>
-
-        <div id="oauthCodeState" style="display: none; text-align: center;">
-            <p style="color: var(--text-main); margin-bottom: 1rem;">Go to the link below and enter this code:</p>
-            <div style="background: rgba(0,0,0,0.5); padding: 1rem; border-radius: 8px; margin-bottom: 1rem;">
-                <a id="oauthLink" href="#" target="_blank" style="color: var(--primary); font-size: 1.2rem; display: block; margin-bottom: 0.5rem;">google.com/device</a>
-                <div style="display: flex; align-items: center; justify-content: center; gap: 15px;">
-                    <h1 id="oauthCode" style="color: var(--warning); letter-spacing: 5px; font-size: 2rem; margin: 0;"></h1>
-                    <button type="button" id="copyOauthCodeBtn" style="background: none; border: none; color: var(--text-muted); cursor: pointer; font-size: 1.5rem; transition: color 0.2s; padding: 0;" title="Copy code">
-                        <i class="fa-regular fa-copy"></i>
-                    </button>
-                </div>
-            </div>
-            <p style="color: var(--text-muted); font-size: 0.85rem; margin-bottom: 1.5rem;"><i class="fa-solid fa-circle-notch fa-spin"></i> Waiting for authorization...</p>
-            <button type="button" class="btn-glow btn-secondary" id="cancelOauthBtn">Cancel</button>
-        </div>
     </div>
-
-    <script>
-        let oauthPollInterval = null;
-
-        document.getElementById('copyOauthCodeBtn').addEventListener('click', function() {
-            const code = document.getElementById('oauthCode').innerText;
-            if (code) {
-                navigator.clipboard.writeText(code).then(() => {
-                    const icon = this.querySelector('i');
-                    icon.classList.remove('fa-copy', 'fa-regular');
-                    icon.classList.add('fa-check', 'fa-solid');
-                    icon.style.color = 'var(--success)';
-                    setTimeout(() => {
-                        icon.classList.remove('fa-check', 'fa-solid');
-                        icon.classList.add('fa-copy', 'fa-regular');
-                        icon.style.color = '';
-                    }, 2000);
-                });
-            }
-        });
-        
-        document.getElementById('cancelOauthBtn')?.addEventListener('click', () => {
-            if(oauthPollInterval) clearInterval(oauthPollInterval);
-            document.getElementById('oauthInitState').style.display = 'block';
-            document.getElementById('oauthCodeState').style.display = 'none';
-        });
-
-        document.getElementById('startOauthBtn')?.addEventListener('click', async () => {
-            const btn = document.getElementById('startOauthBtn');
-            const originalText = btn.innerHTML;
-            btn.innerHTML = '<i class="fa-solid fa-circle-notch fa-spin"></i> Connecting...';
-            btn.disabled = true;
-
-            try {
-                const response = await fetch('/api/oauth/start', { method: 'POST' });
-                const data = await response.json();
-                
-                btn.innerHTML = originalText;
-                btn.disabled = false;
-
-                if (data.error) {
-                    alert('Error starting OAuth: ' + data.error);
-                    return;
-                }
-                
-                document.getElementById('oauthLink').href = data.verification_url;
-                document.getElementById('oauthLink').innerText = data.verification_url;
-                document.getElementById('oauthCode').innerText = data.user_code;
-                
-                document.getElementById('oauthInitState').style.display = 'none';
-                document.getElementById('oauthCodeState').style.display = 'block';
-
-                const deviceCode = data.device_code;
-                const interval = data.interval || 5;
-                
-                oauthPollInterval = setInterval(async () => {
-                    try {
-                        const pollRes = await fetch('/api/oauth/poll', {
-                            method: 'POST',
-                            headers: { 'Content-Type': 'application/json' },
-                            body: JSON.stringify({ device_code: deviceCode })
-                        });
-                        const pollData = await pollRes.json();
-                        
-                        if (pollData.status === 'success') {
-                            clearInterval(oauthPollInterval);
-                            alert('Successfully linked YouTube Music!');
-                            window.location.reload();
-                        } else if (pollData.status === 'expired') {
-                            clearInterval(oauthPollInterval);
-                            alert('Code expired. Please try again.');
-                            document.getElementById('cancelOauthBtn').click();
-                        } else if (pollData.error) {
-                            clearInterval(oauthPollInterval);
-                            alert('Error: ' + pollData.error);
-                            document.getElementById('cancelOauthBtn').click();
-                        }
-                    } catch(err) {
-                        console.error('Polling error', err);
-                    }
-                }, interval * 1000);
-
-            } catch(e) {
-                btn.innerHTML = originalText;
-                btn.disabled = false;
-                alert('Connection error');
-            }
-        });
-    </script>
 </body>
 </html>