@ messages

darcs-hash:20080529170801-84dde-765f70013696c46bee65bf1408ff4a0b379711d7.gz

diff --git a/actions/shownotice.php b/actions/shownotice.php
index b189fdb87fed43f629381c87563b687d466171ed..4bf4238cd44ecd9f8d1e9aa2458861aa1800811a 100644 (file)
--- a/actions/shownotice.php
+++ b/actions/shownotice.php
@@ -69,7 +69,7 @@ class ShownoticeAction extends Action {
                                           $profile->nickname);
                # FIXME: URL, image, video, audio
                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('span', array('class' => 'date'),
                                           common_date_string($notice->created));

diff --git a/actions/showstream.php b/actions/showstream.php
index d4af6313278beb09564a5a58fff55a1d48bb823e..fdf3d33bd46f2de5df6a323b3a6d92cea0f757e2 100644 (file)
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -315,7 +315,7 @@ class ShowstreamAction extends StreamAction {
                if ($notice->find(true)) {
                        # FIXME: URL, image, video, audio
                        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');
                }
 

diff --git a/lib/stream.php b/lib/stream.php
index b6834eb45ae8eef1654e440d737881f306ec667e..ac683367f166aec509ec9a7246dc8ad6a6d36b4c 100644 (file)
--- a/lib/stream.php
+++ b/lib/stream.php
@@ -48,7 +48,7 @@ class StreamAction extends Action {
                                           $profile->nickname);
                # FIXME: URL, image, video, audio
                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');
                $noticeurl = common_local_url('shownotice', array('notice' => $notice->id));
                common_element('a', array('class' => 'notice',

diff --git a/lib/util.php b/lib/util.php
index 1b308d14ead940ca0e69539afa692146e1420128..4ed1a4afb87505daefc40663d3a1b8c6bf86a482 100644 (file)
--- a/lib/util.php
+++ b/lib/util.php
@@ -349,11 +349,47 @@ function common_canonical_email($email) {
        return $email;
 }
 
-function common_render_content($text) {
-       # XXX: @ messages
+function common_render_content($text, $notice=NULL) {
+       $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: 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?