Update getShareOpeningTag::getShareOpeningTag method signature
- Optional parameter $guid is now at the end - Always provided parameter $posted is now mandatory
This commit is contained in:
parent
5ec8025f69
commit
912ff069c0
5 changed files with 19 additions and 21 deletions
|
@ -2043,7 +2043,7 @@ function api_statuses_repeat($type)
|
||||||
$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['guid'], $item['created'], $item['plink']);
|
$post = BBCode::getShareOpeningTag($item['author-name'], $item['author-link'], $item['author-avatar'], $item['plink'], $item['created'], $item['guid']);
|
||||||
|
|
||||||
if (!empty($item['title'])) {
|
if (!empty($item['title'])) {
|
||||||
$post .= '[h3]' . $item['title'] . "[/h3]\n";
|
$post .= '[h3]' . $item['title'] . "[/h3]\n";
|
||||||
|
|
|
@ -43,7 +43,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['guid'], $item['created'], $item['plink']);
|
$o = BBCode::getShareOpeningTag($item['author-name'], $item['author-link'], $item['author-avatar'], $item['plink'], $item['created'], $item['guid']);
|
||||||
|
|
||||||
if ($item['title']) {
|
if ($item['title']) {
|
||||||
$o .= '[h3]'.$item['title'].'[/h3]'."\n";
|
$o .= '[h3]'.$item['title'].'[/h3]'."\n";
|
||||||
|
|
|
@ -2225,30 +2225,28 @@ class BBCode
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param $author
|
* @param string $author Author display name
|
||||||
* @param $profile
|
* @param string $profile Author profile URL
|
||||||
* @param $avatar
|
* @param string $avatar Author profile picture URL
|
||||||
* @param $guid
|
* @param string $link Post source URL
|
||||||
* @param $posted
|
* @param string $posted Post created date
|
||||||
* @param $link
|
* @param string|null $guid Post guid (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($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) .
|
$header = "[share author='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $author) .
|
||||||
"' profile='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $profile) .
|
"' profile='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $profile) .
|
||||||
"' avatar='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $avatar);
|
"' avatar='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $avatar) .
|
||||||
|
"' link='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $link) .
|
||||||
|
"' posted='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $posted);
|
||||||
|
|
||||||
if ($guid) {
|
if ($guid) {
|
||||||
$header .= "' guid='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $guid);
|
$header .= "' guid='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $guid);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($posted) {
|
$header .= "']";
|
||||||
$header .= "' posted='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $posted);
|
|
||||||
}
|
|
||||||
|
|
||||||
$header .= "' link='" . str_replace(["'", "[", "]"], ["'", "[", "]"], $link)."']";
|
|
||||||
|
|
||||||
return $header;
|
return $header;
|
||||||
}
|
}
|
||||||
|
|
|
@ -864,7 +864,7 @@ class Transmitter
|
||||||
|
|
||||||
// Disguise forum posts as reshares. Will later be converted to a real announce
|
// 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['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]';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -2799,9 +2799,9 @@ class Diaspora
|
||||||
$original_item["author-name"],
|
$original_item["author-name"],
|
||||||
$original_item["author-link"],
|
$original_item["author-link"],
|
||||||
$original_item["author-avatar"],
|
$original_item["author-avatar"],
|
||||||
$original_item["guid"],
|
$orig_url,
|
||||||
$original_item["created"],
|
$original_item["created"],
|
||||||
$orig_url
|
$original_item["guid"]
|
||||||
);
|
);
|
||||||
|
|
||||||
if (!empty($original_item['title'])) {
|
if (!empty($original_item['title'])) {
|
||||||
|
@ -3677,7 +3677,7 @@ class Diaspora
|
||||||
if ($item['author-link'] != $item['owner-link']) {
|
if ($item['author-link'] != $item['owner-link']) {
|
||||||
require_once 'mod/share.php';
|
require_once 'mod/share.php';
|
||||||
$body = BBCode::getShareOpeningTag($item['author-name'], $item['author-link'], $item['author-avatar'],
|
$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
|
// convert to markdown
|
||||||
|
|
Loading…
Reference in a new issue