eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Fixes to bugs where non-local messages were being wrong put in the public timeline and public xmpp feed

Browse Source
This commit is contained in:
Ciaran Gultnieks 2010-01-07 20:59:31 +00:00
parent e53512cd2c
commit deeaafe712
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/shownotice.php
View File

@ -103,7 +103,7 @@ class ShownoticeAction extends OwnerDesignAction
$this->user = User::staticGet('id', $this->profile->id); $this->user = User::staticGet('id', $this->profile->id);
if (! $this->notice->is_local) { if ($this->notice->is_local == Notice::REMOTE_OMB) {
common_redirect($this->notice->uri); common_redirect($this->notice->uri);
return false; return false;
} }

2
classes/Notice.php
View File

@ -63,7 +63,7 @@ class Notice extends Memcached_DataObject
public $created; // datetime multiple_key not_null default_0000-00-00%2000%3A00%3A00 public $created; // datetime multiple_key not_null default_0000-00-00%2000%3A00%3A00
public $modified; // timestamp not_null default_CURRENT_TIMESTAMP public $modified; // timestamp not_null default_CURRENT_TIMESTAMP
public $reply_to; // int(4) public $reply_to; // int(4)
public $is_local; // tinyint(1) public $is_local; // int(4)
public $source; // varchar(32) public $source; // varchar(32)
public $conversation; // int(4) public $conversation; // int(4)
public $lat; // decimal(10,7) public $lat; // decimal(10,7)

2
lib/jabber.php
View File

@ -440,7 +440,7 @@ function jabber_public_notice($notice)
// XXX: should we send out non-local messages if public,localonly // XXX: should we send out non-local messages if public,localonly
// = false? I think not // = false? I think not
if ($public && $notice->is_local) { if ($public && $notice->is_local == LOCAL_PUBLIC) {
$profile = Profile::staticGet($notice->profile_id); $profile = Profile::staticGet($notice->profile_id);
if (!$profile) { if (!$profile) {

2
lib/noticelist.php
View File

@ -379,7 +379,7 @@ class NoticeListItem extends Widget
function showNoticeLink() function showNoticeLink()
{ {
if($this->notice->is_local){ if($this->notice->is_local == Notice::LOCAL_PUBLIC || $this->notice->is_local == Notice::LOCAL_NONPUBLIC){
$noticeurl = common_local_url('shownotice', $noticeurl = common_local_url('shownotice',
array('notice' => $this->notice->id)); array('notice' => $this->notice->id));
}else{ }else{

4
lib/ping.php
View File

@ -21,7 +21,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
function ping_broadcast_notice($notice) { function ping_broadcast_notice($notice) {
if (!$notice->is_local) { if ($notice->is_local != Notice::LOCAL_PUBLIC && $notice->is_local != Notice::LOCAL_NONPUBLIC) {
return true; return true;
} }
@ -115,4 +115,4 @@ function ping_notice_tags($notice) {
return implode('|', $tags); return implode('|', $tags);
} }
return NULL; return NULL;
} }