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

mark incoming notices as local or not

Browse Source 
darcs-hash:20080722141828-84dde-160fe4582c1949af1f6b049b3336cad493e30510.gz
This commit is contained in:
Evan Prodromou 2008-07-22 10:18:28 -04:00
parent e1361cdf48
commit b1282b1b9f
4 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
actions/newnotice.php
View File

@ -38,9 +38,10 @@ class NewnoticeAction extends Action {
$user = common_current_user(); $user = common_current_user();
assert($user); # XXX: maybe an error instead... assert($user); # XXX: maybe an error instead...
$notice = DB_DataObject::factory('notice'); $notice = new Notice();
assert($notice); assert($notice);
$notice->profile_id = $user->id; # user id *is* profile id $notice->profile_id = $user->id; # user id *is* profile id
$notice->is_local = 1;
$notice->created = DB_DataObject_Cast::dateTime(); $notice->created = DB_DataObject_Cast::dateTime();
# Default theme uses 'content' for something else # Default theme uses 'content' for something else
$notice->content = $this->trimmed('status_textarea'); $notice->content = $this->trimmed('status_textarea');

1
actions/postnotice.php
View File

@ -75,6 +75,7 @@ class PostnoticeAction extends Action {
$notice = Notice::staticGet('uri', $notice_uri); $notice = Notice::staticGet('uri', $notice_uri);
if (!$notice) { if (!$notice) {
$notice = new Notice(); $notice = new Notice();
$notice->is_local = 0;
$notice->profile_id = $remote_profile->id; $notice->profile_id = $remote_profile->id;
$notice->uri = $notice_uri; $notice->uri = $notice_uri;
$notice->content = $content; $notice->content = $content;

1
maildaemon.php
View File

@ -116,6 +116,7 @@ class MailerDaemon {
function add_notice($user, $msg) { function add_notice($user, $msg) {
$notice = new Notice(); $notice = new Notice();
$notice->is_local = 1;
$notice->profile_id = $user->id; $notice->profile_id = $user->id;
$notice->content = trim(substr($msg, 0, 140)); $notice->content = trim(substr($msg, 0, 140));
$notice->rendered = common_render_content($notice->content, $notice); $notice->rendered = common_render_content($notice->content, $notice);

1
xmppdaemon.php
View File

@ -224,6 +224,7 @@ class XMPPDaemon {
function add_notice(&$user, &$pl) { function add_notice(&$user, &$pl) {
$notice = new Notice(); $notice = new Notice();
$notice->is_local = 1;
$notice->profile_id = $user->id; $notice->profile_id = $user->id;
$notice->content = trim(substr($pl['body'], 0, 140)); $notice->content = trim(substr($pl['body'], 0, 140));
$notice->rendered = common_render_content($notice->content, $notice); $notice->rendered = common_render_content($notice->content, $notice);