Merged

[quix0rs-gnu-social.git] / plugins / OStatus / scripts / update-profile-data.php

diff --git a/plugins/OStatus/scripts/update-profile-data.php b/plugins/OStatus/scripts/update-profile-data.php
old mode 100644 (file)
new mode 100755 (executable)
index 20f6d57..c56bedd
--- a/plugins/OStatus/scripts/update-profile-data.php
+++ b/plugins/OStatus/scripts/update-profile-data.php
@@ -26,7 +26,8 @@ $helptext = <<<END_OF_HELP
 update-profile-data.php [options] [http://example.com/profile/url]
 
 Rerun profile discovery for the given OStatus remote profile, and save the
-updated profile data (nickname, avatar, bio, etc). Doesn't touch feed state.
+updated profile data (nickname, fullname, avatar, bio, etc).
+Doesn't touch feed state.
 Can be used to clean up after breakages.
 
 Options:
@@ -36,22 +37,26 @@ Options:
 
 END_OF_HELP;
 
-require_once INSTALLDIR.'/scripts/commandline.inc';
+require_once INSTALLDIR.'/scripts/commandline.inc.php';
 
-function showProfileInfo($oprofile) {
+function showProfileInfo(Ostatus_profile $oprofile) {
     if ($oprofile->isGroup()) {
         echo "group\n";
     } else {
         $profile = $oprofile->localProfile();
-        foreach (array('nickname', 'bio', 'homepage', 'location') as $field) {
-            print "  $field: {$profile->$field}\n";
+        try {
+            foreach (array('nickname', 'fullname', 'bio', 'homepage', 'location') as $field) {
+                print "  $field: {$profile->$field}\n";
+            }
+        } catch (NoProfileException $e) {
+            print "local profile not found";
         }
     }
     echo "\n";
 }
 
 function fixProfile($uri) {
-    $oprofile = Ostatus_profile::staticGet('uri', $uri);
+    $oprofile = Ostatus_profile::getKV('uri', $uri);
 
     if (!$oprofile) {
         print "No OStatus remote profile known for URI $uri\n";
@@ -94,6 +99,7 @@ function fixProfile($uri) {
 }
 
 $ok = true;
+$validate = new Validate();
 if (have_option('all')) {
     $oprofile = new Ostatus_profile();
     $oprofile->find();
@@ -110,7 +116,7 @@ if (have_option('all')) {
     while ($oprofile->fetch()) {
         $ok = fixProfile($oprofile->uri) && $ok;
     }
-} else if (!empty($args[0]) && Validate::uri($args[0])) {
+} else if (!empty($args[0]) && $validate->uri($args[0])) {
     $uri = $args[0];
     $ok = fixProfile($uri);
 } else {