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

Set new notice uri to something that's not a URL

Browse Source
This commit is contained in:
Mikael Nordfeldth 2014-04-18 22:42:01 +02:00
parent 37e9366e88
commit 28dc361a15
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
classes/Notice.php
View File

@ -216,6 +216,12 @@ class Notice extends Managed_DataObject
return $this->url ?: $this->uri; return $this->url ?: $this->uri;
} }
public function get_object_type($canonical=false) {
return $canonical
? ActivityObject::canonicalType($this->object_type)
: $this->object_type;
}
public static function getByUri($uri) public static function getByUri($uri)
{ {
$notice = new Notice(); $notice = new Notice();
@ -308,7 +314,7 @@ class Notice extends Managed_DataObject
* int 'location_ns' geoname namespace to interpret location_id * int 'location_ns' geoname namespace to interpret location_id
* int 'reply_to'; notice ID this is a reply to * int 'reply_to'; notice ID this is a reply to
* int 'repeat_of'; notice ID this is a repeat of * int 'repeat_of'; notice ID this is a repeat of
* string 'uri' unique ID for notice; defaults to local notice URL * string 'uri' unique ID for notice; a unique tag uri (can be url or anything too)
* string 'url' permalink to notice; defaults to local notice URL * string 'url' permalink to notice; defaults to local notice URL
* string 'rendered' rendered HTML version of content * string 'rendered' rendered HTML version of content
* array 'replies' list of profile URIs for reply delivery in * array 'replies' list of profile URIs for reply delivery in
@ -579,7 +585,10 @@ class Notice extends Managed_DataObject
$changed = false; $changed = false;
if (empty($uri)) { if (empty($uri)) {
$notice->uri = common_notice_uri($notice); $notice->uri = sprintf('%s:%s=%d:%s=%s',
TagURI::mint(),
'noticeId', $notice->id,
'objectType', $notice->get_object_type(true));
$changed = true; $changed = true;
} }