瀏覽代碼

Update AP Helpers

Daniel Supernault 6 年之前
父節點
當前提交
962e619061
共有 1 個文件被更改,包括 5 次插入2 次删除
  1. 5 2
      app/Util/ActivityPub/Helpers.php

+ 5 - 2
app/Util/ActivityPub/Helpers.php

@@ -403,7 +403,10 @@ class Helpers {
 			return;
 			return;
 		}
 		}
 		$domain = parse_url($res['id'], PHP_URL_HOST);
 		$domain = parse_url($res['id'], PHP_URL_HOST);
-		$username = Purify::clean($res['preferredUsername']);
+		$username = (string) Purify::clean($res['preferredUsername']);
+		if(empty($username)) {
+			return;
+		}
 		$remoteUsername = "@{$username}@{$domain}";
 		$remoteUsername = "@{$username}@{$domain}";
 
 
 		abort_if(!self::validateUrl($res['inbox']), 400);
 		abort_if(!self::validateUrl($res['inbox']), 400);
@@ -414,7 +417,7 @@ class Helpers {
 		if(!$profile) {
 		if(!$profile) {
 			$profile = new Profile;
 			$profile = new Profile;
 			$profile->domain = $domain;
 			$profile->domain = $domain;
-			$profile->username = Purify::clean($remoteUsername);
+			$profile->username = (string) Purify::clean($remoteUsername);
 			$profile->name = Purify::clean($res['name']) ?? 'user';
 			$profile->name = Purify::clean($res['name']) ?? 'user';
 			$profile->bio = Purify::clean($res['summary']);
 			$profile->bio = Purify::clean($res['summary']);
 			$profile->sharedInbox = isset($res['endpoints']) && isset($res['endpoints']['sharedInbox']) ? $res['endpoints']['sharedInbox'] : null;
 			$profile->sharedInbox = isset($res['endpoints']) && isset($res['endpoints']['sharedInbox']) ? $res['endpoints']['sharedInbox'] : null;