forked from GNUsocial/gnu-social
mark incoming notices as local or not
darcs-hash:20080722141828-84dde-160fe4582c1949af1f6b049b3336cad493e30510.gz
This commit is contained in:
parent
e1361cdf48
commit
b1282b1b9f
@ -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');
|
||||
|
@ -75,6 +75,7 @@ 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;
|
||||
|
@ -116,6 +116,7 @@ class MailerDaemon {
|
||||
|
||||
function add_notice($user, $msg) {
|
||||
$notice = new Notice();
|
||||
$notice->is_local = 1;
|
||||
$notice->profile_id = $user->id;
|
||||
$notice->content = trim(substr($msg, 0, 140));
|
||||
$notice->rendered = common_render_content($notice->content, $notice);
|
||||
|
@ -224,6 +224,7 @@ class XMPPDaemon {
|
||||
|
||||
function add_notice(&$user, &$pl) {
|
||||
$notice = new Notice();
|
||||
$notice->is_local = 1;
|
||||
$notice->profile_id = $user->id;
|
||||
$notice->content = trim(substr($pl['body'], 0, 140));
|
||||
$notice->rendered = common_render_content($notice->content, $notice);
|
||||
|
Loading…
Reference in New Issue
Block a user