cleaner login process

_already_sent/0cf7dedb7cfac4340056a612bc3c50b1.txt

@@ -1 +0,0 @@
-https://www.openculture.com/2025/05/how-frank-lloyd-wrights-architecture-evolved-over-70-years-and-changed-america.html

_already_sent/12b2cc8c05f23758c6e812ef34044f53.txt

@@ -1 +0,0 @@
-https://en.wikipedia.org/wiki/Rainhill_trials

_already_sent/3f2721d52927f2d2c5f1146665b441dd.txt

@@ -1 +0,0 @@
-https://fossforce.com/2025/04/is-free-or-open-source-software-sustainable/

_already_sent/8eef8d9550fb4952c4ef2ba2656b4038.txt

@@ -1 +0,0 @@
-https://manualdousuario.net/en/writing-chatgpt-ai/

_already_sent/a3ffc5f64551046ad7132d159f1f40e7.txt

@@ -1 +0,0 @@
-https://goblackcat.com/feeling-exhausted/

_already_sent/db41d26877002dfa9dba650122b8a298.txt

@@ -1 +0,0 @@
-https://fenati.org.br/brasil-prepara-marco-regulatorio-para-data-centers-com-beneficios-fiscais-e-regras-sustentaveis/#datacenter

add_to_fedilist.php

@@ -1,27 +1,83 @@
 <?php
 
+
 // === Example use ===
 #addVideoToFediList('https://www.youtube.com/watch?v=dQw4w9WgXcQ');
 
