* riece-commands.el (riece-command-topic): Use

riece-check-channel-commands-are-usable.
(riece-command-invite): Ditto.
(riece-command-kick): Ditto.
(riece-command-change-mode): Ditto.
(riece-command-set-operators): Ditto.
(riece-command-set-speakers): Ditto.
(riece-command-send-message): Ditto.
(riece-command-part): Ditto.

* riece-misc.el (riece-get-users-on-server): If
riece-current-channel is not set, check the default server.
(riece-check-channel-commands-are-usable): New function.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1e062b5..4dad3ce 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,19 @@
 2003-10-18  Daiki Ueno  <ueno@unixuser.org>
 
+       * riece-commands.el (riece-command-topic): Use
+       riece-check-channel-commands-are-usable.
+       (riece-command-invite): Ditto.
+       (riece-command-kick): Ditto.
+       (riece-command-change-mode): Ditto.
+       (riece-command-set-operators): Ditto.
+       (riece-command-set-speakers): Ditto.
+       (riece-command-send-message): Ditto.
+       (riece-command-part): Ditto.
+
+       * riece-misc.el (riece-get-users-on-server): If
+       riece-current-channel is not set, check the default server.
+       (riece-check-channel-commands-are-usable): New function.
+
        * riece-globals.el (riece-channel-regexp): Accept channel names
        beginning with "!!".
 

diff --git a/lisp/riece-commands.el b/lisp/riece-commands.el
index caaff59..c5c463b 100644 (file)
--- a/lisp/riece-commands.el
+++ b/lisp/riece-commands.el
@@ -154,6 +154,7 @@ the layout to the selected layout-name."
 
 (defun riece-command-topic (topic)
   (interactive
+   (riece-check-channel-commands-are-usable t)
    (list (read-from-minibuffer
          "Topic: " (cons (or (riece-with-server-buffer
                                  (riece-identity-server riece-current-channel)
@@ -168,11 +169,8 @@ the layout to the selected layout-name."
 
 (defun riece-command-invite (user)
   (interactive
+   (riece-check-channel-commands-are-usable t)
    (let ((completion-ignore-case t))
-     (unless (and riece-current-channel
-                 (riece-channel-p (riece-identity-prefix
-                                   riece-current-channel)))
-       (error "Not on a channel"))
      (list (completing-read
            "User: "
            (mapcar #'list (riece-get-users-on-server))))))
@@ -182,11 +180,8 @@ the layout to the selected layout-name."
 
 (defun riece-command-kick (user &optional message)
   (interactive
+   (riece-check-channel-commands-are-usable t)
    (let ((completion-ignore-case t))
-     (unless (and riece-current-channel
-                 (riece-channel-p (riece-identity-prefix
-                                   riece-current-channel)))
-       (error "Not on a channel"))
      (list (completing-read
            "User: "
            (mapcar #'list
@@ -254,6 +249,7 @@ the layout to the selected layout-name."
           (if current-prefix-arg
               (riece-completing-read-identity
                "Channel/User: " riece-current-channels)
+            (riece-check-channel-commands-are-usable t)
             riece-current-channel))
          (riece-overriding-server-name (riece-identity-server channel))
          (riece-temp-minibuffer-message
@@ -275,6 +271,7 @@ the layout to the selected layout-name."
 
 (defun riece-command-set-operators (users &optional arg)
   (interactive
+   (riece-check-channel-commands-are-usable t)
    (let ((operators
          (riece-with-server-buffer
              (riece-identity-server riece-current-channel)
@@ -316,6 +313,7 @@ the layout to the selected layout-name."
 
 (defun riece-command-set-speakers (users &optional arg)
   (interactive
+   (riece-check-channel-commands-are-usable t)
    (let ((speakers
          (riece-with-server-buffer
              (riece-identity-server riece-current-channel)
@@ -359,9 +357,7 @@ the layout to the selected layout-name."
   "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-check-channel-commands-are-usable)
   (if notice
       (progn
        (riece-send-string
@@ -448,9 +444,6 @@ the layout to the selected layout-name."
 
 (defun riece-command-part-channel (target message)
   (let ((process (riece-server-process (riece-identity-server target))))
-    (unless process
-      (error "%s" (substitute-command-keys
-                  "Type \\[riece-command-open-server] to open server.")))
     (riece-process-send-string process
                               (if message
                                   (format "PART %s :%s\r\n"
@@ -461,6 +454,7 @@ the layout to the selected layout-name."
 
 (defun riece-command-part (target &optional message)
   (interactive
+   (riece-check-channel-commands-are-usable)
    (let* ((completion-ignore-case t)
         (target
          (riece-completing-read-identity

diff --git a/lisp/riece-misc.el b/lisp/riece-misc.el
index c4fa7bc..0e218e6 100644 (file)
--- a/lisp/riece-misc.el
+++ b/lisp/riece-misc.el
@@ -181,7 +181,9 @@
     user-at-host))
 
 (defun riece-get-users-on-server ()
-  (riece-with-server-buffer (riece-identity-server riece-current-channel)
+  (riece-with-server-buffer (if riece-current-channel
+                               (riece-identity-server riece-current-channel)
+                             "")
     (let (users)
       (mapatoms
        (lambda (atom)
@@ -192,6 +194,15 @@
          users
        (cons riece-real-nickname users)))))
 
+(defun riece-check-channel-commands-are-usable (&optional channel)
+   (unless riece-current-channel
+     (error (substitute-command-keys
+            "Type \\[riece-command-join] to join a channel")))
+   (if (and channel
+           (not (riece-channel-p (riece-identity-prefix
+                                  riece-current-channel))))
+       (error "Not on a channel")))
+
 (provide 'riece-misc)
 
 ;;; riece-misc.el ends here