浏览代码

Update AP helpers

Daniel Supernault 5 年之前
父节点
当前提交
18f32e7bcf
共有 1 个文件被更改,包括 5 次插入2 次删除
  1. 5 2
      app/Util/ActivityPub/Helpers.php

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

@@ -285,7 +285,7 @@ class Helpers {
 				} 
 			}
 
-			if(!self::validateUrl($activity['object']['id']) ||
+			if(!self::validateUrl($res['id']) ||
 			   !self::validateUrl($activity['object']['attributedTo'])
 			) {
 				return;
@@ -400,7 +400,10 @@ class Helpers {
 			return;
 		}
 		$domain = parse_url($res['id'], PHP_URL_HOST);
-		$username = (string) Purify::clean($res['preferredUsername']);
+		if(!isset($res['preferredUsername']) && !isset($res['nickname'])) {
+			return;
+		}
+		$username = (string) Purify::clean($res['preferredUsername'] ?? $res['nickname']);
 		if(empty($username)) {
 			return;
 		}