friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Changed regexp

This commit is contained in:
Michael 2019-07-22 06:03:18 +00:00
parent 53ffe5a2e1
commit 105378f5a4
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Protocol/Diaspora.php
View File

@ -1425,23 +1425,21 @@ class Diaspora
*/ */
public static function fetchByURL($url, $uid = 0) public static function fetchByURL($url, $uid = 0)
{ {
if (!preg_match("=([http|https].*)/(.*)/(.*)=ism", $url, $matches)) { // Check for Diaspora (and Friendica) typical paths
if (!preg_match("=(https?://.+)/(?:posts|display)/([a-zA-Z0-9-_@.:%]+[a-zA-Z0-9])=i", $url, $matches)) {
return false; return false;
} }
// Check for Diaspora (and Friendica) typical path components $guid = urldecode($matches[2]);
if (!in_array($matches[2], ['posts', 'display'])) {
return false;
}
$item = Item::selectFirst(['id'], ['guid' => $matches[3], 'uid' => $uid]); $item = Item::selectFirst(['id'], ['guid' => $guid, 'uid' => $uid]);
if (DBA::isResult($item)) { if (DBA::isResult($item)) {
return $item['id']; return $item['id'];
} }
self::storeByGuid($matches[3], $matches[1], $uid); self::storeByGuid($guid, $matches[1], $uid);
$item = Item::selectFirst(['id'], ['guid' => $matches[3], 'uid' => $uid]); $item = Item::selectFirst(['id'], ['guid' => $guid, 'uid' => $uid]);
if (DBA::isResult($item)) { if (DBA::isResult($item)) {
return $item['id']; return $item['id'];
} else { } else {