Merge remote-tracking branch 'upstream/master' into nightly

[quix0rs-gnu-social.git] / plugins / OStatus / scripts / gcfeeds.php

diff --git a/plugins/OStatus/scripts/gcfeeds.php b/plugins/OStatus/scripts/gcfeeds.php
old mode 100644 (file)
new mode 100755 (executable)
index 0de48a0..a95cd54
--- a/plugins/OStatus/scripts/gcfeeds.php
+++ b/plugins/OStatus/scripts/gcfeeds.php
@@ -20,25 +20,49 @@
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/../../..'));
 
+$longoptions = array('delete-inactive');
+$shortoptions = 'd';
+
 $helptext = <<<END_OF_HELP
 gcfeeds.php [options]
 Clean up feeds that no longer have subscribers.
 
+    -d --delete-inactive    Delete inactive feeds from feedsub table.
+
 END_OF_HELP;
 
 require_once INSTALLDIR.'/scripts/commandline.inc';
 
-$feedsub = new FeedSub();
+$delete_inactive = have_option('d', 'delete-inactive');
+$delcount = 0;
 
+$feedsub = new FeedSub();
+$feedsub->find();
 while ($feedsub->fetch()) {
-    echo "{$feedsub->uri} ({$feedsub->sub_state})";
     try {
+        echo $feedsub->getUri() . " ({$feedsub->sub_state})";
         if ($feedsub->garbageCollect()) {
+            if ($delete_inactive) {
+                $delcount++;
+                $feedsub->delete();
+                echo " DELETED";
+            }
             echo " INACTIVE\n";
         } else {
             echo " ACTIVE\n";
         }
+    } catch (NoProfileException $e) {
+        echo " DELETED (no profile)\n";
+        $feedsub->delete();
+        continue;
+    } catch (NoUriException $e) {
+        // Probably the getUri() call
+        echo "[unknown] DELETED (no uri)\n";
+        $feedsub->delete();
+        continue;
     } catch (Exception $e) {
         echo " ERROR: {$e->getMessage()}\n";
     }
 }
+
+if ($delete_inactive) echo "\nDeleted $delcount inactive feeds.\n";