bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge pull request #8792 from MrPetovan/task/share-block-guid

Browse source 
[frio] Add local post link to share block when guid attribute is present
This commit is contained in:
Michael Vogel 2020-06-23 21:26:07 +02:00 • committed by GitHub
commit 7fd2c00171
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 42 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/Content/Text/BBCode.php
View file

@ -978,7 +978,7 @@ class BBCode
function ($match) use ($callback) {
$attribute_string = $match[2];
$attributes = [];
foreach (['author', 'profile', 'avatar', 'link', 'posted'] as $field) {
foreach (['author', 'profile', 'avatar', 'link', 'posted', 'guid'] as $field) {
preg_match("/$field=(['\"])(.+?)\\1/ism", $attribute_string, $matches);
$attributes[$field] = html_entity_decode($matches[2] ?? '', ENT_QUOTES, 'UTF-8');
}
@ -1088,6 +1088,7 @@ class BBCode
'$link' => $attributes['link'],
'$link_title' => DI::l10n()->t('link to source'),
'$posted' => $attributes['posted'],
'$guid' => $attributes['guid'],
'$network_name' => ContactSelector::networkToName($contact['network'], $attributes['profile']),
'$network_icon' => ContactSelector::networkToIcon($contact['network'], $attributes['profile']),
'$content' => self::setMentions(trim($content), 0, $contact['network']),
@ -2229,30 +2230,28 @@ class BBCode
}
/**
* @param $author
* @param $profile
* @param $avatar
* @param $guid
* @param $posted
* @param $link
* @param string $author Author display name
* @param string $profile Author profile URL
* @param string $avatar Author profile picture URL
* @param string $link Post source URL
* @param string $posted Post created date
* @param string|null $guid Post guid (if any)
* @return string
* @TODO Rewrite to handle over whole record array
*/
public static function getShareOpeningTag($author, $profile, $avatar, $guid, $posted, $link)
public static function getShareOpeningTag(string $author, string $profile, string $avatar, string $link, string $posted, string $guid = null)
{
$header = "[share author='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $author).
"' profile='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $profile).
"' avatar='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $avatar);
$header = "[share author='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $author) .
"' profile='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $profile) .
"' avatar='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $avatar) .
"' link='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $link) .
"' posted='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $posted);
if ($guid) {
$header .= "' guid='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $guid);
}
if ($posted) {
$header .= "' posted='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $posted);
}
$header .= "' link='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $link)."']";
$header .= "']";
return $header;
}

2
src/Protocol/ActivityPub/Transmitter.php
View file

@ -864,7 +864,7 @@ class Transmitter
// Disguise forum posts as reshares. Will later be converted to a real announce
$item['body'] = BBCode::getShareOpeningTag($item['author-name'], $item['author-link'], $item['author-avatar'],
$item['guid'], $item['created'], $item['plink']) . $item['body'] . '[/share]';
$item['plink'], $item['created'], $item['guid']) . $item['body'] . '[/share]';
}
}

6
src/Protocol/Diaspora.php
View file

@ -2799,9 +2799,9 @@ class Diaspora
$original_item["author-name"],
$original_item["author-link"],
$original_item["author-avatar"],
$original_item["guid"],
$orig_url,
$original_item["created"],
$orig_url
$original_item["guid"]
);
if (!empty($original_item['title'])) {
@ -3677,7 +3677,7 @@ class Diaspora
if ($item['author-link'] != $item['owner-link']) {
require_once 'mod/share.php';
$body = BBCode::getShareOpeningTag($item['author-name'], $item['author-link'], $item['author-avatar'],
"", $item['created'], $item['plink']) . $body . '[/share]';
$item['plink'], $item['created']) . $body . '[/share]';
}
// convert to markdown