XMPP daemon updates including help, sub and subsub commands, plus subscribe/unsubcribe logic broken out into standalone module for sharing

darcs-hash:20080816083422-f6e2c-fb8b4e0581719bd8c3f433e661ec9742e1b84cbc.gz

1 files changed, 21 insertions, 3 deletions

diff --git a/actions/unsubscribe.php b/actions/unsubscribe.php
index 4bfaf7958..570c1700a 100644
--- a/actions/unsubscribe.php
+++ b/actions/unsubscribe.php
@@ -43,9 +43,27 @@ class UnsubscribeAction extends Action {
 		}
 
 		$other_nickname = $this->arg('unsubscribeto');
-		$result=subs_unsubscribe_user($user,$other_nickname);
-		if($result!=true) {
-			common_user_error($result);
+		$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.'));
 			return;
 		}