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 ++++-----------------------------------
 actions/unsubscribe.php | 24 +++---------------------
 lib/common.php          |  1 +
 scripts/xmppdaemon.php  | 43 +++++++++++++++++++++++++++++++++++++++++--
 4 files changed, 49 insertions(+), 58 deletions(-)

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
diff --git a/actions/unsubscribe.php b/actions/unsubscribe.php
index 570c1700a..4bfaf7958 100644
--- a/actions/unsubscribe.php
+++ b/actions/unsubscribe.php
@@ -43,27 +43,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;
 		}
 
diff --git a/lib/common.php b/lib/common.php
index e37e330ea..b892d2c15 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -133,6 +133,7 @@ require_once(INSTALLDIR.'/lib/util.php');
 require_once(INSTALLDIR.'/lib/action.php');
 require_once(INSTALLDIR.'/lib/theme.php');
 require_once(INSTALLDIR.'/lib/mail.php');
+require_once(INSTALLDIR.'/lib/subs.php');
 
 function __autoload($class) {
 	if ($class == 'OAuthRequest') {
diff --git a/scripts/xmppdaemon.php b/scripts/xmppdaemon.php
index 8c2e6c168..afea72de9 100755
--- a/scripts/xmppdaemon.php
+++ b/scripts/xmppdaemon.php
@@ -138,6 +138,11 @@ class XMPPDaemon extends Daemon {
 			$this->log(LOG_INFO, 'Ignoring OTR from ' . $from);
 			return;
 		} else {
+			$len = mb_strlen($pl['body']);
+			if($len > 140) {
+				$this->from_site($from, 'Message too long - maximum is 140 characters, you sent ' . $len);
+				return;
+			}
 			$this->add_notice($user, $pl);
 		}
 		
@@ -206,15 +211,49 @@ class XMPPDaemon extends Daemon {
 
 	function handle_command($user, $body) {
 		# XXX: localise
-		switch(trim($body)) {
+		$p=explode(' ',$body);
+		if(count($p)>2)
+			return false;
+		switch($p[0]) {
+		 case 'help':
+		 	if(count($p)!=1)
+		 		return false;
+		 	$this->from_site($user->jabber, "Commands:\n on     - turn on notifications\n off    - turn off notifications\n help   - show this help \n sub - subscribe to user\n unsubscribe - unsub from user");
+		 	return true;
 		 case 'on':
+		 	if(count($p)!=1)
+		 		return false;
 			$this->set_notify($user, true);
 			$this->from_site($user->jabber, 'notifications on');
 			return true;
 		 case 'off':
+		 	if(count($p)!=1)
+		 		return false;
 			$this->set_notify($user, false);
 			$this->from_site($user->jabber, 'notifications off');
 			return true;
+		 case 'sub':
+		 	if(count($p)==1) {
+		 		$this->from_site($user->jabber, 'Specify the name of the user to subscribe to');
+		 		return true;
+		 	}
+		 	$result=subs_subscribe_user($user, $p[1]);
+		 	if($result=='true')
+		 		$this->from_site($user->jabber, 'Subscribed to ' . $p[1]);
+		 	else
+		 		$this->from_site($user->jabber, $result);
+		 	return true;
+		 case 'unsub':
+		 	if(count($p)==1) {
+		 		$this->from_site($user->jabber, 'Specify the name of the user to unsubscribe from');
+		 		return true;
+		 	}
+		 	$result=subs_unsubscribe_user($user, $p[1]);
+		 	if($result=='true')
+		 		$this->from_site($user->jabber, 'Unsubscribed from ' . $p[1]);
+		 	else
+		 		$this->from_site($user->jabber, $result);
+		 	return true;
 		 default:
 			return false;
 		}
@@ -224,7 +263,7 @@ class XMPPDaemon extends Daemon {
 		$orig = clone($user);
 		$user->jabbernotify = $notify;
 		$result = $user->update($orig);
-		if (!$id) {
+		if (!$result) {
 			$last_error = &PEAR::getStaticProperty('DB_DataObject','lastError');
 			$this->log(LOG_ERR,
 					   'Could not set notify flag to ' . $notify .
-- 
cgit v1.2.3