Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-28 02:30:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Reworked media handling

Browse source
This commit is contained in:
Michael 2021-04-26 06:50:12 +00:00
parent 5a8f202158
commit 8685e5ca32
14 changed files with 457 additions and 206 deletions
Download patch file Download diff file Expand all files Collapse all files

111
src/Protocol/ActivityPub/Processor.php
View file

@ -135,113 +135,20 @@ class Processor
}
/**
* Add attachment data to the item array
* Stire attachment data
*
* @param array $activity
* @param array $item
*
* @return array array
*/
private static function constructAttachList($activity, $item)
private static function storeAttachments($activity, $item)
{
if (empty($activity['attachments'])) {
return $item;
return;
}
$leading = '';
$trailing = '';
foreach ($activity['attachments'] as $attach) {
switch ($attach['type']) {
case 'link':
$data = [
'url' => $attach['url'],
'type' => $attach['type'],
'title' => $attach['title'] ?? '',
'text' => $attach['desc'] ?? '',
'image' => $attach['image'] ?? '',
'images' => [],
'keywords' => [],
];
$item['body'] = PageInfo::appendDataToBody($item['body'], $data);
break;
default:
self::storeAttachmentAsMedia($item['uri-id'], $attach);
$filetype = strtolower(substr($attach['mediaType'], 0, strpos($attach['mediaType'], '/')));
if ($filetype == 'image') {
if (!empty($activity['source'])) {
foreach ([0, 1, 2] as $size) {
if (preg_match('#/photo/.*-' . $size . '\.#ism', $attach['url']) &&
strpos(preg_replace('#(/photo/.*)-[012]\.#ism', '$1-' . $size . '.', $activity['source']), $attach['url'])) {
continue 3;
}
}
if (strpos($activity['source'], $attach['url'])) {
continue 2;
}
}
// image is the preview/thumbnail URL
if (!empty($attach['image'])) {
$media = '[url=' . $attach['url'] . ']';
$attach['url'] = $attach['image'];
} else {
$media = '';
}
if (empty($attach['name'])) {
$media .= '[img]' . $attach['url'] . '[/img]';
} else {
$media .= '[img=' . $attach['url'] . ']' . $attach['name'] . '[/img]';
}
if (!empty($attach['image'])) {
$media .= '[/url]';
}
if ($item['post-type'] == Item::PT_IMAGE) {
$leading .= $media;
} else {
$trailing .= $media;
}
} elseif ($filetype == 'audio') {
if (!empty($activity['source']) && strpos($activity['source'], $attach['url'])) {
continue 2;
}
if ($item['post-type'] == Item::PT_AUDIO) {
$leading .= '[audio]' . $attach['url'] . "[/audio]\n";
} else {
$trailing .= '[audio]' . $attach['url'] . "[/audio]\n";
}
} elseif ($filetype == 'video') {
if (!empty($activity['source']) && strpos($activity['source'], $attach['url'])) {
continue 2;
}
if ($item['post-type'] == Item::PT_VIDEO) {
$leading .= '[video]' . $attach['url'] . "[/video]\n";
} else {
$trailing .= '[video]' . $attach['url'] . "[/video]\n";
}
}
}
self::storeAttachmentAsMedia($item['uri-id'], $attach);
}
if (!empty($leading) && !empty(trim($item['body']))) {
$item['body'] = $leading . "[hr]\n" . $item['body'];
} elseif (!empty($leading)) {
$item['body'] = $leading;
}
if (!empty($trailing) && !empty(trim($item['body']))) {
$item['body'] = $item['body'] . "\n[hr]" . $trailing;
} elseif (!empty($trailing)) {
$item['body'] = $trailing;
}
return $item;
}
/**
@ -265,7 +172,7 @@ class Processor
$item = self::processContent($activity, $item);
$item = self::constructAttachList($activity, $item);
self::storeAttachments($activity, $item);
if (empty($item)) {
return;
@ -399,7 +306,7 @@ class Processor
$item['plink'] = $activity['alternate-url'] ?? $item['uri'];
$item = self::constructAttachList($activity, $item);
self::storeAttachments($activity, $item);
// We received the post via AP, so we set the protocol of the server to AP
$contact = Contact::getById($item['author-id'], ['gsid']);
@ -863,12 +770,12 @@ class Processor
$object = ActivityPub::fetchContent($url, $uid);
if (empty($object)) {
Logger::log('Activity ' . $url . ' was not fetchable, aborting.');
Logger::notice('Activity was not fetchable, aborting.', ['url' => $url]);
return '';
}
if (empty($object['id'])) {
Logger::log('Activity ' . $url . ' has got not id, aborting. ' . json_encode($object));
Logger::notice('Activity has got not id, aborting. ', ['url' => $url, 'object' => $object]);
return '';
}
@ -1019,7 +926,7 @@ class Processor
DBA::update('contact', ['hub-verify' => $activity['id'], 'protocol' => Protocol::ACTIVITYPUB], ['id' => $cid]);
}
Logger::log('Follow user ' . $uid . ' from contact ' . $cid . ' with id ' . $activity['id']);
Logger::notice('Follow user ' . $uid . ' from contact ' . $cid . ' with id ' . $activity['id']);
}
/**

17
src/Protocol/Diaspora.php
View file

@ -22,7 +22,6 @@
namespace Friendica\Protocol;
use Friendica\Content\Feature;
use Friendica\Content\PageInfo;
use Friendica\Content\Text\BBCode;
use Friendica\Content\Text\Markdown;
use Friendica\Core\Cache\Duration;
@ -1067,7 +1066,7 @@ class Diaspora
* 'key' => The public key of the author
* @throws \Exception
*/
private static function message($guid, $server, $level = 0)
public static function message($guid, $server, $level = 0)
{
if ($level > 5) {
return false;
@ -2303,9 +2302,6 @@ class Diaspora
$item["body"] = self::replacePeopleGuid($item["body"], $item["author-link"]);
// Add OEmbed and other information to the body
$item["body"] = PageInfo::searchAndAppendToBody($item["body"], false, true);
return $item;
} else {
return $item;
@ -2489,7 +2485,7 @@ class Diaspora
Tag::storeFromBody($datarray['uri-id'], $datarray["body"]);
Post\Media::copy($original_item['uri-id'], $datarray['uri-id']);
//Post\Media::copy($original_item['uri-id'], $datarray['uri-id']);
$datarray["app"] = $original_item["app"];
$datarray["plink"] = self::plink($author, $guid);
@ -2733,8 +2729,8 @@ class Diaspora
if ($data->photo) {
foreach ($data->photo as $photo) {
self::storePhotoAsMedia($datarray['uri-id'], $photo);
$body = "[img]".XML::unescape($photo->remote_photo_path).
XML::unescape($photo->remote_photo_name)."[/img]\n".$body;
//$body = "[img]".XML::unescape($photo->remote_photo_path).
// XML::unescape($photo->remote_photo_name)."[/img]\n".$body;
}
$datarray["object-type"] = Activity\ObjectType::IMAGE;
@ -2742,11 +2738,6 @@ class Diaspora
} else {
$datarray["object-type"] = Activity\ObjectType::NOTE;
$datarray["post-type"] = Item::PT_NOTE;
// Add OEmbed and other information to the body
if (!self::isHubzilla($contact["url"])) {
$body = PageInfo::searchAndAppendToBody($body, false, true);
}
}
/// @todo enable support for polls

14
src/Protocol/OStatus.php
View file

@ -23,7 +23,6 @@ namespace Friendica\Protocol;
use DOMDocument;
use DOMXPath;
use Friendica\Content\PageInfo;
use Friendica\Content\Text\BBCode;
use Friendica\Content\Text\HTML;
use Friendica\Core\Cache\Duration;
@ -673,11 +672,6 @@ class OStatus
$item["body"] .= $add_body;
// Only add additional data when there is no picture in the post
if (!strstr($item["body"], '[/img]')) {
$item["body"] = PageInfo::searchAndAppendToBody($item["body"]);
}
Tag::storeFromBody($item['uri-id'], $item['body']);
// Mastodon Content Warning
@ -1098,7 +1092,9 @@ class OStatus
if (($item["object-type"] == Activity\ObjectType::QUESTION)
|| ($item["object-type"] == Activity\ObjectType::EVENT)
) {
$item["body"] .= "\n" . PageInfo::getFooterFromUrl($attribute['href']);
Post\Media::insert(['uri-id' => $item['uri-id'], 'type' => Post\Media::UNKNOWN,
'url' => $attribute['href'], 'mimetype' => $attribute['type'] ?? null,
'size' => $attribute['length'] ?? null, 'description' => $attribute['title'] ?? null]);
}
break;
case "ostatus:conversation":
@ -1125,7 +1121,9 @@ class OStatus
}
$link_data['related'] = $attribute['href'];
} else {
$item["body"] .= "\n" . PageInfo::getFooterFromUrl($attribute['href']);
Post\Media::insert(['uri-id' => $item['uri-id'], 'type' => Post\Media::UNKNOWN,
'url' => $attribute['href'], 'mimetype' => $attribute['type'] ?? null,
'size' => $attribute['length'] ?? null, 'description' => $attribute['title'] ?? null]);
}
break;
case "self":