Merge remote-tracking branch 'upstream/master'

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

diff --git a/plugins/OStatus/scripts/fixup-shadow.php b/plugins/OStatus/scripts/fixup-shadow.php
index 3e2c18e02fb314780a4c382136de4fd90ee7fa0e..817ef4eb166cc9f97225443fd57ac564e4a63bb2 100644 (file)
--- a/plugins/OStatus/scripts/fixup-shadow.php
+++ b/plugins/OStatus/scripts/fixup-shadow.php
@@ -31,7 +31,7 @@ for local users and groups.
 
 END_OF_USERROLE_HELP;
 
-require_once INSTALLDIR.'/scripts/commandline.inc';
+require_once INSTALLDIR.'/scripts/commandline.inc.php';
 
 $dry = have_option('dry-run');
 
@@ -47,13 +47,13 @@ $count = $user->N;
 echo "Found $count...\n";
 
 while ($user->fetch()) {
-    $uri = $user->uri;
+    $uri = $user->getUri();
     echo "user $user->id ($user->nickname) hidden by $uri";
     if ($dry) {
         echo " - skipping\n";
     } else {
         echo " - removing bogus ostatus_profile entry...";
-        $evil = Ostatus_profile::staticGet('uri', $uri);
+        $evil = Ostatus_profile::getKV('uri', $uri);
         $evil->delete();
         echo "  ok\n";
     }
@@ -71,19 +71,63 @@ $count = $group->N;
 echo "Found $count...\n";
 
 while ($group->fetch()) {
-    $uri = $group->uri;
+    $uri = $group->getUri();
     echo "group $group->id ($group->nickname) hidden by $uri";
     if ($dry) {
         echo " - skipping\n";
     } else {
         echo " - removing bogus ostatus_profile entry...";
-        $evil = Ostatus_profile::staticGet('uri', $uri);
+        $evil = Ostatus_profile::getKV('uri', $uri);
         $evil->delete();
         echo "  ok\n";
     }
 }
 echo "\n";
 
+// And there may be user_group entries remaining where we've already killed
+// the ostatus_profile. These were "harmless" until our lookup started actually
+// using the uri field, at which point we can clearly see it breaks stuff.
+echo "Checking for leftover bogus user_group.uri entries obscuring local_group entries...\n";
+
+$group = new User_group();
+$group->joinAdd(array('id', 'local_group:group_id'), 'LEFT');
+$group->whereAdd('group_id IS NULL');
+
+
+$marker = mt_rand(31337, 31337000);
+$groupTemplate = common_local_url('groupbyid', array('id' => $marker));
+$encGroup = $group->escape($groupTemplate, true);
+$encGroup = str_replace($marker, '%', $encGroup);
+echo "  LIKE '$encGroup'\n";
+$group->whereAdd("uri LIKE '$encGroup'");
+
+$group->find();
+$count = $group->N;
+echo "Found $count...\n";
+
+while ($group->fetch()) {
+    $uri = $group->getUri();
+    if (preg_match('!/group/(\d+)/id!', $uri, $matches)) {
+        $id = intval($matches[1]);
+        $local = Local_group::getKV('group_id', $id);
+        if ($local) {
+            $nick = $local->nickname;
+        } else {
+            $nick = '<deleted>';
+        }
+        echo "local group $id ($local->nickname) hidden by $uri (bogus group id $group->id)";
+        if ($dry) {
+            echo " - skipping\n";
+        } else {
+            echo " - removing bogus user_group entry...";
+            $evil = User_group::getKV('id', $group->id);
+            $evil->delete();
+            echo "  ok\n";
+        }
+    }
+}
+echo "\n";
+
 
 // Fallback?
 echo "Checking for bogus profiles blocking local users/groups by URI pattern match...\n";
@@ -108,11 +152,11 @@ $count = $oprofile->N;
 echo "Found $count...\n";
 
 while ($oprofile->fetch()) {
-    $uri = $oprofile->uri;
-    if (preg_match('!/group/(\d+)/id!', $oprofile->uri, $matches)) {
+    $uri = $oprofile->getUri();
+    if (preg_match('!/group/(\d+)/id!', $oprofile->getUri(), $matches)) {
         $id = intval($matches[1]);
-        $group = Local_group::staticGet('group_id', $id);
-        if ($group) {
+        $group = Local_group::getKV('group_id', $id);
+        if ($group instanceof Local_group) {
             $nick = $group->nickname;
         } else {
             $nick = '<deleted>';
@@ -120,12 +164,14 @@ while ($oprofile->fetch()) {
         echo "group $id ($nick) hidden by $uri";
     } else if (preg_match('!/user/(\d+)!', $uri, $matches)) {
         $id = intval($matches[1]);
-        $user = User::staticGet('id', $id);
-        if ($user) {
+        $user = User::getKV('id', $id);
+
+        if ($user instanceof User) {
             $nick = $user->nickname;
         } else {
             $nick = '<deleted>';
         }
+
         echo "user $id ($nick) hidden by $uri";
     } else {
         echo "$uri matched query, but we don't recognize it.\n";