forked from GNUsocial/gnu-social
Need to always emit statusnet:notice_info so it's available in profile feeds
This commit is contained in:
parent
5ea019c41a
commit
114df39822
@ -1211,24 +1211,6 @@ class Notice extends Memcached_DataObject
|
|||||||
|
|
||||||
$xs->element('icon', null, $profile->avatarUrl(AVATAR_PROFILE_SIZE));
|
$xs->element('icon', null, $profile->avatarUrl(AVATAR_PROFILE_SIZE));
|
||||||
$xs->element('updated', null, common_date_w3dtf($this->created));
|
$xs->element('updated', null, common_date_w3dtf($this->created));
|
||||||
|
|
||||||
$noticeInfoAttr = array(
|
|
||||||
'local_id' => $this->id, // local notice ID (useful to clients for ordering)
|
|
||||||
'source' => $this->source // the client name (source attribution)
|
|
||||||
);
|
|
||||||
|
|
||||||
$ns = $this->getSource();
|
|
||||||
if ($ns) {
|
|
||||||
if (!empty($ns->url)) {
|
|
||||||
$noticeInfoAttr['source_link'] = $ns->url;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!empty($cur)) {
|
|
||||||
$noticeInfoAttr['favorited'] = ($cur->hasFave($this)) ? 'true' : 'false';
|
|
||||||
}
|
|
||||||
|
|
||||||
$xs->element('statusnet:notice_info', $noticeInfoAttr, null);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($source) {
|
if ($source) {
|
||||||
@ -1251,6 +1233,24 @@ class Notice extends Memcached_DataObject
|
|||||||
$xs->element('published', null, common_date_w3dtf($this->created));
|
$xs->element('published', null, common_date_w3dtf($this->created));
|
||||||
$xs->element('updated', null, common_date_w3dtf($this->created));
|
$xs->element('updated', null, common_date_w3dtf($this->created));
|
||||||
|
|
||||||
|
$noticeInfoAttr = array(
|
||||||
|
'local_id' => $this->id, // local notice ID (useful to clients for ordering)
|
||||||
|
'source' => $this->source // the client name (source attribution)
|
||||||
|
);
|
||||||
|
|
||||||
|
$ns = $this->getSource();
|
||||||
|
if ($ns) {
|
||||||
|
if (!empty($ns->url)) {
|
||||||
|
$noticeInfoAttr['source_link'] = $ns->url;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!empty($cur)) {
|
||||||
|
$noticeInfoAttr['favorited'] = ($cur->hasFave($this)) ? 'true' : 'false';
|
||||||
|
}
|
||||||
|
|
||||||
|
$xs->element('statusnet:notice_info', $noticeInfoAttr, null);
|
||||||
|
|
||||||
if ($this->reply_to) {
|
if ($this->reply_to) {
|
||||||
$reply_notice = Notice::staticGet('id', $this->reply_to);
|
$reply_notice = Notice::staticGet('id', $this->reply_to);
|
||||||
if (!empty($reply_notice)) {
|
if (!empty($reply_notice)) {
|
||||||
|
Loading…
Reference in New Issue
Block a user