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

Add atachments to body for Diaspora and DFRN

Browse source
This commit is contained in:
Michael 2021-04-29 21:05:22 +00:00
parent 7c80f513d5
commit 639d5373e0
3 changed files with 46 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/Model/Post/Media.php
View file

@ -28,6 +28,8 @@ use Friendica\Core\System;
use Friendica\Database\Database; use Friendica\Database\Database;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\Item;
use Friendica\Model\Post;
use Friendica\Util\Images; use Friendica\Util\Images;
use Friendica\Util\ParseUrl; use Friendica\Util\ParseUrl;
use Friendica\Util\Strings; use Friendica\Util\Strings;
@ -519,4 +521,43 @@ class Media
} }
return $attachments; return $attachments;
} }
/**
* Add media attachments to the body
*
* @param int $uriid
* @return string body
*/
public static function addAttachmentsToBody(int $uriid)
{
$item = Post::selectFirst(['body'], ['uri-id' => $uriid]);
if (!DBA::isResult($item)) {
return '';
}
$body = preg_replace("/\s*\[attachment .*?\].*?\[\/attachment\]\s*/ism", '', $item['body']);
foreach (self::getByURIId($uriid, [self::IMAGE, self::AUDIO, self::VIDEO]) as $media) {
if (Item::containsLink($body, $media['url'])) {
continue;
}
if ($media['type'] == self::IMAGE) {
if (!empty($media['description'])) {
$body .= "\n[img=" . $media['url'] . ']' . $media['description'] .'[/img]';
} else {
$body .= "\n[img]" . $media['url'] .'[/img]';
}
} elseif ($media['type'] == self::AUDIO) {
$body .= "\n[audio]" . $media['url'] . "[/audio]\n";
} elseif ($media['type'] == self::VIDEO) {
$body .= "\n[video]" . $media['url'] . "[/video]\n";
}
}
if (preg_match("/.*(\[attachment.*?\].*?\[\/attachment\]).*/ism", $item['body'], $match)) {
$body .= "\n" . $match[1];
}
return $body;
}
} }

6
src/Protocol/DFRN.php
View file

@ -899,10 +899,10 @@ class DFRN
$entry->setAttribute("xmlns:statusnet", ActivityNamespace::STATUSNET); $entry->setAttribute("xmlns:statusnet", ActivityNamespace::STATUSNET);
} }
$body = Post\Media::addAttachmentsToBody($item['uri-id']);
if ($item['private'] == Item::PRIVATE) { if ($item['private'] == Item::PRIVATE) {
$body = Item::fixPrivatePhotos($item['body'], $owner['uid'], $item, $cid); $body = Item::fixPrivatePhotos($body, $owner['uid'], $item, $cid);
} else {
$body = $item['body'];
} }
// Remove the abstract element. It is only locally important. // Remove the abstract element. It is only locally important.

34
src/Protocol/Diaspora.php
View file

@ -3366,36 +3366,6 @@ class Diaspora
return $eventdata; return $eventdata;
} }
/**
* Add media attachments to the body
*
* @param array $item
* @return string body
*/
private static function addAttachments(array $item)
{
$body = $item['body'];
foreach (Post\Media::getByURIId($item['uri-id'], [Post\Media::IMAGE, Post\Media::AUDIO, Post\Media::VIDEO]) as $media) {
if (Item::containsLink($item['body'], $media['url'])) {
continue;
}
if ($media['type'] == Post\Media::IMAGE) {
if (!empty($media['description'])) {
$body .= "\n[img=" . $media['url'] . ']' . $media['description'] .'[/img]';
} else {
$body .= "\n[img]" . $media['url'] .'[/img]';
}
} elseif ($media['type'] == Post\Media::AUDIO) {
$body .= "\n[audio]" . $media['url'] . "[/audio]\n";
} elseif ($media['type'] == Post\Media::VIDEO) {
$body .= "\n[video]" . $media['url'] . "[/video]\n";
}
}
return $body;
}
/** /**
* Create a post (status message or reshare) * Create a post (status message or reshare)
* *
@ -3436,7 +3406,7 @@ class Diaspora
$type = "reshare"; $type = "reshare";
} else { } else {
$title = $item["title"]; $title = $item["title"];
$body = self::addAttachments($item); $body = Post\Media::addAttachmentsToBody($item['uri-id']);
// Fetch the title from an attached link - if there is one // Fetch the title from an attached link - if there is one
if (empty($item["title"]) && DI::pConfig()->get($owner['uid'], 'system', 'attach_link_title')) { if (empty($item["title"]) && DI::pConfig()->get($owner['uid'], 'system', 'attach_link_title')) {
@ -3650,7 +3620,7 @@ class Diaspora
$thread_parent_item = Post::selectFirst(['guid', 'author-id', 'author-link', 'gravity'], ['uri' => $item['thr-parent'], 'uid' => $item['uid']]); $thread_parent_item = Post::selectFirst(['guid', 'author-id', 'author-link', 'gravity'], ['uri' => $item['thr-parent'], 'uid' => $item['uid']]);
} }
$body = self::addAttachments($item); $body = Post\Media::addAttachmentsToBody($item['uri-id']);
// The replied to autor mention is prepended for clarity if: // The replied to autor mention is prepended for clarity if:
// - Item replied isn't yours // - Item replied isn't yours