X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fsubs.php;h=6fa1dcad3bbba5e07ce01e0a4595c5d11ea4a20e;hb=7c9f3b61b47b4f82023360379977ecb231739a25;hp=51ae54059f8dda989a8e6ceeffc14b1900760390;hpb=c2839a80f00991fa4fe6ec3d3fd654bcc27840f4;p=quix0rs-gnu-social.git

diff --git a/lib/subs.php b/lib/subs.php
index 51ae54059f..6fa1dcad3b 100644
--- a/lib/subs.php
+++ b/lib/subs.php
@@ -25,103 +25,122 @@ require_once('XMPPHP/XMPP.php');
   Returns true or an error message.
 */
 
-function subs_subscribe_user($user,$other_nickname) {
+function subs_subscribe_user($user, $other_nickname)
+{
 
-	$other = User::staticGet('nickname', $other_nickname);
+    $other = User::staticGet('nickname', $other_nickname);
 
-	if (!$other) {
-		return _('No such user.');
-	}
+    if (!$other) {
+        return _('No such user.');
+    }
 
-	return subs_subscribe_to($user, $other);
+    return subs_subscribe_to($user, $other);
 }
 
-function subs_subscribe_to($user, $other) {
-
-	if ($user->isSubscribed($other)) {
-		return _('Already subscribed!.');
-	}
-
-	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)) {
-		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;
+/* 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.');
+    }
+
+    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($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);
+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);
+function subs_unsubscribe_user($user, $other_nickname)
+{
+
+    $other = User::staticGet('nickname', $other_nickname);
 
-	if (!$other) {
-		return _('No such user.');
-	}
+    if (!$other) {
+        return _('No such user.');
+    }
 
-	return subs_unsubscribe_to($user, $other);
+    return subs_unsubscribe_to($user, $other->getProfile());
 }
 
-function subs_unsubscribe_to($user, $other) {
+/* 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!.');
 
-	if (!$user->isSubscribed($other))
-		return _('Not subscribed!.');
+    $sub = DB_DataObject::factory('subscription');
 
-	$sub = DB_DataObject::factory('subscription');
+    $sub->subscriber = $user->id;
+    $sub->subscribed = $other->id;
 
-	$sub->subscriber = $user->id;
-	$sub->subscribed = $other->id;
+    $sub->find(true);
 
-	$sub->find(true);
+    // note we checked for existence above
 
-	// note we checked for existence above
+    if (!$sub->delete())
+        return _('Couldn\'t delete subscription.');
 
-	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));
+        }
+    }
 
-	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;
+    return true;
 }