harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Diaspora tag replacement was wretchedly buggy. Use our standard tag replacement calls instead.

Browse Source
This commit is contained in:
friendica 2015-02-19 16:29:49 -08:00
parent 3ea77f0c10
commit 8db3677546
1 changed files with 27 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

156
include/diaspora.php
View File

@ -841,68 +841,25 @@ function diaspora_post($importer,$xml,$msg) {
$datarray = array(); $datarray = array();
$tags = get_tags($body); // Look for tags and linkify them
$results = linkify_tags(get_app(), $body, $importer['channel_id']);
if(count($tags)) {
if($results) {
$datarray['term'] = array(); $datarray['term'] = array();
foreach($results as $result) {
foreach($tags as $tag) { $success = $result['success'];
if(strpos($tag,'#') === 0) { if($success['replaced']) {
if((strpos($tag,'[url=')) || (strpos($tag,'[zrl')))
continue;
// don't link tags that are already embedded in links
if(preg_match('/\[(.*?)' . preg_quote($tag,'/') . '(.*?)\]/',$body))
continue;
if(preg_match('/\[(.*?)\]\((.*?)' . preg_quote($tag,'/') . '(.*?)\)/',$body))
continue;
$basetag = str_replace('_',' ',substr($tag,1));
$body = str_replace($tag,'#[url=' . $a->get_baseurl() . '/search?tag=' . rawurlencode($basetag) . ']' . $basetag . '[/url]',$body);
$datarray['term'][] = array( $datarray['term'][] = array(
'uid' => $importer['channel_id'], 'uid' => $importer['channel_id'],
'type' => TERM_HASHTAG, 'type' => $success['termtype'],
'otype' => TERM_OBJ_POST, 'otype' => TERM_OBJ_POST,
'term' => $basetag, 'term' => $success['term'],
'url' => z_root() . '/search?tag=' . rawurlencode($basetag) 'url' => $success['url']
); );
} }
} }
} }
$cnt = preg_match_all('/@\[url=(.*?)\](.*?)\[\/url\]/ism',$body,$matches,PREG_SET_ORDER);
if($cnt) {
foreach($matches as $mtch) {
$datarray['term'][] = array(
'uid' => $importer['channel_id'],
'type' => TERM_MENTION,
'otype' => TERM_OBJ_POST,
'term' => $mtch[2],
'url' => $mtch[1]
);
}
}
$cnt = preg_match_all('/@\[zrl=(.*?)\](.*?)\[\/zrl\]/ism',$body,$matches,PREG_SET_ORDER);
if($cnt) {
foreach($matches as $mtch) {
// don't include plustags in the term
$term = ((substr($mtch[2],-1,1) === '+') ? substr($mtch[2],0,-1) : $mtch[2]);
$datarray['term'][] = array(
'uid' => $importer['channel_id'],
'type' => TERM_MENTION,
'otype' => TERM_OBJ_POST,
'term' => $term,
'url' => $mtch[1]
);
}
}
$plink = service_plink($contact,$guid); $plink = service_plink($contact,$guid);
@ -1053,12 +1010,6 @@ function diaspora_reshare($importer,$xml,$msg) {
logger('message length exceeds max_import_size: truncated'); logger('message length exceeds max_import_size: truncated');
} }
//if(! $body) {
// logger('diaspora_reshare: empty body: source= ' . $x);
// return;
//}
$person = find_diaspora_person_by_handle($orig_author); $person = find_diaspora_person_by_handle($orig_author);
if($person) { if($person) {
@ -1073,52 +1024,25 @@ function diaspora_reshare($importer,$xml,$msg) {
$datarray = array(); $datarray = array();
$tags = get_tags($body); // Look for tags and linkify them
$results = linkify_tags(get_app(), $body, $importer['channel_id']);
if(count($tags)) {
if($results) {
$datarray['term'] = array(); $datarray['term'] = array();
foreach($results as $result) {
foreach($tags as $tag) { $success = $result['success'];
if(strpos($tag,'#') === 0) { if($success['replaced']) {
if((strpos($tag,'[url=')) || (strpos($tag,'[zrl')))
continue;
// don't link tags that are already embedded in links
if(preg_match('/\[(.*?)' . preg_quote($tag,'/') . '(.*?)\]/',$newbody))
continue;
if(preg_match('/\[(.*?)\]\((.*?)' . preg_quote($tag,'/') . '(.*?)\)/',$newbody))
continue;
$basetag = str_replace('_',' ',substr($tag,1));
$newbody = str_replace($tag,'#[url=' . $a->get_baseurl() . '/search?tag=' . rawurlencode($basetag) . ']' . $basetag . '[/url]',$newbody);
$datarray['term'][] = array( $datarray['term'][] = array(
'uid' => $importer['channel_id'], 'uid' => $importer['channel_id'],
'type' => TERM_HASHTAG, 'type' => $success['termtype'],
'otype' => TERM_OBJ_POST, 'otype' => TERM_OBJ_POST,
'term' => $basetag, 'term' => $success['term'],
'url' => z_root() . '/search?tag=' . rawurlencode($basetag) 'url' => $success['url']
); );
} }
} }
} }
$cnt = preg_match_all('/@\[url=(.*?)\](.*?)\[\/url\]/ism',$body,$matches,PREG_SET_ORDER);
if($cnt) {
foreach($matches as $mtch) {
$datarray['term'][] = array(
'uid' => $importer['channel_id'],
'type' => TERM_MENTION,
'otype' => TERM_OBJ_POST,
'term' => $mtch[2],
'url' => $mtch[1]
);
}
}
$newbody = "[share author='" . urlencode($orig_author_name) $newbody = "[share author='" . urlencode($orig_author_name)
. "' profile='" . $orig_author_link . "' profile='" . $orig_author_link
. "' avatar='" . $orig_author_photo . "' avatar='" . $orig_author_photo
@ -1396,51 +1320,25 @@ function diaspora_comment($importer,$xml,$msg) {
$datarray = array(); $datarray = array();
$tags = get_tags($body); // Look for tags and linkify them
$results = linkify_tags(get_app(), $body, $importer['channel_id']);
if(count($tags)) {
if($results) {
$datarray['term'] = array(); $datarray['term'] = array();
foreach($results as $result) {
foreach($tags as $tag) { $success = $result['success'];
if(strpos($tag,'#') === 0) { if($success['replaced']) {
if((strpos($tag,'[url=')) || (strpos($tag,'[zrl')))
continue;
// don't link tags that are already embedded in links
if(preg_match('/\[(.*?)' . preg_quote($tag,'/') . '(.*?)\]/',$body))
continue;
if(preg_match('/\[(.*?)\]\((.*?)' . preg_quote($tag,'/') . '(.*?)\)/',$body))
continue;
$basetag = str_replace('_',' ',substr($tag,1));
$body = str_replace($tag,'#[url=' . $a->get_baseurl() . '/search?tag=' . rawurlencode($basetag) . ']' . $basetag . '[/url]',$body);
$datarray['term'][] = array( $datarray['term'][] = array(
'uid' => $importer['channel_id'], 'uid' => $importer['channel_id'],
'type' => TERM_HASHTAG, 'type' => $success['termtype'],
'otype' => TERM_OBJ_POST, 'otype' => TERM_OBJ_POST,
'term' => $basetag, 'term' => $success['term'],
'url' => z_root() . '/search?tag=' . rawurlencode($basetag) 'url' => $success['url']
); );
} }
} }
} }
$cnt = preg_match_all('/@\[url=(.*?)\](.*?)\[\/url\]/ism',$body,$matches,PREG_SET_ORDER);
if($cnt) {
foreach($matches as $mtch) {
$datarray['term'][] = array(
'uid' => $importer['channel_id'],
'type' => TERM_MENTION,
'otype' => TERM_OBJ_POST,
'term' => $mtch[2],
'url' => $mtch[1]
);
}
}
$datarray['uid'] = $importer['channel_id']; $datarray['uid'] = $importer['channel_id'];
$datarray['verb'] = ACTIVITY_POST; $datarray['verb'] = ACTIVITY_POST;
$datarray['mid'] = $guid; $datarray['mid'] = $guid;