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

add URI members to social activity classes

Browse Source
This commit is contained in:
Evan Prodromou
2011-08-22 16:36:23 -04:00
parent 48bb784400
commit 34d0e1088d
4 changed files with 77 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
classes/Subscription.php
View File

@@ -39,6 +39,7 @@ class Subscription extends Memcached_DataObject
public $sms; // tinyint(1) default_1
public $token; // varchar(255)
public $secret; // varchar(255)
public $uri; // varchar(255)
public $created; // datetime() not_null
public $modified; // timestamp() not_null default_CURRENT_TIMESTAMP
@@ -138,6 +139,9 @@ class Subscription extends Memcached_DataObject
$sub->jabber = 1;
$sub->sms = 1;
$sub->created = common_sql_now();
$sub->uri = self::newURI($sub->subscriber,
$sub->subscribed,
$sub->created);
$result = $sub->insert();
@@ -238,10 +242,7 @@ class Subscription extends Memcached_DataObject
// XXX: rationalize this with the URL
$act->id = TagURI::mint('follow:%d:%d:%s',
$subscriber->id,
$subscribed->id,
common_date_iso8601($this->created));
$act->id = $this->getURI();
$act->time = strtotime($this->created);
// TRANS: Activity title when subscribing to another person.
@@ -404,4 +405,21 @@ class Subscription extends Memcached_DataObject
return $result;
}
function getURI()
{
if (!empty($this->uri)) {
return $this->uri;
} else {
return self::newURI($this->subscriber, $this->subscribed, $this->created);
}
}
static function newURI($subscriber_id, $subscribed_id, $created)
{
return TagURI::mint('follow:%d:%d:%s',
$subscriber_id,
$subscribed_id,
common_date_iso8601($created));
}
}