Some more improvements for posts with shares
This commit is contained in:
parent
db82bdfc44
commit
c65fff6f93
10 changed files with 100 additions and 99 deletions
|
@ -122,9 +122,9 @@ function display_init(App $a)
|
||||||
|
|
||||||
function display_fetchauthor($item)
|
function display_fetchauthor($item)
|
||||||
{
|
{
|
||||||
$shared = Item::getShareArray($item);
|
$shared = DI::contentItem()->getSharedPost($item, ['author-link']);
|
||||||
if (empty($shared['comment']) && !empty($shared['guid']) && !empty($shared['profile'])) {
|
if (!empty($shared) && empty($shared['comment'])) {
|
||||||
$contact = Contact::getByURLForUser($shared['profile'], DI::userSession()->getLocalUserId());
|
$contact = Contact::getByURLForUser($shared['post']['author-link'], DI::userSession()->getLocalUserId());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (empty($contact)) {
|
if (empty($contact)) {
|
||||||
|
|
|
@ -41,9 +41,9 @@ function share_init(App $a) {
|
||||||
System::exit();
|
System::exit();
|
||||||
}
|
}
|
||||||
|
|
||||||
$shared = Item::getShareArray($item);
|
$shared = DI::contentItem()->getSharedPost($item, ['uri']);
|
||||||
if (empty($shared['comment']) && (!empty($shared['message_id']) || !empty($shared['link']))) {
|
if (!empty($shared) && empty($shared['comment'])) {
|
||||||
$content = '[share]' . ($shared['message_id'] ?: $shared['link']) . '[/share]';
|
$content = '[share]' . $shared['post']['uri'] . '[/share]';
|
||||||
} else {
|
} else {
|
||||||
$content = '[share]' . $item['uri'] . '[/share]';
|
$content = '[share]' . $item['uri'] . '[/share]';
|
||||||
}
|
}
|
||||||
|
|
|
@ -680,11 +680,11 @@ class Item
|
||||||
$shared_content .= '[h3]' . $item['title'] . "[/h3]\n";
|
$shared_content .= '[h3]' . $item['title'] . "[/h3]\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
$shared = ItemModel::getShareArray($item);
|
$shared = $this->getSharedPost($item, ['uri-id', 'uri', 'body', 'title', 'author-name', 'author-link', 'author-avatar', 'guid', 'created', 'plink', 'network']);
|
||||||
|
|
||||||
// If it is a reshared post then reformat it to avoid display problems with two share elements
|
// If it is a reshared post then reformat it to avoid display problems with two share elements
|
||||||
if (!empty($shared)) {
|
if (!empty($shared)) {
|
||||||
if (!empty($shared['guid']) && ($encaspulated_share = self::createSharedPostByGuid($shared['guid'], 0, '', $add_media))) {
|
if (($encaspulated_share = $this->createSharedBlockByArray($shared['post'], $add_media))) {
|
||||||
$item['body'] = preg_replace("/\[share.*?\](.*)\[\/share\]/ism", $encaspulated_share, $item['body']);
|
$item['body'] = preg_replace("/\[share.*?\](.*)\[\/share\]/ism", $encaspulated_share, $item['body']);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -695,4 +695,38 @@ class Item
|
||||||
|
|
||||||
return $shared_content;
|
return $shared_content;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return the shared post from an item array (if the item is shared item)
|
||||||
|
*
|
||||||
|
* @param array $item
|
||||||
|
* @param array $fields
|
||||||
|
*
|
||||||
|
* @return array with the shared post
|
||||||
|
*/
|
||||||
|
public function getSharedPost(array $item, array $fields = []): array
|
||||||
|
{
|
||||||
|
if (!empty($item['quote-uri-id'])) {
|
||||||
|
$shared = Post::selectFirst($fields, ['uri-id' => $item['quote-uri-id'], 'uid' => [0, $item['uid'] ?? 0]]);
|
||||||
|
if (is_array($shared)) {
|
||||||
|
return [
|
||||||
|
'comment' => BBCode::removeSharedData($item['body'] ?? ''),
|
||||||
|
'post' => $shared
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$attributes = BBCode::fetchShareAttributes($item['body'] ?? '');
|
||||||
|
if (!empty($attributes)) {
|
||||||
|
$shared = Post::selectFirst($fields, ['guid' => $attributes['guid'], 'uid' => [0, $item['uid'] ?? 0]]);
|
||||||
|
if (is_array($shared)) {
|
||||||
|
return [
|
||||||
|
'comment' => $attributes['comment'],
|
||||||
|
'post' => $shared
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return [];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1070,6 +1070,30 @@ class BBCode
|
||||||
return $attributes;
|
return $attributes;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Checks, if the provided body contains a native reshare
|
||||||
|
*
|
||||||
|
* @param string $body
|
||||||
|
* @return boolean
|
||||||
|
*/
|
||||||
|
public static function isNativeReshare(string $body): bool
|
||||||
|
{
|
||||||
|
$shared = BBCode::fetchShareAttributes($body);
|
||||||
|
return !empty($shared['guid'] ?? '');
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Checks if the provided body contains a "share" element
|
||||||
|
*
|
||||||
|
* @param string $body
|
||||||
|
* @return boolean
|
||||||
|
*/
|
||||||
|
public static function existsShare(string $body): bool
|
||||||
|
{
|
||||||
|
$shared = BBCode::fetchShareAttributes($body);
|
||||||
|
return !empty($shared['link'] ?? '');
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Replace the share block with a link
|
* Replace the share block with a link
|
||||||
*
|
*
|
||||||
|
@ -1094,7 +1118,7 @@ class BBCode
|
||||||
*/
|
*/
|
||||||
public static function removeSharedData(string $body): string
|
public static function removeSharedData(string $body): string
|
||||||
{
|
{
|
||||||
return preg_replace("/\s*\[share .*?\].*?\[\/share\]\s*/ism", '', $body);
|
return trim(preg_replace("/\s*\[share .*?\].*?\[\/share\]\s*/ism", '', $body));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -23,9 +23,9 @@ namespace Friendica\Factory\Api\Mastodon;
|
||||||
|
|
||||||
use Friendica\BaseFactory;
|
use Friendica\BaseFactory;
|
||||||
use Friendica\Content\ContactSelector;
|
use Friendica\Content\ContactSelector;
|
||||||
use Friendica\Content\Text\BBCode;
|
|
||||||
use Friendica\Database\Database;
|
use Friendica\Database\Database;
|
||||||
use Friendica\Database\DBA;
|
use Friendica\Database\DBA;
|
||||||
|
use Friendica\DI;
|
||||||
use Friendica\Model\Item;
|
use Friendica\Model\Item;
|
||||||
use Friendica\Model\Post;
|
use Friendica\Model\Post;
|
||||||
use Friendica\Model\Tag as TagModel;
|
use Friendica\Model\Tag as TagModel;
|
||||||
|
@ -155,11 +155,9 @@ class Status extends BaseFactory
|
||||||
$poll = null;
|
$poll = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
$shared = Item::getShareArray($item);
|
$shared = DI::contentItem()->getSharedPost($item, ['uri-id']);
|
||||||
if (!empty($shared['guid'])) {
|
if (!empty($shared)) {
|
||||||
$shared_item = Post::selectFirst(['uri-id', 'plink'], ['guid' => $shared['guid']]);
|
$shared_uri_id = $shared['post']['uri-id'];
|
||||||
|
|
||||||
$shared_uri_id = $shared_item['uri-id'] ?? 0;
|
|
||||||
|
|
||||||
$mentions = array_merge($mentions, $this->mstdnMentionFactory->createFromUriId($shared_uri_id)->getArrayCopy());
|
$mentions = array_merge($mentions, $this->mstdnMentionFactory->createFromUriId($shared_uri_id)->getArrayCopy());
|
||||||
$tags = array_merge($tags, $this->mstdnTagFactory->createFromUriId($shared_uri_id));
|
$tags = array_merge($tags, $this->mstdnTagFactory->createFromUriId($shared_uri_id));
|
||||||
|
|
|
@ -25,6 +25,7 @@ use Friendica\BaseFactory;
|
||||||
use Friendica\Content\Text\BBCode;
|
use Friendica\Content\Text\BBCode;
|
||||||
use Friendica\Content\Text\HTML;
|
use Friendica\Content\Text\HTML;
|
||||||
use Friendica\Database\Database;
|
use Friendica\Database\Database;
|
||||||
|
use Friendica\DI;
|
||||||
use Friendica\Factory\Api\Friendica\Activities;
|
use Friendica\Factory\Api\Friendica\Activities;
|
||||||
use Friendica\Factory\Api\Twitter\User as TwitterUser;
|
use Friendica\Factory\Api\Twitter\User as TwitterUser;
|
||||||
use Friendica\Model\Item;
|
use Friendica\Model\Item;
|
||||||
|
@ -178,11 +179,9 @@ class Status extends BaseFactory
|
||||||
|
|
||||||
$friendica_activities = $this->activities->createFromUriId($item['uri-id'], $uid);
|
$friendica_activities = $this->activities->createFromUriId($item['uri-id'], $uid);
|
||||||
|
|
||||||
$shared = Item::getShareArray($item);
|
$shared = DI::contentItem()->getSharedPost($item, ['uri-id']);
|
||||||
if (!empty($shared['guid'])) {
|
if (!empty($shared)) {
|
||||||
$shared_item = Post::selectFirst(['uri-id', 'plink'], ['guid' => $shared['guid']]);
|
$shared_uri_id = $shared['post']['uri-id'];
|
||||||
|
|
||||||
$shared_uri_id = $shared_item['uri-id'] ?? 0;
|
|
||||||
|
|
||||||
if ($include_entities) {
|
if ($include_entities) {
|
||||||
$hashtags = array_merge($hashtags, $this->hashtag->createFromUriId($shared_uri_id, $text));
|
$hashtags = array_merge($hashtags, $this->hashtag->createFromUriId($shared_uri_id, $text));
|
||||||
|
|
|
@ -2949,20 +2949,18 @@ class Item
|
||||||
$item['mentions'] = $tags['mentions'];
|
$item['mentions'] = $tags['mentions'];
|
||||||
|
|
||||||
$body = $item['body'] ?? '';
|
$body = $item['body'] ?? '';
|
||||||
$shared = self::getShareArray($item);
|
|
||||||
if (!empty($shared['guid'])) {
|
|
||||||
$shared_item = Post::selectFirst(['uri-id', 'guid', 'plink', 'has-media'], ['guid' => $shared['guid'], 'uid' => [$item['uid'], 0]]);
|
|
||||||
}
|
|
||||||
|
|
||||||
$fields = ['uri-id', 'uri', 'body', 'title', 'author-name', 'author-link', 'author-avatar', 'guid', 'created', 'plink', 'network', 'has-media'];
|
$fields = ['uri-id', 'uri', 'body', 'title', 'author-name', 'author-link', 'author-avatar', 'guid', 'created', 'plink', 'network', 'has-media'];
|
||||||
|
|
||||||
$shared_uri_id = 0;
|
$shared_uri_id = 0;
|
||||||
$shared_links = [];
|
$shared_links = [];
|
||||||
|
|
||||||
if (empty($shared_item['uri-id']) && !empty($item['quote-uri-id'])) {
|
$shared = DI::contentItem()->getSharedPost($item, $fields);
|
||||||
$shared_item = Post::selectFirst($fields, ['uri-id' => $item['quote-uri-id']]);
|
if (!empty($shared['post'])) {
|
||||||
$quote_uri_id = $item['quote-uri-id'] ?? 0;
|
$shared_item = $shared['post'];
|
||||||
$shared_links[] = strtolower($item['quote-uri']);
|
$quote_uri_id = $shared['post']['uri-id'];
|
||||||
|
$shared_links[] = strtolower($shared['post']['uri']);
|
||||||
|
$item['body'] = BBCode::removeSharedData($item['body']);
|
||||||
} elseif (empty($shared_item['uri-id']) && empty($item['quote-uri-id'])) {
|
} elseif (empty($shared_item['uri-id']) && empty($item['quote-uri-id'])) {
|
||||||
$media = Post\Media::getByURIId($item['uri-id'], [Post\Media::ACTIVITY]);
|
$media = Post\Media::getByURIId($item['uri-id'], [Post\Media::ACTIVITY]);
|
||||||
if (!empty($media)) {
|
if (!empty($media)) {
|
||||||
|
@ -3588,43 +3586,6 @@ class Item
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Return share data from an item array (if the item is shared item)
|
|
||||||
* We are providing the complete Item array, because at some time in the future
|
|
||||||
* we hopefully will define these values not in the body anymore but in some item fields.
|
|
||||||
* This function is meant to replace all similar functions in the system.
|
|
||||||
*
|
|
||||||
* @param array $item
|
|
||||||
*
|
|
||||||
* @return array with share information
|
|
||||||
*/
|
|
||||||
public static function getShareArray(array $item): array
|
|
||||||
{
|
|
||||||
$attributes = BBCode::fetchShareAttributes($item['body'] ?? '');
|
|
||||||
if (!empty($attributes)) {
|
|
||||||
return $attributes;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!empty($item['quote-uri-id'])) {
|
|
||||||
$shared = Post::selectFirst(['author-name', 'author-link', 'author-avatar', 'plink', 'created', 'guid', 'uri', 'body'], ['uri-id' => $item['quote-uri-id']]);
|
|
||||||
if (!empty($shared)) {
|
|
||||||
return [
|
|
||||||
'author' => $shared['author-name'],
|
|
||||||
'profile' => $shared['author-link'],
|
|
||||||
'avatar' => $shared['author-avatar'],
|
|
||||||
'link' => $shared['plink'],
|
|
||||||
'posted' => $shared['created'],
|
|
||||||
'guid' => $shared['guid'],
|
|
||||||
'message_id' => $shared['uri'],
|
|
||||||
'comment' => $item['body'],
|
|
||||||
'shared' => $shared['body'],
|
|
||||||
];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return [];
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check a prospective item array against user-level permissions
|
* Check a prospective item array against user-level permissions
|
||||||
*
|
*
|
||||||
|
|
|
@ -404,8 +404,7 @@ class Media
|
||||||
$unshared_body = $body = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $body);
|
$unshared_body = $body = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $body);
|
||||||
|
|
||||||
// Only remove the shared data from "real" reshares
|
// Only remove the shared data from "real" reshares
|
||||||
$shared = BBCode::fetchShareAttributes($body);
|
if (BBCode::isNativeReshare($body)) {
|
||||||
if (!empty($shared['guid'])) {
|
|
||||||
$unshared_body = BBCode::removeSharedData($body);
|
$unshared_body = BBCode::removeSharedData($body);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -486,8 +485,7 @@ class Media
|
||||||
public static function insertFromRelevantUrl(int $uriid, string $body)
|
public static function insertFromRelevantUrl(int $uriid, string $body)
|
||||||
{
|
{
|
||||||
// Only remove the shared data from "real" reshares
|
// Only remove the shared data from "real" reshares
|
||||||
$shared = BBCode::fetchShareAttributes($body);
|
if (BBCode::isNativeReshare($body)) {
|
||||||
if (!empty($shared['guid'])) {
|
|
||||||
// Don't look at the shared content
|
// Don't look at the shared content
|
||||||
$body = BBCode::removeSharedData($body);
|
$body = BBCode::removeSharedData($body);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1664,18 +1664,18 @@ class Transmitter
|
||||||
$body = preg_replace("/\s*\[attachment .*?\].*?\[\/attachment\]\s*/ism", '', $body);
|
$body = preg_replace("/\s*\[attachment .*?\].*?\[\/attachment\]\s*/ism", '', $body);
|
||||||
}
|
}
|
||||||
|
|
||||||
$body = BBCode::setMentionsToNicknames($body);
|
$body = BBCode::setMentionsToNicknames($body);
|
||||||
$shared = BBCode::fetchShareAttributes($body);
|
$exists_reshare = BBCode::existsShare($body);
|
||||||
|
|
||||||
if (!empty($item['quote-uri']) && Post::exists(['uri-id' => $item['quote-uri-id'], 'network' => [Protocol::ACTIVITYPUB, Protocol::DFRN]])) {
|
if (!empty($item['quote-uri']) && Post::exists(['uri-id' => $item['quote-uri-id'], 'network' => [Protocol::ACTIVITYPUB, Protocol::DFRN]])) {
|
||||||
$real_quote = true;
|
$real_quote = true;
|
||||||
if (!empty($shared['link'])) {
|
if ($exists_reshare) {
|
||||||
$body = BBCode::replaceSharedData($body);
|
$body = BBCode::replaceSharedData($body);
|
||||||
} elseif (strpos($body, $item['quote-uri']) === false) {
|
} elseif (strpos($body, $item['quote-uri']) === false) {
|
||||||
$body .= "\n♲ " . $item['quote-uri'];
|
$body .= "\n♲ " . $item['quote-uri'];
|
||||||
}
|
}
|
||||||
$data['quoteUrl'] = $item['quote-uri'];
|
$data['quoteUrl'] = $item['quote-uri'];
|
||||||
} elseif (!empty($item['quote-uri']) && empty($shared)) {
|
} elseif (!empty($item['quote-uri']) && !$exists_reshare) {
|
||||||
$body .= "\n" . DI::contentItem()->createSharedPostByUriId($item['quote-uri-id'], $item['uid'], true);
|
$body .= "\n" . DI::contentItem()->createSharedPostByUriId($item['quote-uri-id'], $item['uid'], true);
|
||||||
$item['body'] = Item::improveSharedDataInBody($item, true);
|
$item['body'] = Item::improveSharedDataInBody($item, true);
|
||||||
}
|
}
|
||||||
|
@ -1691,8 +1691,7 @@ class Transmitter
|
||||||
$richbody = BBCode::setMentionsToNicknames($item['body'] ?? '');
|
$richbody = BBCode::setMentionsToNicknames($item['body'] ?? '');
|
||||||
|
|
||||||
if ($real_quote) {
|
if ($real_quote) {
|
||||||
$shared = BBCode::fetchShareAttributes($richbody);
|
if (BBCode::existsShare($richbody)) {
|
||||||
if (!empty($shared['link'])) {
|
|
||||||
$richbody = BBCode::replaceSharedData($richbody);
|
$richbody = BBCode::replaceSharedData($richbody);
|
||||||
} elseif (strpos($richbody, $item['quote-uri']) === false) {
|
} elseif (strpos($richbody, $item['quote-uri']) === false) {
|
||||||
$richbody .= "\n♲ " . $item['quote-uri'];
|
$richbody .= "\n♲ " . $item['quote-uri'];
|
||||||
|
@ -1821,28 +1820,23 @@ class Transmitter
|
||||||
* @param array $item
|
* @param array $item
|
||||||
* @return array Announcement array
|
* @return array Announcement array
|
||||||
*/
|
*/
|
||||||
public static function getAnnounceArray(array $item): array
|
private static function getAnnounceArray(array $item): array
|
||||||
{
|
{
|
||||||
$reshared = Item::getShareArray($item);
|
$reshared = DI::contentItem()->getSharedPost($item, Item::DELIVER_FIELDLIST);
|
||||||
if (empty($reshared['guid'])) {
|
if (empty($reshared)) {
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
|
|
||||||
$reshared_item = Post::selectFirst(Item::DELIVER_FIELDLIST, ['guid' => $reshared['guid']]);
|
if (!in_array($reshared['post']['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN])) {
|
||||||
if (!DBA::isResult($reshared_item)) {
|
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!in_array($reshared_item['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN])) {
|
$profile = APContact::getByURL($reshared['post']['author-link'], false);
|
||||||
return [];
|
|
||||||
}
|
|
||||||
|
|
||||||
$profile = APContact::getByURL($reshared_item['author-link'], false);
|
|
||||||
if (empty($profile)) {
|
if (empty($profile)) {
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
|
|
||||||
return ['object' => $reshared_item, 'actor' => $profile, 'comment' => $reshared['comment']];
|
return ['object' => $reshared['post'], 'actor' => $profile, 'comment' => $reshared['comment']];
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -3181,27 +3181,20 @@ class Diaspora
|
||||||
*/
|
*/
|
||||||
public static function getReshareDetails(array $item): array
|
public static function getReshareDetails(array $item): array
|
||||||
{
|
{
|
||||||
$reshared = Item::getShareArray($item);
|
$reshared = DI::contentItem()->getSharedPost($item, ['network', 'author-addr']);
|
||||||
if (empty($reshared)) {
|
if (empty($reshared)) {
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
|
|
||||||
// Skip if it isn't a pure repeated messages or not a real reshare
|
// Skip if it isn't a pure repeated messages or not a real reshare
|
||||||
if (!empty($reshared['comment']) || empty($reshared['guid'])) {
|
if (!empty($reshared['comment']) || !in_array($reshared['post']['network'], [Protocol::DFRN, Protocol::DIASPORA])) {
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
|
|
||||||
$condition = ['guid' => $reshared['guid'], 'network' => [Protocol::DFRN, Protocol::DIASPORA]];
|
return [
|
||||||
$item = Post::selectFirst(['author-addr'], $condition);
|
'root_handle' => strtolower($reshared['post']['author-addr']),
|
||||||
if (DBA::isResult($item)) {
|
'root_guid' => $reshared['guid']
|
||||||
return [
|
];
|
||||||
'root_handle' => strtolower($item['author-addr']),
|
|
||||||
'root_guid' => $reshared['guid']
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
||||||
// We are resharing something that isn't a DFRN or Diaspora post.
|
|
||||||
return [];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in a new issue