+require_once('utils.php');
+
 function isYouTubeLink($url) {
     return preg_match('#^(https?://)?(www\.)?(youtube\.com/watch\?v=|youtu\.be/)[a-zA-Z0-9_-]{11}#', $url);
 }
 
 function addVideoToFediList($videoUrl) {
 
-    $playlistId = @file_get_contents(__DIR__ .'/_credentials/fedilist_id.txt');
+    $credentialsDir = __DIR__ . '/_credentials';
+    $tokenPath = "$credentialsDir/token.json";
+    $playlistId = @file_get_contents("$credentialsDir/fedilist_id.txt");
+
     if (!$playlistId) {
         echo "‼️ Error: FediList ID not found. Make sure fedilist_id.txt exists.\n";
         return false;
     }
 
-    $token = @json_decode(file_get_contents(__DIR__ .'/_credentials/token.json'), true);
+    // === Load client credentials ===
+    $secrets = json_decode(file_get_contents("$credentialsDir/client_secret.json"), true);
+    $client = $secrets['installed'] ?? $secrets['web'] ?? null;
+
+    if (!$client || !isset($client['client_id'], $client['client_secret'])) {
+        die("Error: Invalid client_secret.json format.\n");
+    }
+
+    $clientId = $client['client_id'];
+    $clientSecret = $client['client_secret'];
+
+    // === Load token ===
+    $token = @json_decode(file_get_contents($tokenPath), true);
     if (!$token || !isset($token['access_token'])) {
         echo "‼️ Error: token.json missing or invalid. Authenticate first.\n";
         return false;
     }
     
-    // Extract video ID from URL
+    //print_r($token);
+
+    // === Refresh token if expired ===
+
+    // Don't let it expire, refresh if we have less than 15 minutes left
+    // Google Tokens usually last 60 min, so more ore less around 45min we get a new one
+    $refreshSecondMargin = 15*60;
+
+   if (isset($token['expires_at'])) {
+    $secondsLeft = $token['expires_at'] - time();
+    if ($secondsLeft > $refreshSecondMargin) {
+        $minutes = floor($secondsLeft / 60);
+        $seconds = $secondsLeft % 60;
+        echo "⏳ Token expires in $minutes minutes and $seconds seconds.\n";
+    } else {
+        echo "🔄 Access token expired or will expire in less than $refreshSecondMargin seconds. (Seconds Left: $secondsLeft).  Refreshing...\n";
+
+        $refreshResponse = curlPost('https://oauth2.googleapis.com/token', [
+            'client_id' => $clientId,
+            'client_secret' => $clientSecret,
+            'refresh_token' => $token['refresh_token'],
+            'grant_type' => 'refresh_token'
+        ]);
+
+        if (isset($refreshResponse['access_token'])) {
+            $token['access_token'] = $refreshResponse['access_token'];
+            $token['expires_in'] = $refreshResponse['expires_in'];
+            $token['expires_at'] = time() + $refreshResponse['expires_in'];
+            file_put_contents($tokenPath, json_encode($token));
+            echo "✅ Token refreshed.\n";
+        } else {
+            echo "‼️ Failed to refresh token: " . ($refreshResponse['error'] ?? 'unknown') . "\n";
+            return false;
+        }
+    }
+}
+
+
+    // === Extract video ID ===
     if (!preg_match('/(?:v=|\/)([a-zA-Z0-9_-]{11})/', $videoUrl, $matches)) {
         echo "⁉️ Invalid YouTube URL: $videoUrl\n";
         return false;

update_google_token.php

@@ -1,6 +1,8 @@
 #!/usr/bin/php
 <?php
 
+require_once('utils.php');
+
 // === Load client credentials ===
 $secrets = json_decode(file_get_contents(__DIR__ . '/_credentials/client_secret.json'), true);
 $client = $secrets['installed'] ?? $secrets['web'] ?? null;
@@ -12,31 +14,13 @@ if (!$client || !isset($client['client_id'], $client['client_secret'])) {
 $clientId = $client['client_id'];
 $clientSecret = $client['client_secret'];
 
-// === cURL helper function ===
-function curlPost($url, $data, $headers = []) {
-    $ch = curl_init($url);
-    curl_setopt($ch, CURLOPT_POST, true);
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-    curl_setopt($ch, CURLOPT_HTTPHEADER, array_merge([
-        'Content-Type: application/x-www-form-urlencoded',
-        'User-Agent: curl/7.64.1'
-    ], $headers));
-    curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($data));
-    $response = curl_exec($ch);
-    if (curl_errno($ch)) {
-        die("cURL error: " . curl_error($ch) . "\n");
-    }
-    curl_close($ch);
-    return json_decode($response, true);
-}
-
 // === Create playlist helper ===
 function createPlaylist($accessToken) {
 
     $path = __DIR__ . '/_credentials/fedilist_id.txt';
 
     if (file_exists($path))   {
-            echo "FediList Playlist ID already exists at :$path\n";
+            echo "✅ FediList Playlist ID already exists at :$path\n";
 	    return;
     }
 
@@ -88,11 +72,15 @@ if (!isset($deviceData['user_code'])) {
     die("Failed to get device code.\n");
 }
 
+echo "\n";
+echo "==============================\n";
 echo "==== DEVICE AUTHORIZATION ====\n";
+echo "==============================\n";
 echo "Visit:      " . $deviceData['verification_url'] . "\n";
-echo "Enter code: " . $deviceData['user_code'] . "\n\n";
+echo "\n";
+echo "Enter code: " . $deviceData['user_code'] . "\n\nFinish login process and come back here.";
 
-echo "Waiting...\n";
+echo "\n\nWaiting...";
 
 
 // === Step 2: Poll for token ===
@@ -100,6 +88,7 @@ $token = null;
 $startTime = time();
 while (true) {
     sleep($deviceData['interval']);
+    echo ".";
 
     $tokenResponse = curlPost('https://oauth2.googleapis.com/token', [
         'client_id' => $clientId,
@@ -109,22 +98,24 @@ while (true) {
     ]);
 
     if (isset($tokenResponse['access_token'])) {
-        $token = $tokenResponse;
+    	$tokenResponse['expires_at'] = time() + $tokenResponse['expires_in'];
-	echo "Saving token.json\n";
+	$path  = __DIR__ . '/_credentials/token.json';
-        file_put_contents(__DIR__ . '/_credentials/token.json', json_encode($token));
+    	file_put_contents($path, json_encode($tokenResponse));
-        break;
+    	echo "\n✅ Token saved as $path.\n";
+	break;
     }
 
+
     if (isset($tokenResponse['error']) && $tokenResponse['error'] !== 'authorization_pending') {
-        die("Auth error: " . $tokenResponse['error'] . "\n");
+        die("\nAuth error: " . $tokenResponse['error'] . "\n");
     }
 
     if (time() - $startTime > $deviceData['expires_in']) {
-        die("Authorization timed out.\n");
+        die("\nAuthorization timed out.\n");
     }
 }
 
 // === Step 3: Create FediList Playlist ===
-createPlaylist($token['access_token']);
+createPlaylist($tokenResponse['access_token']);
 
 ?>

utils.php

@@ -0,0 +1,21 @@
+<?php
+
+// === cURL helper function ===
+function curlPost($url, $data, $headers = []) {
+    $ch = curl_init($url);
+    curl_setopt($ch, CURLOPT_POST, true);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+    curl_setopt($ch, CURLOPT_HTTPHEADER, array_merge([
+        'Content-Type: application/x-www-form-urlencoded',
+        'User-Agent: curl/7.64.1'
+    ], $headers));
+    curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($data));
+    $response = curl_exec($ch);
+    if (curl_errno($ch)) {
+        die("cURL error: " . curl_error($ch) . "\n");
+    }
+    curl_close($ch);
+    return json_decode($response, true);
+}
+
+?>