From ac60342e8924c5847b76139ac740f90520e92be9 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@prodromou.name>
Date: Mon, 22 Sep 2008 18:50:31 -0400
Subject: merge CiaranG's changes for subs

darcs-hash:20080922225031-84dde-c6967f46ae642f8943b0de77d9a82892ecadb4ce.gz
---
 actions/subscribe.php | 39 ++++-----------------------------------
 1 file changed, 4 insertions(+), 35 deletions(-)

(limited to 'actions/subscribe.php')

diff --git a/actions/subscribe.php b/actions/subscribe.php
index b93c06f12..20c258923 100644
--- a/actions/subscribe.php
+++ b/actions/subscribe.php
@@ -47,45 +47,14 @@ class SubscribeAction extends Action {
 
 		$other_nickname = $this->arg('subscribeto');
 
-		$other = User::staticGet('nickname', $other_nickname);
-
-		if (!$other) {
-			common_user_error(_('No such user.'));
-			return;
-		}
-
-		if ($user->isSubscribed($other)) {
-			common_user_error(_('Already subscribed!.'));
-			return;
-		}
-
-		if (!$user->subscribeTo($other)) {
-			$this->server_error(_('Could not subscribe.'));
+		$result=subs_subscribe_user($user, $other_nickname);
+		
+		if($result != true) {
+			common_user_error($result);
 			return;
 		}
-
-		$this->notify($other, $user);
-
-		if ($other->autosubscribe && !$other->isSubscribed($user)) {
-			if (!$other->subscribeTo($user)) {
-				$this->server_error(_('Could not subscribe other to you.'));
-				return;
-			}
-			$this->notify($user, $other);
-		}
 		
 		common_redirect(common_local_url('subscriptions', array('nickname' =>
 																$user->nickname)));
 	}
-
-	function 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
-		$this->notify_email($listenee, $listener);
-	}
-
-	function notify_email($listenee, $listener) {
-		mail_subscribe_notify($listenee, $listener);
-	}
 }
\ No newline at end of file
-- 
cgit v1.2.3-54-g00ecf