mirror of
https://github.com/friendica/friendica
synced 2024-11-10 07:02:54 +00:00
Prepend implicit author mentions in outgoing Diaspora comments
- Add Diaspora::prependParentAuthorMention method
This commit is contained in:
parent
e514ecb6fa
commit
199fac3397
1 changed files with 23 additions and 2 deletions
|
@ -10,6 +10,7 @@
|
|||
|
||||
namespace Friendica\Protocol;
|
||||
|
||||
use Friendica\Content\Feature;
|
||||
use Friendica\Content\Text\BBCode;
|
||||
use Friendica\Content\Text\Markdown;
|
||||
use Friendica\Core\Cache;
|
||||
|
@ -3666,6 +3667,20 @@ class Diaspora
|
|||
return $msg;
|
||||
}
|
||||
|
||||
private static function prependParentAuthorMention($body, $profile_url)
|
||||
{
|
||||
$profile = Contact::getDetailsByURL($profile_url);
|
||||
if (!empty($profile['addr'])
|
||||
&& $profile['contact-type'] != Contact::TYPE_COMMUNITY
|
||||
&& !strstr($body, $profile['addr'])
|
||||
&& !strstr($body, $profile_url)
|
||||
) {
|
||||
$body = '@[url=' . $profile_url . ']' . $profile['nick'] . '[/url] ' . $body;
|
||||
}
|
||||
|
||||
return $body;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Sends a post
|
||||
*
|
||||
|
@ -3773,12 +3788,18 @@ class Diaspora
|
|||
return $result;
|
||||
}
|
||||
|
||||
$parent = Item::selectFirst(['guid'], ['id' => $item["parent"], 'parent' => $item["parent"]]);
|
||||
$parent = Item::selectFirst(['guid', 'author-link'], ['id' => $item["parent"], 'parent' => $item["parent"]]);
|
||||
if (!DBA::isResult($parent)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$text = html_entity_decode(BBCode::toMarkdown($item["body"]));
|
||||
$body = $item["body"];
|
||||
|
||||
if (empty($item['uid']) || !Feature::isEnabled($item['uid'], 'explicit_mentions')) {
|
||||
$body = self::prependParentAuthorMention($body, $parent['author-link']);
|
||||
}
|
||||
|
||||
$text = html_entity_decode(BBCode::toMarkdown($body));
|
||||
$created = DateTimeFormat::utc($item["created"], DateTimeFormat::ATOM);
|
||||
|
||||
$comment = ["author" => self::myHandle($owner),
|
||||
|
|
Loading…
Reference in a new issue