X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Friece-commands.el;h=7f9f654503b14cd6bb77b556b201bc71d5907055;hb=5fd1fc530e3aed912d077d115f54b55563497d8f;hp=ea07bd9466dc4464885f23a70fea39a9cb9897aa;hpb=9222fba22827675d278a7b3b91be4c1da371ef8f;p=elisp%2Friece.git

diff --git a/lisp/riece-commands.el b/lisp/riece-commands.el
index ea07bd9..7f9f654 100644
--- a/lisp/riece-commands.el
+++ b/lisp/riece-commands.el
@@ -38,7 +38,7 @@
 ;;; Channel movement:
 (defun riece-command-switch-to-channel (channel)
   (interactive
-   (list (completing-read "Channel/user: "
+   (list (completing-read "Channel/User: "
 			  (mapcar #'list riece-current-channels)
 			  nil t)))
   (riece-switch-to-channel channel)
@@ -72,31 +72,42 @@
 (defun riece-command-next-channel ()
   "Select the next channel."
   (interactive)
-  (let ((pointer (cdr (string-list-member-ignore-case
-		       riece-current-channel
-		       riece-current-channels))))
-    (while (and pointer
-		(null (car pointer)))
-      (setq pointer (cdr pointer)))
-    (if (car pointer)
-	(riece-command-switch-to-channel (car pointer))
-      (error "No such channel!"))))
+  (when (> (length riece-current-channels) 1)
+    (let ((pointer (cdr (riece-identity-member-no-server
+			 riece-current-channel
+			 riece-current-channels))))
+      (while (and pointer
+		  (null (car pointer)))
+	(setq pointer (cdr pointer)))
+      (when (null pointer)
+	(setq pointer riece-current-channels)
+	(while (and pointer
+		    (null (car pointer)))
+	  (setq pointer (cdr pointer))))
+      (if (car pointer)
+	  (riece-command-switch-to-channel (car pointer))
+	(error "No such channel!")))))
 
 (defun riece-command-previous-channel ()
   "Select the previous channel."
   (interactive)
-  (let ((pointer (string-list-member-ignore-case
-		  riece-current-channel
-		  riece-current-channels))
-	(start riece-current-channels)
-	channel)
-    (while (and start (not (eq start pointer)))
-      (if (car start)
-	  (setq channel (car start)))
-      (setq start (cdr start)))
-    (if channel
-	(riece-command-switch-to-channel channel)
-      (error "No such channel!"))))
+  (when (> (length riece-current-channels) 1)
+    (let ((pointer (riece-identity-member-no-server
+		    riece-current-channel
+		    riece-current-channels))
+	  (start riece-current-channels)
+	  channel)
+      (while (and start (not (eq start pointer)))
+	(setq channel (car start))
+	(setq start (cdr start)))
+      (when (null channel)
+	(setq start (copy-sequence riece-current-channels))
+	(setq start (delq nil start))
+	(and (> (length start) 1)
+	     (setq channel (nth (1- (length start)) start))))
+      (if channel
+	  (riece-command-switch-to-channel channel)
+	(error "No such channel!")))))
 
 (defun riece-command-select-command-buffer ()
   "Select the command buffer."
@@ -112,33 +123,24 @@
 (defun riece-command-toggle-channel-buffer-mode ()
   (interactive)
   (setq riece-channel-buffer-mode
-	(not riece-channel-buffer-mode))
+	(not riece-channel-buffer-mode)
+	riece-save-variables-are-dirty t)
   (riece-command-configure-windows))
 
 (defun riece-command-toggle-user-list-buffer-mode ()
   (interactive)
   (setq riece-user-list-buffer-mode
-	(not riece-user-list-buffer-mode))
+	(not riece-user-list-buffer-mode)
+	riece-save-variables-are-dirty t)
   (riece-command-configure-windows))
 
 (defun riece-command-toggle-channel-list-buffer-mode ()
   (interactive)
   (setq riece-channel-list-buffer-mode
-	(not riece-channel-list-buffer-mode))
+	(not riece-channel-list-buffer-mode)
+	riece-save-variables-are-dirty t)
   (riece-command-configure-windows))
 
