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

The "[attach]" field is replaced by the "post-media" table

This commit is contained in:
Michael 2020-11-06 04:14:29 +00:00
parent 6d9e170502
commit d383f49f1e
7 changed files with 58 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Model/Item.php
View File

@ -3651,12 +3651,10 @@ class Item
$as = ''; $as = '';
$vhead = false; $vhead = false;
$matches = []; foreach (Post\Media::getByURIId($item['uri-id'], [Post\Media::DOCUMENT, Post\Media::TORRENT, Post\Media::UNKNOWN]) as $attachment) {
preg_match_all('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\"(?: title=\"(.*?)\")?|', $item['attach'], $matches, PREG_SET_ORDER); $mime = $attachment['mimetype'];
foreach ($matches as $mtch) {
$mime = $mtch[3];
$the_url = Contact::magicLinkById($item['author-id'], $mtch[1]); $the_url = Contact::magicLinkById($item['author-id'], $attachment['url']);
if (strpos($mime, 'video') !== false) { if (strpos($mime, 'video') !== false) {
if (!$vhead) { if (!$vhead) {
@ -3683,8 +3681,8 @@ class Item
$filesubtype = 'unkn'; $filesubtype = 'unkn';
} }
$title = Strings::escapeHtml(trim(($mtch[4] ?? '') ?: $mtch[1])); $title = Strings::escapeHtml(trim(($attachment['description'] ?? '') ?: $attachment['url']));
$title .= ' ' . $mtch[2] . ' ' . DI::l10n()->t('bytes'); $title .= ' ' . ($attachment['size'] ?? 0) . ' ' . DI::l10n()->t('bytes');
$icon = '<div class="attachtype icon s22 type-' . $filetype . ' subtype-' . $filesubtype . '"></div>'; $icon = '<div class="attachtype icon s22 type-' . $filetype . ' subtype-' . $filesubtype . '"></div>';
$as .= '<a href="' . strip_tags($the_url) . '" title="' . $title . '" class="attachlink" target="_blank" rel="noopener noreferrer" >' . $icon . '</a>'; $as .= '<a href="' . strip_tags($the_url) . '" title="' . $title . '" class="attachlink" target="_blank" rel="noopener noreferrer" >' . $icon . '</a>';

11
src/Model/Post/Media.php
View File

@ -263,11 +263,18 @@ class Media
* Retrieves the media attachments associated with the provided item ID. * Retrieves the media attachments associated with the provided item ID.
* *
* @param int $uri_id * @param int $uri_id
* @param array $types
* @return array * @return array
* @throws \Exception * @throws \Exception
*/ */
public static function getByURIId(int $uri_id) public static function getByURIId(int $uri_id, array $types = [])
{ {
return DBA::selectToArray('post-media', [], ['uri-id' => $uri_id]); $condition = ['uri-id' => $uri_id];
if (!empty($types)) {
$condition = DBA::mergeConditions($condition, ['type' => $types]);
}
return DBA::selectToArray('post-media', [], $condition);
} }
} }

2
src/Module/Diaspora/Fetch.php
View File

@ -52,7 +52,7 @@ class Fetch extends BaseModule
// Fetch the item // Fetch the item
$fields = [ $fields = [
'uid', 'title', 'body', 'guid', 'contact-id', 'private', 'created', 'received', 'app', 'location', 'coord', 'network', 'uid', 'title', 'body', 'guid', 'contact-id', 'private', 'created', 'received', 'app', 'location', 'coord', 'network',
'event-id', 'resource-id', 'author-link', 'author-avatar', 'author-name', 'plink', 'owner-link', 'attach' 'event-id', 'resource-id', 'author-link', 'author-avatar', 'author-name', 'plink', 'owner-link', 'attach', 'uri-id'
]; ];
$condition = ['wall' => true, 'private' => [Item::PUBLIC, Item::UNLISTED], 'guid' => $guid, 'network' => [Protocol::DFRN, Protocol::DIASPORA]]; $condition = ['wall' => true, 'private' => [Item::PUBLIC, Item::UNLISTED], 'guid' => $guid, 'network' => [Protocol::DFRN, Protocol::DIASPORA]];
$item = Item::selectFirst($fields, $condition); $item = Item::selectFirst($fields, $condition);

67
src/Protocol/ActivityPub/Transmitter.php
View File

@ -37,13 +37,13 @@ use Friendica\Model\Item;
use Friendica\Model\ItemURI; use Friendica\Model\ItemURI;
use Friendica\Model\Profile; use Friendica\Model\Profile;
use Friendica\Model\Photo; use Friendica\Model\Photo;
use Friendica\Model\Post;
use Friendica\Model\Tag; use Friendica\Model\Tag;
use Friendica\Model\User; use Friendica\Model\User;
use Friendica\Protocol\Activity; use Friendica\Protocol\Activity;
use Friendica\Protocol\ActivityPub; use Friendica\Protocol\ActivityPub;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
use Friendica\Util\HTTPSignature; use Friendica\Util\HTTPSignature;
use Friendica\Util\Images;
use Friendica\Util\JsonLD; use Friendica\Util\JsonLD;
use Friendica\Util\LDSignature; use Friendica\Util\LDSignature;
use Friendica\Util\Map; use Friendica\Util\Map;
@ -1220,57 +1220,22 @@ class Transmitter
$attachments[] = $attachment; $attachments[] = $attachment;
} }
*/ */
$arr = explode('[/attach],', $item['attach']); foreach (Post\Media::getByURIId($item['uri-id'], [Post\Media::DOCUMENT, Post\Media::TORRENT, Post\Media::UNKNOWN]) as $attachment) {
if (count($arr)) { $attachments[] = ['type' => 'Document',
foreach ($arr as $r) { 'mediaType' => $attachment['mimetype'],
$matches = false; 'url' => $attachment['url'],
$cnt = preg_match('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"|', $r, $matches); 'name' => $attachment['description']];
if ($cnt) {
$attributes = ['type' => 'Document',
'mediaType' => $matches[3],
'url' => $matches[1],
'name' => null];
if (trim($matches[4]) != '') {
$attributes['name'] = trim($matches[4]);
}
$attachments[] = $attributes;
}
}
} }
if ($type != 'Note') { if ($type != 'Note') {
return $attachments; return $attachments;
} }
// Simplify image codes foreach (Post\Media::getByURIId($item['uri-id'], [Post\Media::AUDIO, Post\Media::IMAGE, Post\Media::VIDEO]) as $attachment) {
$body = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $item['body']); $attachments[] = ['type' => 'Document',
'mediaType' => $attachment['mimetype'],
// Grab all pictures without alternative descriptions and create attachments out of them 'url' => $attachment['url'],
if (preg_match_all("/\[img\]([^\[\]]*)\[\/img\]/Usi", $body, $pictures)) { 'name' => $attachment['description']];
foreach ($pictures[1] as $picture) {
$imgdata = Images::getInfoFromURLCached($picture);
if ($imgdata) {
$attachments[] = ['type' => 'Document',
'mediaType' => $imgdata['mime'],
'url' => $picture,
'name' => null];
}
}
}
// Grab all pictures with alternative description and create attachments out of them
if (preg_match_all("/\[img=([^\[\]]*)\]([^\[\]]*)\[\/img\]/Usi", $body, $pictures, PREG_SET_ORDER)) {
foreach ($pictures as $picture) {
$imgdata = Images::getInfoFromURLCached($picture[1]);
if ($imgdata) {
$attachments[] = ['type' => 'Document',
'mediaType' => $imgdata['mime'],
'url' => $picture[1],
'name' => $picture[2]];
}
}
} }
return $attachments; return $attachments;
@ -1454,16 +1419,16 @@ class Transmitter
$body = $item['body']; $body = $item['body'];
if (empty($item['uid']) || !Feature::isEnabled($item['uid'], 'explicit_mentions')) {
$body = self::prependMentions($body, $item['uri-id']);
}
if ($type == 'Note') { if ($type == 'Note') {
$body = self::removePictures($body); $body = $item['raw-body'] ?? self::removePictures($body);
} elseif (($type == 'Article') && empty($data['summary'])) { } elseif (($type == 'Article') && empty($data['summary'])) {
$data['summary'] = BBCode::toPlaintext(Plaintext::shorten(self::removePictures($body), 1000)); $data['summary'] = BBCode::toPlaintext(Plaintext::shorten(self::removePictures($body), 1000));
} }
if (empty($item['uid']) || !Feature::isEnabled($item['uid'], 'explicit_mentions')) {
$body = self::prependMentions($body, $item['uri-id']);
}
if ($type == 'Event') { if ($type == 'Event') {
$data = array_merge($data, self::createEvent($item)); $data = array_merge($data, self::createEvent($item));
} else { } else {

30
src/Protocol/DFRN.php
View File

@ -866,27 +866,19 @@ class DFRN
*/ */
private static function getAttachment($doc, $root, $item) private static function getAttachment($doc, $root, $item)
{ {
$arr = explode('[/attach],', $item['attach']); foreach (Post\Media::getByURIId($item['uri-id'], [Post\Media::DOCUMENT, Post\Media::TORRENT, Post\Media::UNKNOWN]) as $attachment) {
if (count($arr)) { $attributes = ['rel' => 'enclosure',
foreach ($arr as $r) { 'href' => $attachment['url'],
$matches = false; 'type' => $attachment['mimetype']];
$cnt = preg_match('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"|', $r, $matches);
if ($cnt) {
$attributes = ["rel" => "enclosure",
"href" => $matches[1],
"type" => $matches[3]];
if (intval($matches[2])) { if (!empty($attachment['size'])) {
$attributes["length"] = intval($matches[2]); $attributes['length'] = intval($attachment['size']);
}
if (trim($matches[4]) != "") {
$attributes["title"] = trim($matches[4]);
}
XML::addElement($doc, $root, "link", "", $attributes);
}
} }
if (!empty($attachment['description'])) {
$attributes['title'] = $attachment['description'];
}
XML::addElement($doc, $root, 'link', '', $attributes);
} }
} }

12
src/Protocol/Diaspora.php
View File

@ -3578,13 +3578,11 @@ class Diaspora
$body = "### ".html_entity_decode($title)."\n\n".$body; $body = "### ".html_entity_decode($title)."\n\n".$body;
} }
if ($item["attach"]) { $attachments = Post\Media::getByURIId($item['uri-id'], [Post\Media::DOCUMENT, Post\Media::TORRENT, Post\Media::UNKNOWN]);
$cnt = preg_match_all('/href=\"(.*?)\"(.*?)title=\"(.*?)\"/ism', $item["attach"], $matches, PREG_SET_ORDER); if (!empty($attachments)) {
if ($cnt) { $body .= "\n".DI::l10n()->t("Attachments:")."\n";
$body .= "\n".DI::l10n()->t("Attachments:")."\n"; foreach ($attachments as $attachment) {
foreach ($matches as $mtch) { $body .= "[" . $attachment['description'] . "](" . $attachment['url'] . ")\n";
$body .= "[".$mtch[3]."](".$mtch[1].")\n";
}
} }
} }

28
src/Protocol/OStatus.php
View File

@ -1392,25 +1392,19 @@ class OStatus
} }
} }
$arr = explode('[/attach],', $item['attach']); foreach (Post\Media::getByURIId($item['uri-id'], [Post\Media::DOCUMENT, Post\Media::TORRENT, Post\Media::UNKNOWN]) as $attachment) {
if (count($arr)) { $attributes = ['rel' => 'enclosure',
foreach ($arr as $r) { 'href' => $attachment['url'],
$matches = false; 'type' => $attachment['mimetype']];
$cnt = preg_match('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"|', $r, $matches);
if ($cnt) {
$attributes = ["rel" => "enclosure",
"href" => $matches[1],
"type" => $matches[3]];
if (intval($matches[2])) { if (!empty($attachment['size'])) {
$attributes["length"] = intval($matches[2]); $attributes['length'] = intval($attachment['size']);
}
if (trim($matches[4]) != "") {
$attributes["title"] = trim($matches[4]);
}
XML::addElement($doc, $root, "link", "", $attributes);
}
} }
if (!empty($attachment['description'])) {
$attributes['title'] = $attachment['description'];
}
XML::addElement($doc, $root, 'link', '', $attributes);
} }
} }