relative info, too

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

diff --git a/actions/newnotice.php b/actions/newnotice.php
index 961bbb63994ed105d38363fbeaa0141f8c80d3fc..5f6a224848d2baa976de75aa97f0900dbb5629c8 100644 (file)
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -20,7 +20,7 @@
 if (!defined('LACONICA')) { exit(1); }
 
 class NewnoticeAction extends Action {
-
+       
        function handle($args) {
                parent::handle($args);
                # XXX: Ajax!
@@ -38,9 +38,10 @@ class NewnoticeAction extends Action {
 
                $user = common_current_user();
                assert($user); # XXX: maybe an error instead...
-               $notice = DB_DataObject::factory('notice');
+               $notice = new Notice();
                assert($notice);
                $notice->profile_id = $user->id; # user id *is* profile id
+               $notice->is_local = 1;
                $notice->created = DB_DataObject_Cast::dateTime();
                # Default theme uses 'content' for something else
                $notice->content = $this->trimmed('status_textarea');
@@ -54,7 +55,7 @@ class NewnoticeAction extends Action {
                }
 
                $notice->rendered = common_render_content($notice->content, $notice);
-               
+
                $id = $notice->insert();
 
                if (!$id) {
@@ -70,9 +71,10 @@ class NewnoticeAction extends Action {
                        return;
                }
 
-        common_save_replies($notice);  
+               common_save_replies($notice);
+               $notice->saveTags();
                common_broadcast_notice($notice);
-               
+
                $returnto = $this->trimmed('returnto');
                if ($returnto) {
                        $url = common_local_url($returnto,
@@ -90,7 +92,14 @@ class NewnoticeAction extends Action {
 
        function show_form($msg=NULL) {
                $content = $this->trimmed('status_textarea');
-               common_show_header(_t('New notice'), NULL, $content,
+               if (!$content) {
+                       $replyto = $this->trimmed('replyto');
+                       $profile = Profile::staticGet('nickname', $replyto);
+                       if ($profile) {
+                               $content = '@' . $profile->nickname . ' ';
+                       }
+               }
+               common_show_header(_('New notice'), NULL, $content,
                                   array($this, 'show_top'));
                if ($msg) {
                        common_element('p', 'error', $msg);