Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-20 02:35:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

a bit more work towards issue #395 - cleaning up some cases which were going to the url directly and which weren't going through chanview. Also worth noting - mentions in posts do not go through chanview. Perhaps it is time to kill chanview (except we then cannot implemented a "connected" or "connect" button since we don't have any control over the landing page). For the time being I'm just trying to trap as many of the "visit URL" links as possible and sending them to a common place. Then we can figure out how that common place should behave.

Browse source
This commit is contained in:
friendica 2014-04-06 18:40:37 -07:00
parent b880982b61
commit 6f555c50e1
3 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/conversation.php
View file

@ -911,7 +911,7 @@ function item_photo_menu($item){
} }
} }
$profile_link = z_root() . "/chanview/?f=&hash=" . $item['author_xchan']; $profile_link = chanlink_hash($item['author_xchan']);
$pm_url = $a->get_baseurl($ssl_state) . '/mail/new/?f=&hash=' . $item['author_xchan']; $pm_url = $a->get_baseurl($ssl_state) . '/mail/new/?f=&hash=' . $item['author_xchan'];
if($a->contacts && array_key_exists($item['author_xchan'],$a->contacts)) if($a->contacts && array_key_exists($item['author_xchan'],$a->contacts))
@ -964,13 +964,7 @@ function like_puller($a,$item,&$arr,$mode) {
$verb = (($mode === 'like') ? ACTIVITY_LIKE : ACTIVITY_DISLIKE); $verb = (($mode === 'like') ? ACTIVITY_LIKE : ACTIVITY_DISLIKE);
if((activity_match($item['verb'],$verb)) && ($item['id'] != $item['parent'])) { if((activity_match($item['verb'],$verb)) && ($item['id'] != $item['parent'])) {
$url = $item['author']['xchan_url']; $url = chanlink_url($item['author']['xchan_url']);
if((local_user()) && (local_user() == $item['uid']) && ($item['network'] === 'dfrn') && (! $item['self']) && (link_compare($item['author-link'],$item['url']))) {
$url = $a->get_baseurl(true) . '/redir/' . $item['contact-id'];
$sparkle = ' class="sparkle" ';
}
else
$url = zid($url);
if(! $item['thr_parent']) if(! $item['thr_parent'])
$item['thr_parent'] = $item['parent_mid']; $item['thr_parent'] = $item['parent_mid'];
@ -981,7 +975,7 @@ function like_puller($a,$item,&$arr,$mode) {
$arr[$item['thr_parent']] = 1; $arr[$item['thr_parent']] = 1;
else else
$arr[$item['thr_parent']] ++; $arr[$item['thr_parent']] ++;
$arr[$item['thr_parent'] . '-l'][] = '<a href="'. $url . '"'. $sparkle .'>' . $item['author']['xchan_name'] . '</a>'; $arr[$item['thr_parent'] . '-l'][] = '<a href="'. $url . '">' . $item['author']['xchan_name'] . '</a>';
} }
return; return;
} }

2
mod/connedit.php
View file

@ -316,7 +316,7 @@ function connedit_content(&$a) {
array( array(
'label' => t('View Profile'), 'label' => t('View Profile'),
'url' => $a->get_baseurl(true) . '/chanview/?f=&cid=' . $contact['abook_id'], 'url' => chanlink_cid($contact['abook_id']),
'sel' => '', 'sel' => '',
'title' => sprintf( t('View %s\'s profile'), $contact['xchan_name']), 'title' => sprintf( t('View %s\'s profile'), $contact['xchan_name']),
), ),

2
mod/viewconnections.php
View file

@ -48,7 +48,7 @@ function viewconnections_content(&$a) {
foreach($r as $rr) { foreach($r as $rr) {
$url = zid($rr['xchan_url']); $url = chanlink_url($rr['xchan_url']);
if($url) { if($url) {
$contacts[] = array( $contacts[] = array(
'id' => $rr['abook_id'], 'id' => $rr['abook_id'],