GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

@ messages

Browse Source 
darcs-hash:20080529170801-84dde-765f70013696c46bee65bf1408ff4a0b379711d7.gz
This commit is contained in:
Evan Prodromou 2008-05-29 13:08:01 -04:00
parent 6cbd424030
commit 9d9588a3de
4 changed files with 42 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/shownotice.php
View File

@ -69,7 +69,7 @@ class ShownoticeAction extends Action {
$profile->nickname); $profile->nickname);
# FIXME: URL, image, video, audio # FIXME: URL, image, video, audio
common_element_start('span', array('class' => 'content')); common_element_start('span', array('class' => 'content'));
common_raw(common_render_content($notice->content)); common_raw(common_render_content($notice->content, $notice));
common_element_end('span'); common_element_end('span');
common_element('span', array('class' => 'date'), common_element('span', array('class' => 'date'),
common_date_string($notice->created)); common_date_string($notice->created));

2
actions/showstream.php
View File

@ -315,7 +315,7 @@ class ShowstreamAction extends StreamAction {
if ($notice->find(true)) { if ($notice->find(true)) {
# FIXME: URL, image, video, audio # FIXME: URL, image, video, audio
common_element_start('span', array('class' => 'content')); common_element_start('span', array('class' => 'content'));
common_raw(common_render_content($notice->content)); common_raw(common_render_content($notice->content, $notice));
common_element_end('span'); common_element_end('span');
} }

2
lib/stream.php
View File

@ -48,7 +48,7 @@ class StreamAction extends Action {
$profile->nickname); $profile->nickname);
# FIXME: URL, image, video, audio # FIXME: URL, image, video, audio
common_element_start('span', array('class' => 'content')); common_element_start('span', array('class' => 'content'));
common_raw(common_render_content($notice->content)); common_raw(common_render_content($notice->content, $notice));
common_element_end('span'); common_element_end('span');
$noticeurl = common_local_url('shownotice', array('notice' => $notice->id)); $noticeurl = common_local_url('shownotice', array('notice' => $notice->id));
common_element('a', array('class' => 'notice', common_element('a', array('class' => 'notice',

42
lib/util.php
View File

@ -349,11 +349,47 @@ function common_canonical_email($email) {
return $email; return $email;
} }
function common_render_content($text) { function common_render_content($text, $notice=NULL) {
# XXX: @ messages $r = htmlspecialchars($text);
if ($notice) {
$id = $notice->profile_id;
$r = preg_replace('/\b@([\w-]{1-64})\b/e', "@common_at_link($id, '\\1')", $r);
}
# XXX: # tags # XXX: # tags
# XXX: machine tags # XXX: machine tags
return htmlspecialchars($text); return $r;
}
function common_at_link($profile_id, $nickname) {
# Try to find profiles this profile is subscribed to that have this nickname
$profile = new Profile();
# XXX: chokety and bad
$profile->whereAdd('EXISTS (SELECT subscribed from subscription where subscriber = '.$profile_id.' and subscribed = id)', 'AND');
$profile->whereAdd('nickname = "' . trim($nickname) . '"', 'AND');
if ($profile->find(TRUE)) {
return '<a href="'.$profile->profileurl.'" class="atlink tolistenee">'.$nickname.'</a>';
}
# Try to find profiles that listen to this profile and that have this nickname
$profile = new Profile();
# XXX: chokety and bad
$profile->whereAdd('EXISTS (SELECT subscriber from subscription where subscribed = '.$profile_id.' and subscriber = id)', 'AND');
$profile->whereAdd('nickname = "' . trim($nickname) . '"', 'AND');
if ($profile->find(TRUE)) {
return '<a href="'.$profile->profileurl.'" class="atlink tolistener">'.$nickname.'</a>';
}
# If this is a local user, try to find a local user with that nickname.
$sender = User::staticGet($profile_id);
if ($sender) {
$recipient = User::staticGet('nickname', $nickname);
if ($recipient) {
$profile = $recipient->getProfile();
return '<a href="'.$profile->profileurl.'" class="atlink usertouser">'.$nickname.'</a>';
}
}
# Otherwise, no links. @messages from local users to remote users,
# or from remote users to other remote users, are just
# outside our ability to make intelligent guesses about
return $nickname;
} }
// where should the avatar go for this user? // where should the avatar go for this user?