-(defun riece-get-users-on-server ()
-  (riece-with-server-buffer
-   (let (users)
-     (mapatoms
-      (lambda (atom)
-	(unless (riece-channel-p (symbol-name atom))
-	  (push (symbol-name atom) users)))
-      riece-obarray)
-     (if (member riece-real-nickname users)
-	 users
-       (cons riece-real-nickname users)))))
-
 (defun riece-command-finger (user &optional recurse)
   (interactive
    (let* ((completion-ignore-case t)
@@ -161,25 +163,78 @@
 			     (riece-identity-prefix riece-current-channel)
 			     topic)))
 
-(defun riece-command-invite (&optional user channel)
+(defun riece-command-invite (user)
   (interactive
-   (let ((completion-ignore-case t)
-	 user channel)
-     (if current-prefix-arg
-	 (setq channel
-	       (completing-read
-		"Channel: "
-		(mapcar #'list riece-current-channels))))
+   (let ((completion-ignore-case t))
+     (unless (and riece-current-channel
+		  (riece-channel-p riece-current-channel))
+       (error "Not on a channel"))
      (list (completing-read
 	    "User: "
-	    (mapcar #'list (riece-get-users-on-server)))
-	   channel)))
-  (if channel
-      (riece-send-string (format "INVITE %s %s\r\n"
-				 user (riece-identity-prefix channel)))
-    (riece-send-string (format "INVITE %s %s\r\n"
-			       user (riece-identity-prefix
-				     riece-current-channel)))))
+	    (mapcar #'list (riece-get-users-on-server))))))
+  (riece-send-string (format "INVITE %s %s\r\n"
+			     user (riece-identity-prefix
+				   riece-current-channel))))
+
+(defun riece-command-kick (user &optional message)
+  (interactive
+   (let ((completion-ignore-case t))
+     (unless (and riece-current-channel
+		  (riece-channel-p riece-current-channel))
+       (error "Not on a channel"))
+     (list (completing-read
+	    "User: "
+	    (mapcar #'list (riece-channel-get-users
+			    riece-current-channel)))
+	   (if current-prefix-arg
+	       (read-string "Message: ")))))
+  (riece-send-string
+   (if message
+       (format "KICK %s %s :%s\r\n"
+	       (riece-identity-prefix riece-current-channel)
+	       user message)
+     (format "KICK %s %s\r\n"
+	     (riece-identity-prefix riece-current-channel)
+	     user))))
+
+(defun riece-command-names (pattern)
+  (interactive
+   (let ((completion-ignore-case t))
+     (list (read-from-minibuffer
+	    "Pattern: "
+	    (if (and riece-current-channel
+		     (riece-channel-p riece-current-channel))
+		(cons (riece-identity-prefix riece-current-channel)
+		      0))))))
+  (if (or (not (equal pattern ""))
+	  (yes-or-no-p "Really want to query NAMES without argument? "))
+      (riece-send-string (format "NAMES %s\r\n" pattern))))
+
+(defun riece-command-who (pattern)
+  (interactive
+   (let ((completion-ignore-case t))
+     (list (read-from-minibuffer
+	    "Pattern: "
+	    (if (and riece-current-channel
+		     (riece-channel-p riece-current-channel))
+		(cons (riece-identity-prefix riece-current-channel)
+		      0))))))
+  (if (or (not (equal pattern ""))
+	  (yes-or-no-p "Really want to query WHO without argument? "))
+      (riece-send-string (format "WHO %s\r\n" pattern))))
+
+(defun riece-command-list (pattern)
+  (interactive
+   (let ((completion-ignore-case t))
+     (list (read-from-minibuffer
+	    "Pattern: "
+	    (if (and riece-current-channel
+		     (riece-channel-p riece-current-channel))
+		(cons (riece-identity-prefix riece-current-channel)
+		      0))))))
+  (if (or (not (equal pattern ""))
+	  (yes-or-no-p "Really want to query LIST without argument? "))
+      (riece-send-string (format "LIST %s\r\n" pattern))))
 
 (defun riece-command-change-mode (channel change)
   (interactive
@@ -187,7 +242,7 @@
 	  (channel
 	   (if current-prefix-arg
 	       (completing-read
-		"Channel/user: "
+		"Channel/User: "
 		(mapcar #'list riece-current-channels))
 	     riece-current-channel))
 	  (riece-overriding-server-name (riece-identity-server channel))
@@ -226,7 +281,8 @@
      (list users current-prefix-arg)))
   (let (group)
     (while users
-      (push (pop users) group)
+      (setq group (cons (car users) group)
+	    users (cdr users))
       (if (or (= (length group) 3)
 	      (null users))
 	  (riece-send-string
@@ -257,7 +313,8 @@
      (list users current-prefix-arg)))
   (let (group)
     (while users
-      (push (pop users) group)
+      (setq group (cons (car users) group)
+	    users (cdr users))
       (if (or (= (length group) 3)
 	      (null users))
 	  (riece-send-string
@@ -269,25 +326,43 @@
 		   (make-string (length group) ?v)
 		   (mapconcat #'identity group " ")))))))
 
-(defun riece-command-send-message (message)
+(defun riece-command-send-message (message notice)
   "Send MESSAGE to the current channel."
   (if (equal message "")
       (error "No text to send"))
   (unless riece-current-channel
     (error (substitute-command-keys
 	    "Type \\[riece-command-join] to join a channel")))
-  (riece-send-string
-   (format "PRIVMSG %s :%s\r\n"
-	   (riece-identity-prefix riece-current-channel)
-	   message))
-  (riece-own-channel-message message))
+  (if notice
+      (progn
+	(riece-send-string
+	 (format "NOTICE %s :%s\r\n"
+		 (riece-identity-prefix riece-current-channel)
+		 message))
+	(riece-own-channel-message message riece-current-channel 'notice))
+    (riece-send-string
+     (format "PRIVMSG %s :%s\r\n"
+	     (riece-identity-prefix riece-current-channel)
+	     message))
+    (riece-own-channel-message message)))
 
 (defun riece-command-enter-message ()
   "Send the current line to the current channel."
   (interactive)
   (riece-command-send-message (buffer-substring
 			       (riece-line-beginning-position)
-			       (riece-line-end-position)))
+			       (riece-line-end-position))
+			      nil)
+  (let ((next-line-add-newlines t))
+    (next-line 1)))
+
+(defun riece-command-enter-message-as-notice ()
+  "Send the current line to the current channel as NOTICE."
+  (interactive)
+  (riece-command-send-message (buffer-substring
+			       (riece-line-beginning-position)
+			       (riece-line-end-position))
+			      t)
   (let ((next-line-add-newlines t))
     (next-line 1)))
 
@@ -309,7 +384,7 @@
 					 (riece-identity-prefix target))))))
 
 (defun riece-command-join-partner (target)
-  (let ((pointer (riece-identity-member target riece-current-channels)))
+  (let ((pointer (riece-identity-member-safe target riece-current-channels)))
     (if pointer
 	(riece-command-switch-to-channel (car pointer))
       (riece-join-channel target)
@@ -320,7 +395,7 @@
   (interactive
    (let ((completion-ignore-case t)
 	 (target
-	  (completing-read "Channel/user: "
+	  (completing-read "Channel/User: "
 			   (mapcar #'list riece-current-channels)))
 	 key)
      (if (and current-prefix-arg
@@ -328,7 +403,7 @@
 	 (setq key
 	       (riece-read-passwd (format "Key for %s: " target))))
      (list target key)))
-  (let ((pointer (riece-identity-member target riece-current-channels)))
+  (let ((pointer (riece-identity-member-safe target riece-current-channels)))
     (if pointer
 	(riece-command-switch-to-channel (car pointer))
       (if (riece-channel-p target)
@@ -356,7 +431,7 @@
   (interactive
    (let ((completion-ignore-case t)
 	 (target
-	  (completing-read "Channel/user: "
+	  (completing-read "Channel/User: "
 			   (mapcar #'list riece-current-channels)
 			   nil t (cons riece-current-channel 0)))
 	 message)
@@ -364,7 +439,7 @@
 	      (riece-channel-p target))
 	 (setq message (read-string "Message: ")))
      (list target message)))
-  (if (riece-identity-member target riece-current-channels)
+  (if (riece-identity-member-safe target riece-current-channels)
       (if (riece-channel-p target)
 	  (riece-command-part-channel target message)
 	(riece-part-channel target)
@@ -425,7 +500,9 @@
 (defun riece-command-toggle-away (&optional message)
   "Mark yourself as being away."
   (interactive
-   (if current-prefix-arg
+   (if (and (not (riece-user-get-away (riece-current-nickname)))
+	    (or (null riece-away-message)
+		current-prefix-arg))
        (let ((message (read-string "Away message: ")))
 	 (list message))))
   (if message
@@ -436,20 +513,32 @@
   "Prevent automatic scrolling of the dialogue window.
 If prefix argument ARG is non-nil, toggle frozen status."
   (interactive "P")
-  (riece-freeze (if riece-channel-buffer-mode
-		    riece-channel-buffer
-		  riece-dialogue-buffer)
-		(if arg (prefix-numeric-value arg))))
+  (with-current-buffer (if (and riece-channel-buffer-mode
+				riece-channel-buffer)
+			   riece-channel-buffer
+			 riece-dialogue-buffer)
+    (setq riece-freeze (if arg
+			   (< 0 (prefix-numeric-value arg))
+			 (not riece-freeze))))
+  (riece-update-status-indicators)
+  (force-mode-line-update t))
 
 (defun riece-command-toggle-own-freeze (&optional arg)
   "Prevent automatic scrolling of the dialogue window.
 The difference from `riece-command-freeze' is that your messages are hidden.
 If prefix argument ARG is non-nil, toggle frozen status."
   (interactive "P")
-  (riece-own-freeze (if riece-channel-buffer-mode
-			riece-channel-buffer
-		      riece-dialogue-buffer)
-		    (if arg (prefix-numeric-value arg))))
+  (with-current-buffer (if (and riece-channel-buffer-mode
+				riece-channel-buffer)
+			   riece-channel-buffer
+			 riece-dialogue-buffer)
+    (if (if arg
+	    (< 0 (prefix-numeric-value arg))
+	  (not (eq riece-freeze 'own)))
+	(setq riece-freeze 'own)
+      (setq riece-freeze nil)))
+  (riece-update-status-indicators)
+  (force-mode-line-update t))
 
 (defun riece-command-quit (&optional arg)
   "Quit IRC."
@@ -490,12 +579,11 @@ If prefix argument ARG is non-nil, toggle frozen status."
 (defun riece-command-open-server (server-name)
   (interactive
    (list (completing-read "Server: " riece-server-alist)))
-  (let ((process (riece-start-server
-		  (riece-server-name-to-server server-name)
-		  server-name)))
-    (with-current-buffer (process-buffer process)
-      (setq riece-server-name server-name))
-    (push (cons server-name process) riece-server-process-alist)))
+  (if (assoc server-name riece-server-process-alist)
+      (error "%s is already opened" server-name)
+    (riece-open-server
+     (riece-server-name-to-server server-name)
+     server-name)))
 
 (defun riece-command-close-server (server-name &optional message)
   (interactive