From 92645bbc578fafeb6816a44b8cf9cd594ffb5bd7 Mon Sep 17 00:00:00 2001
From: CiaranG <ciaran@ciarang.com>
Date: Fri, 22 Aug 2008 15:10:32 -0400
Subject: XMPP sub/unsub and help commands

darcs-hash:20080822191032-f6e2c-a3a7efbbaad1ec7c48ef132a8ba34fc8b8651969.gz
---
 actions/subscribe.php   | 37 +++----------------------------------
 actions/unsubscribe.php | 24 +++---------------------
 2 files changed, 6 insertions(+), 55 deletions(-)

(limited to 'actions')

diff --git a/actions/subscribe.php b/actions/subscribe.php
index e292fdd6b..71452e46c 100644
--- a/actions/subscribe.php
+++ b/actions/subscribe.php
@@ -38,45 +38,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
diff --git a/actions/unsubscribe.php b/actions/unsubscribe.php
index 3863a3a5e..5814c37bd 100644
--- a/actions/unsubscribe.php
+++ b/actions/unsubscribe.php
@@ -34,27 +34,9 @@ class UnsubscribeAction extends Action {
 		}
 
 		$other_nickname = $this->arg('unsubscribeto');
-		$other = User::staticGet('nickname', $other_nickname);
-		if (!$other) {
-			common_user_error(_('No such user.'));
-			return;
-		}
-
-		if (!$user->isSubscribed($other)) {
-			common_server_error(_('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()) {
-			common_server_error(_('Couldn\'t delete subscription.'));
+		$result=subs_unsubscribe_user($user,$other_nickname);
+		if($result!=true) {
+			common_user_error($result);
 			return;
 		}
 
-- 
cgit v1.2.3-54-g00ecf