summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
authorEvan Prodromou <evan@prodromou.name>2008-07-29 22:28:56 -0400
committerEvan Prodromou <evan@prodromou.name>2008-07-29 22:28:56 -0400
commitd79dc8344b529281dfb8a8383c529720a429472b (patch)
tree33d4914a14e62b657a426520a5844340c187059b /actions
parent44fb662efb0e664287863dfe106f332a83a2f622 (diff)
refactor notice-adding code to one static method on Notice
darcs-hash:20080730022856-84dde-f19e4ff5d5ae2603b63b8aebd8f878ec90b3ce22.gz
Diffstat (limited to 'actions')
-rw-r--r--actions/newnotice.php39
-rw-r--r--actions/postnotice.php19
-rw-r--r--actions/twitapistatuses.php43
3 files changed, 28 insertions, 73 deletions
diff --git a/actions/newnotice.php b/actions/newnotice.php
index 5f6a22484..8de6643a0 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -38,44 +38,27 @@ 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 (strlen($content) > 140) {
$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.'));
+ $notice = Notice::saveNew($user->id, $content, 'web');
+
+ if (is_string($notice)) {
+ $this->show_form($notice);
return;
}
-
- $orig = clone($notice);
- $notice->uri = common_notice_uri($notice);
-
- if (!$notice->update($orig)) {
- common_server_error(_('Problem saving notice.'));
- return;
- }
-
- common_save_replies($notice);
- $notice->saveTags();
+
common_broadcast_notice($notice);
-
+
$returnto = $this->trimmed('returnto');
+
if ($returnto) {
$url = common_local_url($returnto,
array('nickname' => $user->nickname));
diff --git a/actions/postnotice.php b/actions/postnotice.php
index b08f27ac4..9540d5536 100644
--- a/actions/postnotice.php
+++ b/actions/postnotice.php
@@ -74,24 +74,11 @@ class PostnoticeAction extends Action {
}
$notice = Notice::staticGet('uri', $notice_uri);
if (!$notice) {
- $notice = new Notice();
- $notice->is_local = 0;
- $notice->profile_id = $remote_profile->id;
- $notice->uri = $notice_uri;
- $notice->content = $content;
- $notice->rendered = common_render_content($notice->content, $notice);
- if ($notice_url) {
- $notice->url = $notice_url;
- }
- $notice->created = DB_DataObject_Cast::dateTime(); # current time
- $id = $notice->insert();
- if (!$id) {
- common_server_error(_('Error inserting notice'), 500);
+ $notice = Notice::saveNew($remote_profile->id, $content, 'omb', 0);
+ if (is_string($notice)) {
+ common_server_serror($notice, 500);
return false;
}
- common_save_replies($notice);
- $notice->saveTags();
- common_broadcast_notice($notice, true);
}
return true;
}
diff --git a/actions/twitapistatuses.php b/actions/twitapistatuses.php
index 0c97ada0b..f791a0cc8 100644
--- a/actions/twitapistatuses.php
+++ b/actions/twitapistatuses.php
@@ -371,20 +371,19 @@ class TwitapistatusesAction extends TwitterapiAction {
}
function update($args, $apidata) {
+
parent::handle($args);
$user = $apidata['user'];
-
- $this->is_readonly();
-
- $notice = DB_DataObject::factory('notice');
+ $status = $this->trimmed('status');
+ $source = $this->trimmed('source');
- $notice->profile_id = $user->id; # user id *is* profile id
- $notice->created = DB_DataObject_Cast::dateTime();
- $notice->content = $this->trimmed('status');
-
- if (!$notice->content) {
+ if (!$source) {
+ $source = 'api';
+ }
+
+ if (!$status) {
// XXX: Note: In this case, Twitter simply returns '200 OK'
// No error is given, but the status is not posted to the
@@ -392,7 +391,7 @@ class TwitapistatusesAction extends TwitterapiAction {
// errror? -- Zach
exit();
- } else if (strlen($notice->content) > 140) {
+ } else if (strlen($status) > 140) {
// XXX: Twitter truncates anything over 140, flags the status
// as "truncated." Sending this error may screw up some clients
@@ -402,28 +401,14 @@ class TwitapistatusesAction extends TwitterapiAction {
print "That's too long. Max notice size is 140 chars.\n";
exit();
}
-
- $notice->rendered = common_render_content($notice->content, $notice);
- $notice->is_local = 1;
- $id = $notice->insert();
-
- if (!$id) {
- common_server_error('Could not update status!', 500);
- exit();
- }
+ $notice = Notice::saveNew($user->id, $status, $source);
- $orig = clone($notice);
- $notice->uri = common_notice_uri($notice);
-
- if (!$notice->update($orig)) {
- common_server_error('Could not save status!', 500);
- exit();
+ if (is_string($notice)) {
+ $this->server_error($notice);
+ return;
}
-
- common_save_replies($notice);
- common_broadcast_notice($notice);
-
+
// FIXME: Bad Hack
// I should be able to just sent this notice off for display,
// but $notice->created does not contain a string at this