friendica/dir
6
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

modify tag handling and replies to stnet

Browse source
This commit is contained in:
Friendika 2011-02-08 15:08:07 -08:00
parent a05b2b4cc7
commit 766c4778cb
1 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
mod/item.php
View file

@ -25,6 +25,7 @@ function item_post(&$a) {
$parent = ((x($_POST,'parent')) ? intval($_POST['parent']) : 0); $parent = ((x($_POST,'parent')) ? intval($_POST['parent']) : 0);
$parent_item = null; $parent_item = null;
$parent_contact = null;
if($parent) { if($parent) {
$r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1", $r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1",
@ -35,6 +36,14 @@ function item_post(&$a) {
goaway($a->get_baseurl() . "/" . $_POST['return'] ); goaway($a->get_baseurl() . "/" . $_POST['return'] );
} }
$parent_item = $r[0]; $parent_item = $r[0];
if($parent_item['contact-id'] && $uid) {
$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($parent_item['contact-id']),
intval($uid)
);
if(count($r))
$parent_contact = $r[0];
}
} }
$profile_uid = ((x($_POST,'profile_uid')) ? intval($_POST['profile_uid']) : 0); $profile_uid = ((x($_POST,'profile_uid')) ? intval($_POST['profile_uid']) : 0);
@ -185,8 +194,13 @@ function item_post(&$a) {
$str_tags = ''; $str_tags = '';
$inform = ''; $inform = '';
$tags = get_tags($body); $tags = get_tags($body);
if(($parent_contact) && ($parent_contact['network'] === 'stat') && ($parent_contact['nick']) && (! in_array('@' . $parent_contact['nick'],$tags))) {
$body = '@' . $parent_contact['nick'] . ' ' . $body;
$tags[] = '@' . $parent_contact['nick'];
}
if(count($tags)) { if(count($tags)) {
foreach($tags as $tag) { foreach($tags as $tag) {
@ -199,6 +213,7 @@ function item_post(&$a) {
continue; continue;
} }
if(strpos($tag,'@') === 0) { if(strpos($tag,'@') === 0) {
$stat = false;
$name = substr($tag,1); $name = substr($tag,1);
if((strpos($name,'@')) || (strpos($name,'http://'))) { if((strpos($name,'@')) || (strpos($name,'http://'))) {
$newname = $name; $newname = $name;
@ -231,6 +246,8 @@ function item_post(&$a) {
); );
} }
if(count($r)) { if(count($r)) {
if($r[0]['network'] === 'stat')
$stat = true;
$profile = $r[0]['url']; $profile = $r[0]['url'];
$newname = $r[0]['name']; $newname = $r[0]['name'];
if(strlen($inform)) if(strlen($inform))
@ -239,6 +256,7 @@ function item_post(&$a) {
} }
} }
if($profile) { if($profile) {
if(! $stat)
$body = str_replace('@' . $name, '@' . '[url=' . $profile . ']' . $newname . '[/url]', $body); $body = str_replace('@' . $name, '@' . '[url=' . $profile . ']' . $newname . '[/url]', $body);
$profile = str_replace(',','%2c',$profile); $profile = str_replace(',','%2c',$profile);
if(strlen($str_tags)) if(strlen($str_tags))
@ -249,6 +267,8 @@ function item_post(&$a) {
} }
} }
$wall = 0; $wall = 0;
if($post_type === 'wall' || $post_type === 'wall-comment') if($post_type === 'wall' || $post_type === 'wall-comment')
$wall = 1; $wall = 1;