mirror of
https://github.com/friendica/friendica
synced 2024-12-23 02:00:17 +00:00
Always add the addressed contacts in a post to the tags.
This commit is contained in:
parent
620455c4de
commit
1a26d464dd
1 changed files with 17 additions and 16 deletions
33
mod/item.php
33
mod/item.php
|
@ -565,21 +565,23 @@ function item_post(&$a) {
|
||||||
|
|
||||||
$tags = get_tags($body);
|
$tags = get_tags($body);
|
||||||
|
|
||||||
/**
|
if($parent) {
|
||||||
* add a statusnet style reply tag if the original post was from there
|
/**
|
||||||
* and we are replying, and there isn't one already
|
* add a statusnet style reply tag if the original post was from there
|
||||||
*/
|
* and we are replying, and there isn't one already
|
||||||
|
*/
|
||||||
|
|
||||||
if ($parent_contact['id'] != "")
|
if ($parent_contact['id'] != "")
|
||||||
$contact = '@'.$parent_contact['nick'].'+'.$parent_contact['id'];
|
$contact = '@'.$parent_contact['nick'].'+'.$parent_contact['id'];
|
||||||
//elseif ($parent_contact['addr'] != "")
|
//elseif ($parent_contact['addr'] != "")
|
||||||
// $contact = '@'.$parent_contact['addr'];
|
// $contact = '@'.$parent_contact['addr'];
|
||||||
else
|
else
|
||||||
$contact = '@[url='.$parent_contact['url'].']'.$parent_contact['nick'].'[/url]';
|
$contact = '@[url='.$parent_contact['url'].']'.$parent_contact['nick'].'[/url]';
|
||||||
|
|
||||||
|
if (!in_array($contact,$tags)) {
|
||||||
|
if ($parent_contact['network'] === NETWORK_OSTATUS)
|
||||||
|
$body = $contact.' '.$body;
|
||||||
|
|
||||||
if ($parent_contact && ($parent_contact['network'] === NETWORK_OSTATUS)) {
|
|
||||||
if (($parent_contact['nick']) && (!in_array($contact,$tags))) {
|
|
||||||
$body = $contact.' '.$body;
|
|
||||||
$tags[] = $contact;
|
$tags[] = $contact;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -593,9 +595,8 @@ function item_post(&$a) {
|
||||||
$toplevel_contact = '@[url='.$toplevel_parent[0]['author-link'].']'.$toplevel_parent[0]['author-name'].'[/url]';
|
$toplevel_contact = '@[url='.$toplevel_parent[0]['author-link'].']'.$toplevel_parent[0]['author-name'].'[/url]';
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($toplevel_contact != "")
|
if (!in_array($toplevel_contact,$tags))
|
||||||
if (!in_array($toplevel_contact,$tags))
|
$tags[] = $toplevel_contact;
|
||||||
$tags[] = $toplevel_contact;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$tagged = array();
|
$tagged = array();
|
||||||
|
|
Loading…
Reference in a new issue