We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit 269d567d authored by Evan Prodromou's avatar Evan Prodromou

use Subscription::start() for remote subscribes

parent daea9887
...@@ -299,18 +299,9 @@ class Ostatus_profile extends Memcached_DataObject ...@@ -299,18 +299,9 @@ class Ostatus_profile extends Memcached_DataObject
throw new ServerException("Remote groups can't subscribe to local users"); throw new ServerException("Remote groups can't subscribe to local users");
} }
// @fixme use regular channels for subbing, once they accept remote profiles Subscription::start($this->localProfile(), $user->getProfile());
$sub = new Subscription();
$sub->subscriber = $this->profile_id; return true;
$sub->subscribed = $user->id;
$sub->created = common_sql_now(); // current time
if ($sub->insert()) {
// @fixme use subs_notify() if refactored to take profiles?
mail_subscribe_notify_profile($user, $this->localProfile());
return true;
}
return false;
} }
/** /**
...@@ -1127,7 +1118,6 @@ class Ostatus_profile extends Memcached_DataObject ...@@ -1127,7 +1118,6 @@ class Ostatus_profile extends Memcached_DataObject
} }
} }
protected static function getActivityObjectNickname($object, $hints=array()) protected static function getActivityObjectNickname($object, $hints=array())
{ {
if ($object->poco) { if ($object->poco) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment