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

Implement code review from nupplaphil

This commit is contained in:
Matthew Exon 2020-01-11 16:00:02 +01:00
parent dee6a63841
commit 5d0a3be4f6
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Model/Contact.php
View File

@ -1899,7 +1899,7 @@ class Contact
foreach ($data as $image_uri) { foreach ($data as $image_uri) {
$image_rid = Photo::ridFromURI($image_uri); $image_rid = Photo::ridFromURI($image_uri);
if ($image_rid && !Photo::exists(['resource-id' => $image_rid, 'uid' => $uid])) { if ($image_rid && !Photo::exists(['resource-id' => $image_rid, 'uid' => $uid])) {
Logger::info('Regenerating avatar for contact uid ' . $uid . ' cid ' . $cid . ' missing photo ' . $image_rid . ' avatar ' . $contact['avatar']); Logger::info('Regenerating avatar', ['contact uid' => $uid, 'cid' => $cid, 'missing photo' => $image_rid, 'avatar' => $contact['avatar']]);
$force = true; $force = true;
} }
} }

2
src/Model/Mail.php
View File

@ -216,7 +216,7 @@ class Mail
if (count($images)) { if (count($images)) {
foreach ($images as $image) { foreach ($images as $image) {
$image_rid = Photo::ridFromURI($image); $image_rid = Photo::ridFromURI($image);
if ($image_rid) { if (!empty($image_rid)) {
Photo::update(['allow-cid' => '<' . $recipient . '>'], ['resource-id' => $image_rid, 'album' => 'Wall Photos', 'uid' => local_user()]); Photo::update(['allow-cid' => '<' . $recipient . '>'], ['resource-id' => $image_rid, 'album' => 'Wall Photos', 'uid' => local_user()]);
} }
} }

6
src/Model/Photo.php
View File

@ -605,12 +605,12 @@ class Photo
public static function ridFromURI($image_uri) public static function ridFromURI($image_uri)
{ {
if (!stristr($image_uri, DI::baseUrl() . '/photo/')) { if (!stristr($image_uri, DI::baseUrl() . '/photo/')) {
return; return '';
} }
$image_uri = substr($image_uri, strrpos($image_uri, '/') + 1); $image_uri = substr($image_uri, strrpos($image_uri, '/') + 1);
$image_uri = substr($image_uri, 0, strpos($image_uri, '-')); $image_uri = substr($image_uri, 0, strpos($image_uri, '-'));
if (!strlen($image_uri)) { if (!strlen($image_uri)) {
return; return '';
} }
return $image_uri; return $image_uri;
} }
@ -642,7 +642,7 @@ class Photo
foreach ($images as $image) { foreach ($images as $image) {
$image_rid = self::ridFromURI($image); $image_rid = self::ridFromURI($image);
if (!$image_rid) { if (empty($image_rid)) {
continue; continue;
} }