X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Friece-300.el;h=8510941521bf0b8b6b982541c7589e080ca40f3e;hb=3ee8a4af3c8254994a95ffac8926af4e7b32f8bd;hp=52f7eba4c933c075a9e39a76be3682ecd7d31a4a;hpb=78ac843e1969cc20beb6ad959d207e5ec7cea499;p=riece

diff --git a/lisp/riece-300.el b/lisp/riece-300.el
index 52f7eba..8510941 100644
--- a/lisp/riece-300.el
+++ b/lisp/riece-300.el
@@ -25,6 +25,9 @@
 ;;; Code:
 
 (require 'riece-misc)
+(require 'riece-naming)
+(require 'riece-signal)
+(require 'riece-display)
 
 (eval-when-compile
   (autoload 'riece-default-handle-numeric-reply "riece-handle"))
@@ -40,8 +43,7 @@
 			       " ")))
     (while replies
       (if (string-match
-	   (concat "^\\(" riece-user-regexp
-		   "\\)\\(\\*\\)?=\\([-+]\\)\\([^ ]+\\)")
+	   (concat "^\\([^ ]+\\)\\(\\*\\)?=\\([-+]\\)\\([^ ]+\\)")
 	   (car replies))
 	  (let ((user (match-string 1 (car replies)))
 		(operator (not (null (match-beginning 2))))
@@ -93,7 +95,7 @@
     "\n")))
 
 (defun riece-handle-301-message (prefix number name string)
-  (if (string-match (concat "^\\(" riece-user-regexp "\\) :?") string)
+  (if (string-match (concat "^\\([^ ]+\\) :?") string)
       (let ((user (match-string 1 string))
 	    (message (substring string (match-end 0))))
 	(riece-user-toggle-away user t)
@@ -127,8 +129,7 @@
 
 (defun riece-handle-311-message (prefix number name string)
   (if (string-match
-       (concat "^\\(" riece-user-regexp
-	       "\\) \\([^ ]+\\) \\([^ ]+\\) \\* :?")
+       (concat "^\\([^ ]+\\) \\([^ ]+\\) \\([^ ]+\\) \\* :?")
        string)
       (let ((user (match-string 1 string))
 	    (name (substring string (match-end 0)))
@@ -148,7 +149,7 @@
 
 (defun riece-handle-312-message (prefix number name string)
   (if (string-match
-       (concat "^\\(" riece-user-regexp "\\) \\([^ ]+\\) :?")
+       (concat "^\\([^ ]+\\) \\([^ ]+\\) :?")
        string)
       (riece-insert-info
        (list riece-dialogue-buffer riece-others-buffer)
@@ -160,7 +161,7 @@
 	"\n"))))
 
 (defun riece-handle-313-message (prefix number name string)
-  (if (string-match (concat "^" riece-user-regexp) string)
+  (if (string-match "^[^ ]+" string)
       (let ((user (match-string 0 string)))
 	(riece-insert-info
 	 (list riece-dialogue-buffer riece-others-buffer)
@@ -174,7 +175,7 @@
 
 (defun riece-handle-317-message (prefix number name string)
   (if (string-match
-       (concat "^\\(" riece-user-regexp "\\) \\([0-9]+\\) ")
+       (concat "^\\([^ ]+\\) \\([0-9]+\\) ")
        string)
       (let* ((user (match-string 1 string))
 	     (seconds (string-to-number (match-string 2 string)))
@@ -198,11 +199,11 @@
 					   (format "%d %s"
 						   (car unit) (cdr unit))))
 				     units))
-			      ", ")))
+			      " ")))
 	  "\n")))))
 
 (defun riece-handle-319-message (prefix number name string)
-  (if (string-match (concat "^\\(" riece-user-regexp "\\) :?") string)
+  (if (string-match (concat "^\\([^ ]+\\) :?") string)
       (let ((user (match-string 1 string))
 	    (channels
 	     (mapconcat
@@ -256,27 +257,29 @@
 		(cons (cons channel (substring string (match-end 0)))
 		      riece-353-message-alist))))))
 
-(defun riece-handle-322-message (prefix number name string)
-  (if (string-match "^\\([^ ]+\\) \\([0-9]+\\) :?" string)
-      (let* ((channel (match-string 1 string))
-	     (visible (match-string 2 string))
-	     (topic (substring string (match-end 0))))
-	(riece-channel-set-topic (riece-get-channel channel) topic)
-	(let* ((channel-identity (riece-make-identity channel
-						      riece-server-name))
-	       (buffer (riece-channel-buffer channel-identity)))
-	  (riece-insert-info buffer (concat visible " users, topic: "
-					    topic "\n"))
-	  (riece-insert-info
-	   (if (and riece-channel-buffer-mode
-		    (not (eq buffer riece-channel-buffer)))
-	       (list riece-dialogue-buffer riece-others-buffer)
-	     riece-dialogue-buffer)
-	   (concat
-	    (riece-concat-server-name
-	     (format "%s: %s users, topic: %s"
-		     (riece-format-identity channel-identity t) visible topic))
-	    "\n"))))))
+(defun riece-handle-322-message (prefix number name decoded)
+  (let* ((parameters (riece-split-parameters (riece-decoded-string decoded)))
+	 (channel (car parameters))
+	 (visible (nth 1 parameters))
+	 (channel-identity (riece-make-identity channel riece-server-name))
+	 (buffer (riece-channel-buffer channel-identity))
+	 topic)
+    (setq parameters (riece-split-parameters
+		      (riece-decoded-string-for-identity decoded
+							 channel-identity))
+	  topic (nth 2 parameters))
+    (riece-channel-set-topic (riece-get-channel channel) topic)
+    (riece-insert-info buffer (concat visible " users, topic: " topic "\n"))
+    (riece-insert-info
+     (if (and riece-channel-buffer-mode
+	      (not (eq buffer riece-channel-buffer)))
+	 (list riece-dialogue-buffer riece-others-buffer)
+       riece-dialogue-buffer)
+     (concat
+      (riece-concat-server-name
+       (format "%s: %s users, topic: %s"
+	       (riece-format-identity channel-identity t) visible topic))
+      "\n"))))
 
 (defun riece-handle-324-message (prefix number name string)
   (if (string-match "^\\([^ ]+\\) \\([^ ]+\\) " string)
@@ -300,31 +303,32 @@
 		     mode-string))
 	    "\n"))))))
 
-(defun riece-handle-set-topic (prefix number name string remove)
-  (if (string-match "^\\([^ ]+\\) :?" string)
-      (let* ((channel (match-string 1 string))
-	     (message (substring string (match-end 0)))
-	     (channel-identity (riece-make-identity channel riece-server-name))
-	     (buffer (riece-channel-buffer channel-identity)))
-	(if remove
-	    (riece-channel-set-topic (riece-get-channel channel) nil)
-	  (riece-channel-set-topic (riece-get-channel channel) message)
-	  (riece-insert-info buffer (concat "Topic: " message "\n"))
-	  (riece-insert-info
-	   (if (and riece-channel-buffer-mode
-		    (not (eq buffer riece-channel-buffer)))
-	       (list riece-dialogue-buffer riece-others-buffer)
-	     riece-dialogue-buffer)
-	   (concat
-	    (riece-concat-server-name
-	     (format "Topic for %s: %s"
-		     (riece-format-identity channel-identity t)
-		     message))
-	    "\n")))
-	(riece-emit-signal 'channel-topic-changed
-			    channel-identity
-			    (unless remove
-			      message)))))
+(defun riece-handle-set-topic (prefix number name decoded remove)
+  (let* ((parameters (riece-split-parameters (riece-decoded-string decoded)))
+	 (channel (car parameters))
+	 topic
+	 (channel-identity (riece-make-identity channel riece-server-name))
+	 (buffer (riece-channel-buffer channel-identity)))
+    (if remove
+	(riece-channel-set-topic (riece-get-channel channel) nil)
+      (setq parameters (riece-split-parameters
+			(riece-decoded-string-for-identity decoded
+							   channel-identity))
+	    topic (nth 1 parameters))
+      (riece-channel-set-topic (riece-get-channel channel) topic)
+      (riece-insert-info buffer (concat "Topic: " topic "\n"))
+      (riece-insert-info
+       (if (and riece-channel-buffer-mode
+		(not (eq buffer riece-channel-buffer)))
+	   (list riece-dialogue-buffer riece-others-buffer)
+	 riece-dialogue-buffer)
+       (concat
+	(riece-concat-server-name
+	 (format "Topic for %s: %s"
+		 (riece-format-identity channel-identity t)
+		 topic))
+	"\n")))
+    (riece-emit-signal 'channel-topic-changed channel-identity topic)))
 
 (defun riece-handle-331-message (prefix number name string)
   (riece-handle-set-topic prefix number name string t))
@@ -434,7 +438,7 @@
 	    (setq riece-353-message-alist
 		  (delq entry riece-353-message-alist)))
 	(while (string-match
-		(concat "\\([@+]\\)?\\(" riece-user-regexp "\\) *")
+		(concat "\\([@+]\\)?\\([^ ]+\\) *")
 		string start)
 	  (put-text-property (match-beginning 2) (match-end 2)
 			     'riece-identity