Fixes to bugs where non-local messages were being wrong put in the public timeline and public xmpp feed
This commit is contained in:
parent
e53512cd2c
commit
deeaafe712
|
@ -103,7 +103,7 @@ class ShownoticeAction extends OwnerDesignAction
|
|||
|
||||
$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);
|
||||
return false;
|
||||
}
|
||||
|
|
|
@ -63,7 +63,7 @@ class Notice extends Memcached_DataObject
|
|||
public $created; // datetime multiple_key not_null default_0000-00-00%2000%3A00%3A00
|
||||
public $modified; // timestamp not_null default_CURRENT_TIMESTAMP
|
||||
public $reply_to; // int(4)
|
||||
public $is_local; // tinyint(1)
|
||||
public $is_local; // int(4)
|
||||
public $source; // varchar(32)
|
||||
public $conversation; // int(4)
|
||||
public $lat; // decimal(10,7)
|
||||
|
|
|
@ -440,7 +440,7 @@ function jabber_public_notice($notice)
|
|||
// XXX: should we send out non-local messages if public,localonly
|
||||
// = false? I think not
|
||||
|
||||
if ($public && $notice->is_local) {
|
||||
if ($public && $notice->is_local == LOCAL_PUBLIC) {
|
||||
$profile = Profile::staticGet($notice->profile_id);
|
||||
|
||||
if (!$profile) {
|
||||
|
|
|
@ -379,7 +379,7 @@ class NoticeListItem extends Widget
|
|||
|
||||
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',
|
||||
array('notice' => $this->notice->id));
|
||||
}else{
|
||||
|
|
|
@ -21,7 +21,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
|
|||
|
||||
function ping_broadcast_notice($notice) {
|
||||
|
||||
if (!$notice->is_local) {
|
||||
if ($notice->is_local != Notice::LOCAL_PUBLIC && $notice->is_local != Notice::LOCAL_NONPUBLIC) {
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -115,4 +115,4 @@ function ping_notice_tags($notice) {
|
|||
return implode('|', $tags);
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user