summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-02-24 15:20:06 -0500
committerEvan Prodromou <evan@status.net>2010-02-24 15:20:06 -0500
commit269d567d9440e3c943f67aad428efce9d112385c (patch)
treefcc09439cf1a86c398337fc0bcbb1b499031a3d6 /plugins
parentdaea98878692cadc9406be16fe2e15a419add3c4 (diff)
use Subscription::start() for remote subscribes
Diffstat (limited to 'plugins')
-rw-r--r--plugins/OStatus/classes/Ostatus_profile.php16
1 files changed, 3 insertions, 13 deletions
diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php
index 9f9efb96e..e8ab06522 100644
--- a/plugins/OStatus/classes/Ostatus_profile.php
+++ b/plugins/OStatus/classes/Ostatus_profile.php
@@ -299,18 +299,9 @@ class Ostatus_profile extends Memcached_DataObject
throw new ServerException("Remote groups can't subscribe to local users");
}
- // @fixme use regular channels for subbing, once they accept remote profiles
- $sub = new Subscription();
- $sub->subscriber = $this->profile_id;
- $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;
+ Subscription::start($this->localProfile(), $user->getProfile());
+
+ return true;
}
/**
@@ -1127,7 +1118,6 @@ class Ostatus_profile extends Memcached_DataObject
}
}
-
protected static function getActivityObjectNickname($object, $hints=array())
{
if ($object->poco) {