try to make replies point to the clicked-on notice

[quix0rs-gnu-social.git] / actions / shownotice.php

diff --git a/actions/shownotice.php b/actions/shownotice.php
index 4803f5fdfc1b673be22c732f11647d2b114f0cf8..f9531b3c40378bf27cd4e5fc13c4896a0f1381f4 100644 (file)
--- a/actions/shownotice.php
+++ b/actions/shownotice.php
@@ -29,19 +29,21 @@ class ShownoticeAction extends StreamAction {
                $notice = Notice::staticGet($id);
 
                if (!$notice) {
-                       $this->no_such_notice();
+                       $this->client_error(_('No such notice.'), 404);
+                       return;
                }
 
                $profile = $notice->getProfile();
 
                if (!$profile) {
-                       $this->no_such_notice();
+                       $this->server_error(_('Notice has no profile'), 500);
+                       return;
                }
 
                # Looks like we're good; show the header
 
-               common_show_header($profile->nickname."'s status on ".common_exact_date($notice->created),
-                                                  NULL, $profile,
+               common_show_header(sprintf(_('%1$s\'s status on %2$s'), $profile->nickname, common_exact_date($notice->created)),
+                                                  array($this, 'show_header'), $notice,
                                                   array($this, 'show_top'));
 
                common_element_start('ul', array('id' => 'notices'));
@@ -51,7 +53,25 @@ class ShownoticeAction extends StreamAction {
                common_show_footer();
        }
 
-       function show_top($user) {
+       function show_header($notice)
+       {
+               $profile = $notice->getProfile();
+               $user = User::staticGet($profile->id);
+               if (!$user) {
+                       return;
+               }
+               if ($user->emailmicroid && $user->email && $notice->uri) {
+                       common_element('meta', array('name' => 'microid',
+                                                                                'content' => "mailto+http:sha1:" . sha1(sha1('mailto:' . $user->email) . sha1($notice->uri))));
+               }
+               if ($user->jabbermicroid && $user->jabber && $notice->uri) {
+                       common_element('meta', array('name' => 'microid',
+                                                                                'content' => "xmpp+http:sha1:" . sha1(sha1('xmpp:' . $user->jabber) . sha1($notice->uri))));
+               }
+       }
+
+       function show_top($notice) {
+               $user = $notice->getProfile();
                $cur = common_current_user();
 
                if ($cur && $cur->id == $user->id) {
@@ -60,6 +80,6 @@ class ShownoticeAction extends StreamAction {
        }
 
        function no_such_notice() {
-               common_user_error('No such notice.');
+               common_user_error(_('No such notice.'));
        }
 }