Merge pull request #969 from pixelfed/frontend-ui-refactor

Update AP Helpers
This commit is contained in:
daniel 2019-03-05 19:52:56 -07:00 committed by GitHub
commit e32368bd5c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -293,6 +293,14 @@ class Helpers {
public static function profileFirstOrNew($url, $runJobs = false) public static function profileFirstOrNew($url, $runJobs = false)
{ {
$url = self::validateUrl($url);
$host = parse_url($url, PHP_URL_HOST);
$local = config('pixelfed.domain.app') == $host ? true : false;
if($local == true) {
$id = last(explode('/', $url));
return Profile::whereUsername($id)->firstOrFail();
}
$res = self::fetchProfileFromUrl($url); $res = self::fetchProfileFromUrl($url);
$domain = parse_url($res['id'], PHP_URL_HOST); $domain = parse_url($res['id'], PHP_URL_HOST);
$username = $res['preferredUsername']; $username = $res['preferredUsername'];