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

Improve quote share ("message_id" added)

This commit is contained in:
Michael 2022-10-06 21:50:20 +00:00
parent fe442683ef
commit 48182a95fb
8 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mod/item.php
View File

@ -621,6 +621,7 @@ function item_post(App $a) {
$datarray["author-uri-id"] = ItemURI::getIdByURI($datarray["author-link"]); $datarray["author-uri-id"] = ItemURI::getIdByURI($datarray["author-link"]);
$datarray["owner-updated"] = ''; $datarray["owner-updated"] = '';
$datarray["has-media"] = false; $datarray["has-media"] = false;
$datarray['body'] = Item::improveSharedDataInBody($datarray);
$o = DI::conversation()->create([array_merge($contact_record, $datarray)], 'search', false, true); $o = DI::conversation()->create([array_merge($contact_record, $datarray)], 'search', false, true);
@ -661,6 +662,7 @@ function item_post(App $a) {
} }
$datarray['uri-id'] = ItemURI::getIdByURI($datarray['uri']); $datarray['uri-id'] = ItemURI::getIdByURI($datarray['uri']);
$datarray['body'] = Item::improveSharedDataInBody($datarray);
if ($orig_post) { if ($orig_post) {
$fields = [ $fields = [

13
mod/share.php
View File

@ -20,7 +20,6 @@
*/ */
use Friendica\App; use Friendica\App;
use Friendica\Content\Text\BBCode;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\DI; use Friendica\DI;
@ -34,8 +33,7 @@ function share_init(App $a) {
System::exit(); System::exit();
} }
$fields = ['private', 'body', 'author-name', 'author-link', 'author-avatar', $fields = ['private', 'body', 'uri'];
'guid', 'created', 'plink', 'title'];
$item = Post::selectFirst($fields, ['id' => $post_id]); $item = Post::selectFirst($fields, ['id' => $post_id]);
if (!DBA::isResult($item) || $item['private'] == Item::PRIVATE) { if (!DBA::isResult($item) || $item['private'] == Item::PRIVATE) {
@ -46,14 +44,7 @@ function share_init(App $a) {
$pos = strpos($item['body'], "[share"); $pos = strpos($item['body'], "[share");
$o = substr($item['body'], $pos); $o = substr($item['body'], $pos);
} else { } else {
$o = BBCode::getShareOpeningTag($item['author-name'], $item['author-link'], $item['author-avatar'], $item['plink'], $item['created'], $item['guid']); $o = "[share message_id='" . $item['uri'] . "'][/share]";
if ($item['title']) {
$o .= '[h3]'.$item['title'].'[/h3]'."\n";
}
$o .= $item['body'];
$o .= "[/share]";
} }
echo $o; echo $o;

2
src/App/Router.php
View File

@ -339,7 +339,7 @@ class Router
if ($this->dice_profiler_threshold > 0) { if ($this->dice_profiler_threshold > 0) {
$dur = floatval(microtime(true) - $stamp); $dur = floatval(microtime(true) - $stamp);
if ($dur >= $this->dice_profiler_threshold) { if ($dur >= $this->dice_profiler_threshold) {
$this->logger->warning('Dice module creation lasts too long.', ['duration' => round($dur, 3), 'module' => $module_class, 'parameters' => $module_parameters]); $this->logger->notice('Dice module creation lasts too long.', ['duration' => round($dur, 3), 'module' => $module_class, 'parameters' => $module_parameters]);
} }
} }
} }

9
src/Content/Text/BBCode.php
View File

@ -1047,7 +1047,7 @@ class BBCode
private static function extractShareAttributes(string $shareString): array private static function extractShareAttributes(string $shareString): array
{ {
$attributes = []; $attributes = [];
foreach (['author', 'profile', 'avatar', 'link', 'posted', 'guid'] as $field) { foreach (['author', 'profile', 'avatar', 'link', 'posted', 'guid', 'message_id'] as $field) {
preg_match("/$field=(['\"])(.+?)\\1/ism", $shareString, $matches); preg_match("/$field=(['\"])(.+?)\\1/ism", $shareString, $matches);
$attributes[$field] = html_entity_decode($matches[2] ?? '', ENT_QUOTES, 'UTF-8'); $attributes[$field] = html_entity_decode($matches[2] ?? '', ENT_QUOTES, 'UTF-8');
} }
@ -2458,10 +2458,11 @@ class BBCode
* @param string $link Post source URL * @param string $link Post source URL
* @param string $posted Post created date * @param string $posted Post created date
* @param string|null $guid Post guid (if any) * @param string|null $guid Post guid (if any)
* @param string|null $uri Post uri (if any)
* @return string * @return string
* @TODO Rewrite to handle over whole record array * @TODO Rewrite to handle over whole record array
*/ */
public static function getShareOpeningTag(string $author, string $profile, string $avatar, string $link, string $posted, string $guid = null): string public static function getShareOpeningTag(string $author, string $profile, string $avatar, string $link, string $posted, string $guid = null, string $uri = null): string
{ {
DI::profiler()->startRecording('rendering'); DI::profiler()->startRecording('rendering');
$header = "[share author='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $author) . $header = "[share author='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $author) .
@ -2474,6 +2475,10 @@ class BBCode
$header .= "' guid='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $guid); $header .= "' guid='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $guid);
} }
if ($uri) {
$header .= "' message_id='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $uri);
}
$header .= "']"; $header .= "']";
DI::profiler()->stopRecording(); DI::profiler()->stopRecording();

12
src/Model/Item.php
View File

@ -3667,22 +3667,22 @@ class Item
public static function improveSharedDataInBody(array $item): string public static function improveSharedDataInBody(array $item): string
{ {
$shared = BBCode::fetchShareAttributes($item['body']); $shared = BBCode::fetchShareAttributes($item['body']);
if (empty($shared['link'])) { if (empty($shared['link']) && empty($shared['message_id'])) {
return $item['body']; return $item['body'];
} }
$id = self::fetchByLink($shared['link']); $id = self::fetchByLink($shared['link'] ?: $shared['message_id']);
Logger::info('Fetched shared post', ['uri-id' => $item['uri-id'], 'id' => $id, 'author' => $shared['profile'], 'url' => $shared['link'], 'guid' => $shared['guid'], 'callstack' => System::callstack()]); Logger::debug('Fetched shared post', ['uri-id' => $item['uri-id'], 'id' => $id, 'author' => $shared['profile'], 'url' => $shared['link'], 'guid' => $shared['guid'], 'uri' => $shared['message_id'], 'callstack' => System::callstack()]);
if (!$id) { if (!$id) {
return $item['body']; return $item['body'];
} }
$shared_item = Post::selectFirst(['author-name', 'author-link', 'author-avatar', 'plink', 'created', 'guid', 'title', 'body'], ['id' => $id]); $shared_item = Post::selectFirst(['author-name', 'author-link', 'author-avatar', 'plink', 'created', 'guid', 'uri', 'title', 'body'], ['id' => $id]);
if (!DBA::isResult($shared_item)) { if (!DBA::isResult($shared_item)) {
return $item['body']; return $item['body'];
} }
$shared_content = BBCode::getShareOpeningTag($shared_item['author-name'], $shared_item['author-link'], $shared_item['author-avatar'], $shared_item['plink'], $shared_item['created'], $shared_item['guid']); $shared_content = BBCode::getShareOpeningTag($shared_item['author-name'], $shared_item['author-link'], $shared_item['author-avatar'], $shared_item['plink'], $shared_item['created'], $shared_item['guid'], $shared_item['uri']);
if (!empty($shared_item['title'])) { if (!empty($shared_item['title'])) {
$shared_content .= '[h3]'.$shared_item['title'].'[/h3]'."\n"; $shared_content .= '[h3]'.$shared_item['title'].'[/h3]'."\n";
@ -3691,7 +3691,7 @@ class Item
$shared_content .= $shared_item['body']; $shared_content .= $shared_item['body'];
$item['body'] = preg_replace("/\[share.*?\](.*)\[\/share\]/ism", $shared_content . '[/share]', $item['body']); $item['body'] = preg_replace("/\[share.*?\](.*)\[\/share\]/ism", $shared_content . '[/share]', $item['body']);
Logger::info('New shared data', ['uri-id' => $item['uri-id'], 'id' => $id, 'shared_item' => $shared_item]); Logger::debug('New shared data', ['uri-id' => $item['uri-id'], 'id' => $id, 'shared_item' => $shared_item]);
return $item['body']; return $item['body'];
} }
} }

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

@ -883,7 +883,7 @@ class Processor
return ''; return '';
} }
$shared_item = Post::selectFirst(['author-name', 'author-link', 'author-avatar', 'plink', 'created', 'guid', 'title', 'body'], ['id' => $id]); $shared_item = Post::selectFirst(['author-name', 'author-link', 'author-avatar', 'plink', 'created', 'guid', 'uri', 'title', 'body'], ['id' => $id]);
if (!DBA::isResult($shared_item)) { if (!DBA::isResult($shared_item)) {
return ''; return '';
} }
@ -894,7 +894,8 @@ class Processor
$shared_item['author-avatar'], $shared_item['author-avatar'],
$shared_item['plink'], $shared_item['plink'],
$shared_item['created'], $shared_item['created'],
$shared_item['guid'] $shared_item['guid'],
$shared_item['uri'],
); );
if (!empty($shared_item['title'])) { if (!empty($shared_item['title'])) {

7
src/Protocol/Diaspora.php
View File

@ -2483,7 +2483,8 @@ class Diaspora
$original_item['author-avatar'], $original_item['author-avatar'],
$original_item['plink'], $original_item['plink'],
$original_item['created'], $original_item['created'],
$original_item['guid'] $original_item['guid'],
$original_item['uri'],
); );
if (!empty($original_item['title'])) { if (!empty($original_item['title'])) {
@ -4181,7 +4182,7 @@ class Diaspora
public static function performReshare(int $UriId, int $uid): int public static function performReshare(int $UriId, int $uid): int
{ {
$fields = ['uri-id', 'body', 'title', 'author-name', 'author-link', 'author-avatar', 'guid', 'created', 'plink']; $fields = ['uri-id', 'body', 'title', 'author-name', 'author-link', 'author-avatar', 'guid', 'created', 'plink', 'uri'];
$item = Post::selectFirst($fields, ['uri-id' => $UriId, 'uid' => [$uid, 0], 'private' => [Item::PUBLIC, Item::UNLISTED]]); $item = Post::selectFirst($fields, ['uri-id' => $UriId, 'uid' => [$uid, 0], 'private' => [Item::PUBLIC, Item::UNLISTED]]);
if (!DBA::isResult($item)) { if (!DBA::isResult($item)) {
return 0; return 0;
@ -4191,7 +4192,7 @@ class Diaspora
$pos = strpos($item['body'], '[share'); $pos = strpos($item['body'], '[share');
$post = substr($item['body'], $pos); $post = substr($item['body'], $pos);
} else { } else {
$post = BBCode::getShareOpeningTag($item['author-name'], $item['author-link'], $item['author-avatar'], $item['plink'], $item['created'], $item['guid']); $post = BBCode::getShareOpeningTag($item['author-name'], $item['author-link'], $item['author-avatar'], $item['plink'], $item['created'], $item['guid'], $item['uri']);
if (!empty($item['title'])) { if (!empty($item['title'])) {
$post .= '[h3]' . $item['title'] . "[/h3]\n"; $post .= '[h3]' . $item['title'] . "[/h3]\n";

4
src/Protocol/Email.php
View File

@ -51,12 +51,12 @@ class Email
$errors = imap_errors(); $errors = imap_errors();
if (!empty($errors)) { if (!empty($errors)) {
Logger::warning('IMAP Errors occured', ['errors' => $errors]); Logger::notice('IMAP Errors occured', ['errors' => $errors]);
} }
$alerts = imap_alerts(); $alerts = imap_alerts();
if (!empty($alerts)) { if (!empty($alerts)) {
Logger::warning('IMAP Alerts occured: ', ['alerts' => $alerts]); Logger::notice('IMAP Alerts occured: ', ['alerts' => $alerts]);
} }
return $mbox; return $mbox;