wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change Notice::saveNew() to use named arguments for little-used options

Browse Source
This commit is contained in:
Evan Prodromou 2009-12-11 11:29:51 -05:00
parent 85473ecf94
commit 79f81ad76d
6 changed files with 42 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
actions/apistatusesupdate.php
View File

@ -231,19 +231,22 @@ class ApiStatusesUpdateAction extends ApiAuthAction
}
}
$this->notice = Notice::saveNew(
$this->user->id,
html_entity_decode($status_shortened, ENT_NOQUOTES, 'UTF-8'),
$this->source,
1,
$reply_to,
null,
null,
empty($location) ? null : $location->lat,
empty($location) ? null : $location->lon,
empty($location) ? null : $location->location_id,
empty($location) ? null : $location->location_ns
);
$content = html_entity_decode($status_shortened, ENT_NOQUOTES, 'UTF-8'),
$options = array('reply_to' => $reply_to);
if (!empty($location)) {
$options['lat'] = $location->lat;
$options['lon'] = $location->lon;
$options['location_id'] = $location->location_id;
$options['location_ns'] = $location->location_ns;
}
$this->notice =
Notice::saveNew($this->user->id,
$content,
$this->source,
$options);
if (isset($upload)) {
$upload->attachToNotice($this->notice);

10
actions/newnotice.php
View File

@ -187,10 +187,12 @@ class NewnoticeAction extends Action
}
}
$notice = Notice::saveNew($user->id, $content_shortened, 'web', 1,
($replyto == 'false') ? null : $replyto,
null, null,
$lat, $lon, $location_id, $location_ns);
$notice = Notice::saveNew($user->id, $content_shortened, 'web',
array('reply_to' => ($replyto == 'false') ? null : $replyto,
'lat' => $lat,
'lon' => $lon,
'location_id' => $location_id,
'location_ns' => $location_ns));
if (isset($upload)) {
$upload->attachToNotice($notice);

15
classes/Notice.php
View File

@ -167,9 +167,18 @@ class Notice extends Memcached_DataObject
}
}
static function saveNew($profile_id, $content, $source=null,
$is_local=Notice::LOCAL_PUBLIC, $reply_to=null, $uri=null, $created=null,
$lat=null, $lon=null, $location_id=null, $location_ns=null) {
static function saveNew($profile_id, $content, $source, $options=null) {
if (!empty($options)) {
extract($options);
if (!isset($reply_to)) {
$reply_to = NULL;
}
}
if (empty($is_local)) {
$is_local = Notice::LOCAL_PUBLIC;
}
$profile = Profile::staticGet($profile_id);

5
lib/command.php
View File

@ -433,8 +433,9 @@ class ReplyCommand extends Command
return;
}
$notice = Notice::saveNew($this->user->id, $this->text, $channel->source(), 1,
$notice->id);
$notice = Notice::saveNew($this->user->id, $this->text, $channel->source(),
array('reply_to' => $notice->id));
if ($notice) {
$channel->output($this->user, sprintf(_('Reply to %s sent'), $recipient->nickname));
} else {

5
lib/oauthstore.php
View File

@ -359,9 +359,8 @@ class StatusNetOAuthDataStore extends OAuthDataStore
$notice = Notice::saveNew($author->id,
$omb_notice->getContent(),
'omb',
false,
null,
$omb_notice->getIdentifierURI());
array('is_local' => Notice::REMOTE_OMB,
'uri' => $omb_notice->getIdentifierURI()));
common_broadcast_notice($notice, true);
}

5
plugins/Facebook/facebookaction.php
View File

@ -445,8 +445,9 @@ class FacebookAction extends Action
$replyto = $this->trimmed('inreplyto');
try {
$notice = Notice::saveNew($user->id, $content,
'web', 1, ($replyto == 'false') ? null : $replyto);
$notice = Notice::saveNew($user->id, $content, 'web',
array('reply_to' => ($replyto == 'false') ? null : $replyto));
} catch (Exception $e) {
$this->showPage($e->getMessage());
return;