Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing

[quix0rs-gnu-social.git] / lib / subs.php

diff --git a/lib/subs.php b/lib/subs.php
index a2699f7b998935caf6fb04737fad7b7db2c84504..1c240c475d40c7f71fd428de44eec07499dc3baa 100644 (file)
--- a/lib/subs.php
+++ b/lib/subs.php
@@ -1,7 +1,7 @@
 <?php
 /*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -17,124 +17,29 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
-
-require_once('XMPPHP/XMPP.php');
-
-/* Subscribe $user to nickname $other_nickname
-  Returns true or an error message.
-*/
-
-function subs_subscribe_user($user, $other_nickname) {
-
-       $other = User::staticGet('nickname', $other_nickname);
-
-       if (!$other) {
-               return _('No such user.');
-       }
-
-       return subs_subscribe_to($user, $other);
-}
+if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 
 /* Subscribe user $user to other user $other.
  * Note: $other must be a local user, not a remote profile.
  * Because the other way is quite a bit more complicated.
  */
 
-function subs_subscribe_to($user, $other) {
-
-       if ($user->isSubscribed($other)) {
-               return _('Already subscribed!');
-       }
-
-    if ($other->hasBlocked($user)) {
-               return _('User has blocked you.');
+function subs_subscribe_to($user, $other)
+{
+    try {
+        Subscription::start($user->getProfile(), $other);
+        return true;
+    } catch (Exception $e) {
+        return $e->getMessage();
     }
-
-       if (!$user->subscribeTo($other)) {
-               return _('Could not subscribe.');
-               return;
-       }
-
-    subs_notify($other, $user);
-
-       if (common_config('memcached', 'enabled')) {
-               $cache = new Memcache();
-               if ($cache->connect(common_config('memcached', 'server'), common_config('memcached', 'port'))) {
-                       $cache->delete(common_cache_key('user:notices_with_friends:' . $user->id));
-               }
-       }
-
-       if ($other->autosubscribe && !$other->isSubscribed($user) && !$user->hasBlocked($other)) {
-               if (!$other->subscribeTo($user)) {
-                       return _('Could not subscribe other to you.');
-               }
-               if (common_config('memcached', 'enabled')) {
-                       $cache = new Memcache();
-                       if ($cache->connect(common_config('memcached', 'server'), common_config('memcached', 'port'))) {
-                               $cache->delete(common_cache_key('user:notices_with_friends:' . $other->id));
-                       }
-               }
-
-               subs_notify($user, $other);
-       }
-
-       return true;
-}
-
-function subs_notify($listenee, $listener) {
-       # XXX: add other notifications (Jabber, SMS) here
-       # XXX: queue this and handle it offline
-       # XXX: Whatever happens, do it in Twitter-like API, too
-       subs_notify_email($listenee, $listener);
-}
-
-function subs_notify_email($listenee, $listener) {
-       mail_subscribe_notify($listenee, $listener);
-}
-
-/* Unsubscribe $user from nickname $other_nickname
-  Returns true or an error message.
-*/
-
-function subs_unsubscribe_user($user, $other_nickname) {
-
-       $other = User::staticGet('nickname', $other_nickname);
-
-       if (!$other) {
-               return _('No such user.');
-       }
-
-       return subs_unsubscribe_to($user, $other->getProfile());
-}
-
-/* Unsubscribe user $user from profile $other
- * NB: other can be a remote user. */
-
-function subs_unsubscribe_to($user, $other) {
-
-       if (!$user->isSubscribed($other))
-               return _('Not subscribed!');
-
-       $sub = DB_DataObject::factory('subscription');
-
-       $sub->subscriber = $user->id;
-       $sub->subscribed = $other->id;
-
-       $sub->find(true);
-
-       // note we checked for existence above
-
-       if (!$sub->delete())
-               return _('Couldn\'t delete subscription.');
-
-       if (common_config('memcached', 'enabled')) {
-               $cache = new Memcache();
-               if ($cache->connect(common_config('memcached', 'server'), common_config('memcached', 'port'))) {
-                       $cache->delete(common_cache_key('user:notices_with_friends:' . $user->id));
-               }
-       }
-
-       return true;
 }
 
+function subs_unsubscribe_to($user, $other)
+{
+    try {
+        Subscription::cancel($user->getProfile(), $other);
+        return true;
+    } catch (Exception $e) {
+        return $e->getMessage();
+    }
+}
\ No newline at end of file