eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Reduce duplication by handling both cases in find

Browse Source
This commit is contained in:
Stephen Paul Weber
2015-10-23 16:26:35 +00:00
parent 439b466979
commit 2030ddfc79
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/TwitterBridge/lib/twitterimport.php
View File

@@ -233,7 +233,10 @@ class TwitterImport
$profile->limit(1);
if (!$profile->find(true)) {
throw new NoResultException($profile);
$profile->profileurl = str_replace('https://', 'http://', $profileurl);
if (!$profile->find(true)) {
throw new NoResultException($profile);
}
}
return $profile;
}
@@ -242,16 +245,6 @@ class TwitterImport
{
// check to see if there's already a profile for this user
$profileurl = 'https://twitter.com/' . $twuser->screen_name;
try {
$profile = $this->getProfileByUrl($twuser->screen_name, $profileurl);
$this->updateAvatar($twuser, $profile);
return $profile;
} catch (NoResultException $e) {
common_debug(__METHOD__ . ' - Falling back to check for http: ' .
"for Twitter user: $profileurl.");
}
$profileurl = 'http://twitter.com/' . $twuser->screen_name;
try {
$profile = $this->getProfileByUrl($twuser->screen_name, $profileurl);
$this->updateAvatar($twuser, $profile);