X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fnewnotice.php;h=b5fc98c37c904d662200da2653931f5199be889e;hb=3a246c17266d562e0510e5a332009dcfda43c1c7;hp=bf5fd5bcc0f1f03514a346be2d7be0fca07419a9;hpb=b1282b1b9fd9997d15f127810f98117e01b72daa;p=quix0rs-gnu-social.git

diff --git a/actions/newnotice.php b/actions/newnotice.php
index bf5fd5bcc0..b5fc98c37c 100644
--- 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,49 +38,48 @@ class NewnoticeAction extends Action {
 
 		$user = common_current_user();
 		assert($user); # XXX: maybe an error instead...
-		$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');
-
-		if (!$notice->content) {
+		$content = $this->trimmed('status_textarea');
+		
+		if (!$content) {
 			$this->show_form(_('No content!'));
 			return;
-		} else if (strlen($notice->content) > 140) {
+		} else if (mb_strlen($content) > 140) {
+			common_debug("Content = '$content'", __FILE__);
+			common_debug("mb_strlen(\$content) = " . mb_strlen($content), __FILE__);
 			$this->show_form(_('That\'s too long. Max notice size is 140 chars.'));
 			return;
 		}
 
-		$notice->rendered = common_render_content($notice->content, $notice);
-
-		$id = $notice->insert();
-
-		if (!$id) {
-			common_server_error(_('Problem saving notice.'));
+		$inter = new CommandInterpreter();
+		
+		$cmd = $inter->handle_command($user, $content);
+		
+		if ($cmd) {
+			$cmd->execute(new WebChannel());
 			return;
 		}
 
-		$orig = clone($notice);
-		$notice->uri = common_notice_uri($notice);
+		$replyto = $this->trimmed('inreplyto');
 
-		if (!$notice->update($orig)) {
-			common_server_error(_('Problem saving notice.'));
+		common_debug("Replyto = $replyto\n");
+		
+		$notice = Notice::saveNew($user->id, $content, 'web', 1, ($replyto == 'false') ? NULL : $replyto);
+		
+		if (is_string($notice)) {
+			$this->show_form($notice);
 			return;
 		}
-
-        common_save_replies($notice);
+		
 		common_broadcast_notice($notice);
-
+		
 		$returnto = $this->trimmed('returnto');
+		
 		if ($returnto) {
 			$url = common_local_url($returnto,
 									array('nickname' => $user->nickname));
 		} else {
 			$url = common_local_url('shownotice',
-									array('notice' => $id));
+									array('notice' => $notice->id));
 		}
 		common_redirect($url, 303);
 	}