fix looking up the owner

ylebre · ylebre · commit ad6a834b5b93 · 2026-03-31T09:02:30.000+02:00
diff --git a/lib/User.php b/lib/User.php
@@ -269,11 +269,13 @@ public static function getUserById($userId) {
 		}
 
 		public static function getUserByWebId($webId) {
-			$idParts = explode(".", $webId, 2);
-			if ($idParts[1] !== BASEDOMAIN . "/#me") {
+			$webIdParts = parse_url($webId);
+			$idParts = explode(".", $webIdParts['host'], 2);
+			if ($idParts[1] !== BASEDOMAIN) {
 				return false;
 			}
-			$userId = preg_replace("/^id-/", "", $idParts[0]);
+			$userId = preg_replace("/^.*?id-/", "", $idParts[0]);
+
 			return self::getUserById($userId);
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -269,11 +269,13 @@ public static function getUserById($userId) {`
`269`	`269`	`}`
`270`	`270`
`271`	`271`	`public static function getUserByWebId($webId) {`
`272`		`- $idParts = explode(".", $webId, 2);`
`273`		`- if ($idParts[1] !== BASEDOMAIN . "/#me") {`
	`272`	`+ $webIdParts = parse_url($webId);`
	`273`	`+ $idParts = explode(".", $webIdParts['host'], 2);`
	`274`	`+ if ($idParts[1] !== BASEDOMAIN) {`
`274`	`275`	`return false;`
`275`	`276`	`}`
`276`		`- $userId = preg_replace("/^id-/", "", $idParts[0]);`
	`277`	`+ $userId = preg_replace("/^.*?id-/", "", $idParts[0]);`
	`278`	`+`
`277`	`279`	`return self::getUserById($userId);`
`278`	`280`	`}`
`279`	`281`