nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Refactor duplicate code for parsing photo URL

Browse source
This commit is contained in:
Matthew Exon 2020-01-09 21:41:35 +01:00 committed by Matthew Exon
parent a5895f8623
commit 95e65e37ee
2 changed files with 26 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Model/Mail.php
View file

@ -215,12 +215,10 @@ class Mail
$images = $match[1]; $images = $match[1];
if (count($images)) { if (count($images)) {
foreach ($images as $image) { foreach ($images as $image) {
if (!stristr($image, DI::baseUrl() . '/photo/')) { $image_rid = Photo::ridFromURI($image);
continue; if ($image_rid) {
Photo::update(['allow-cid' => '<' . $recipient . '>'], ['resource-id' => $image_rid, 'album' => 'Wall Photos', 'uid' => local_user()]);
} }
$image_uri = substr($image, strrpos($image, '/') + 1);
$image_uri = substr($image_uri, 0, strpos($image_uri, '-'));
Photo::update(['allow-cid' => '<' . $recipient . '>'], ['resource-id' => $image_uri, 'album' => 'Wall Photos', 'uid' => local_user()]);
} }
} }
} }

31
src/Model/Photo.php
View file

@ -596,6 +596,25 @@ class Photo
return System::createGUID(32, false); return System::createGUID(32, false);
} }
/**
* Extracts the rid from a local photo URI
*
* @param string $image_uri The URI of the photo
* @return string The rid of the photo, or an empty string if the URI is not local
*/
public static function ridFromURI($image_uri)
{
if (!stristr($image_uri, DI::baseUrl() . '/photo/')) {
return;
}
$image_uri = substr($image_uri, strrpos($image_uri, '/') + 1);
$image_uri = substr($image_uri, 0, strpos($image_uri, '-'));
if (!strlen($image_uri)) {
return;
}
return $image_uri;
}
/** /**
* Changes photo permissions that had been embedded in a post * Changes photo permissions that had been embedded in a post
* *
@ -622,12 +641,8 @@ class Photo
} }
foreach ($images as $image) { foreach ($images as $image) {
if (!stristr($image, DI::baseUrl() . '/photo/')) { $image_rid = ridFromURI($image);
continue; if (!$image_rid) {
}
$image_uri = substr($image,strrpos($image,'/') + 1);
$image_uri = substr($image_uri,0, strpos($image_uri,'-'));
if (!strlen($image_uri)) {
continue; continue;
} }
@ -636,7 +651,7 @@ class Photo
$condition = [ $condition = [
'allow_cid' => $srch, 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '', 'allow_cid' => $srch, 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '',
'resource-id' => $image_uri, 'uid' => $uid 'resource-id' => $image_rid, 'uid' => $uid
]; ];
if (!Photo::exists($condition)) { if (!Photo::exists($condition)) {
continue; continue;
@ -646,7 +661,7 @@ class Photo
$fields = ['allow_cid' => $str_contact_allow, 'allow_gid' => $str_group_allow, $fields = ['allow_cid' => $str_contact_allow, 'allow_gid' => $str_group_allow,
'deny_cid' => $str_contact_deny, 'deny_gid' => $str_group_deny]; 'deny_cid' => $str_contact_deny, 'deny_gid' => $str_group_deny];
$condition = ['resource-id' => $image_uri, 'uid' => $uid]; $condition = ['resource-id' => $image_rid, 'uid' => $uid];
Logger::info('Set permissions', ['condition' => $condition, 'permissions' => $fields]); Logger::info('Set permissions', ['condition' => $condition, 'permissions' => $fields]);
Photo::update($fields, $condition); Photo::update($fields, $condition);
} }