From: Mikael Nordfeldth Date: Mon, 28 Mar 2016 13:42:41 +0000 (+0200) Subject: OStatus update profile data script fixes X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a93c69d150612cb30a86f0a21303ab828a675eab;p=quix0rs-gnu-social.git OStatus update profile data script fixes --- diff --git a/plugins/OStatus/scripts/update-profile-data.php b/plugins/OStatus/scripts/update-profile-data.php index 97d44e3842..e713ee36fe 100755 --- a/plugins/OStatus/scripts/update-profile-data.php +++ b/plugins/OStatus/scripts/update-profile-data.php @@ -44,30 +44,19 @@ function showProfileInfo(Ostatus_profile $oprofile) { echo "group\n"; } else { $profile = $oprofile->localProfile(); - try { - foreach (array('nickname', 'fullname', 'bio', 'homepage', 'location') as $field) { - print " $field: {$profile->$field}\n"; - } - } catch (NoProfileException $e) { - print "local profile not found"; + foreach (array('nickname', 'fullname', 'bio', 'homepage', 'location') as $field) { + print " $field: {$profile->$field}\n"; } } echo "\n"; } -function fixProfile($uri) { - $oprofile = Ostatus_profile::getKV('uri', $uri); - - if (!$oprofile) { - print "No OStatus remote profile known for URI $uri\n"; - return false; - } - +function fixProfile(Ostatus_profile $oprofile) { echo "Before:\n"; showProfileInfo($oprofile); $feedurl = $oprofile->feeduri; - $client = new HttpClient(); + $client = new HTTPClient(); $response = $client->get($feedurl); if ($response->isOk()) { echo "Updating profile from feed: $feedurl\n"; @@ -106,7 +95,7 @@ if (have_option('all')) { echo "Found $oprofile->N profiles:\n\n"; while ($oprofile->fetch()) { try { - $ok = fixProfile($oprofile->uri) && $ok; + $ok = fixProfile($oprofile) && $ok; } catch (Exception $e) { $ok = false; echo "Failed on URI=="._ve($oprofile->uri).": {$e->getMessage()}\n"; @@ -120,7 +109,7 @@ if (have_option('all')) { echo "Found $oprofile->N matching profiles:\n\n"; while ($oprofile->fetch()) { try { - $ok = fixProfile($oprofile->uri) && $ok; + $ok = fixProfile($oprofile) && $ok; } catch (Exception $e) { $ok = false; echo "Failed on URI=="._ve($oprofile->uri).": {$e->getMessage()}\n"; @@ -128,8 +117,15 @@ if (have_option('all')) { } } else if (!empty($args[0]) && $validate->uri($args[0])) { $uri = $args[0]; + $oprofile = Ostatus_profile::getKV('uri', $uri); + + if (!$oprofile instanceof Ostatus_profile) { + print "No OStatus remote profile known for URI $uri\n"; + return false; + } + try { - $ok = fixProfile($oprofile->uri) && $ok; + $ok = fixProfile($oprofile) && $ok; } catch (Exception $e) { $ok = false; echo "Failed on URI=="._ve($oprofile->uri).": {$e->getMessage()}\n";