clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7137 from annando/ap-attach 

Don't attach images to the body if it was from a Friendica system
This commit is contained in:
Hypolite Petovan 2019-05-13 16:27:15 -04:00 committed by GitHub
parent 34360ca46d 9e31b1b486
commit 7e2dc03a36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Protocol/ActivityPub/Processor.php
View File

@ -90,12 +90,13 @@ class Processor
/**
* Add attachment data to the item array
*
* @param array $attachments
* @param array $item
* @param array $attachments
* @param array $item
* @param boolean $no_images
*
* @return array array
*/
private static function constructAttachList($attachments, $item)
private static function constructAttachList($attachments, $item, $no_images)
{
if (empty($attachments)) {
return $item;
@ -104,6 +105,10 @@ class Processor
foreach ($attachments as $attach) {
$filetype = strtolower(substr($attach['mediaType'], 0, strpos($attach['mediaType'], '/')));
if ($filetype == 'image') {
if ($no_images) {
continue;
}
$item['body'] .= "\n[img]" . $attach['url'] . '[/img]';
} else {
if (!empty($item["attach"])) {
@ -351,7 +356,7 @@ class Processor
$item['plink'] = defaults($activity, 'alternate-url', $item['uri']);
$item = self::constructAttachList($activity['attachments'], $item);
$item = self::constructAttachList($activity['attachments'], $item, !empty($activity['source']));
$stored = false;