better notices on commands and errors

darcs-hash:20080704201716-84dde-97709a82225bf5a972d9462f692eff1675d50ceb.gz

1 files changed, 10 insertions, 2 deletions

diff --git a/xmppdaemon.php b/xmppdaemon.php
index fc9d67d2e..a6e046579 100755
--- a/xmppdaemon.php
+++ b/xmppdaemon.php
@@ -85,8 +85,6 @@ class XMPPDaemon {
 					break;
 				}
 			}
-			# Flush DB_DataObject cache so we get fresh info
-			$GLOBALS['_DB_DATAOBJECT']['CACHE'] = array();
 		}
 	}
 
@@ -118,6 +116,9 @@ class XMPPDaemon {
 		$user = $this->get_user($from);
 
 		if (!$user) {
+			$this->from_site($from, 'Unknown user; go to ' . 
+							 common_local_url('imsettings') .
+							 ' to add your address to your account');
 			$this->log(LOG_WARNING, 'Message from unknown user ' . $from);
 			return;
 		}
@@ -128,14 +129,21 @@ class XMPPDaemon {
 		}
 	}
 
+	function from_site($address, $msg) {
+		$text = '['.common_config('site', 'name') . '] ' . $msg;
+		jabber_send_message($address, $text);
+	}
+	
 	function handle_command($user, $body) {
 		# XXX: localise
 		switch(trim($body)) {
 		 case 'on':
 			$this->set_notify($user, true);
+			$this->from_site($user->jabber, 'notifications on');
 			return true;
 		 case 'off':
 			$this->set_notify($user, false);
+			$this->from_site($user->jabber, 'notifications off');
 			return true;
 		 default:
 			return false;