* riece-handle.el (riece-handle-privmsg-message): Check own

[riece] / lisp / riece-commands.el

diff --git a/lisp/riece-commands.el b/lisp/riece-commands.el
index 4994a8f..890e2e8 100644 (file)
--- a/lisp/riece-commands.el
+++ b/lisp/riece-commands.el
@@ -28,7 +28,6 @@
 (require 'riece-complete)
 (require 'riece-layout)
 (require 'riece-display)
-(require 'riece-version)
 (require 'riece-server)
 (require 'riece-misc)
 (require 'riece-identity)
@@ -252,7 +251,8 @@ the layout to the selected layout-name."
          (channel
           (if current-prefix-arg
               (riece-completing-read-identity
-               "Channel/User: " riece-current-channels)
+               "Channel/User: "
+               (riece-get-identities-on-server (riece-current-server-name)))
             (riece-check-channel-commands-are-usable t)
             riece-current-channel))
          (riece-overriding-server-name (riece-identity-server channel))
@@ -428,9 +428,11 @@ the layout to the selected layout-name."
                               riece-join-channel-candidate)))
                 (riece-completing-read-identity
                  (format "Channel/User (default %s): " default)
-                 riece-current-channels nil nil nil nil default))
+                 (riece-get-identities-on-server (riece-current-server-name))
+                 nil nil nil nil default))
             (riece-completing-read-identity
-             "Channel/User: " riece-current-channels)))
+             "Channel/User: "
+             (riece-get-identities-on-server (riece-current-server-name)))))
          key)
      (if (and current-prefix-arg
              (riece-channel-p (riece-identity-prefix target)))
@@ -538,13 +540,16 @@ the layout to the selected layout-name."
                                            (riece-current-nickname))
                   (riece-user-get-away (riece-identity-prefix
                                         (riece-current-nickname)))))
-           (or (null riece-away-message)
-               current-prefix-arg))
-       (let ((message (read-string "Away message: ")))
-        (list message))))
-  (if message
-      (riece-send-string (format "AWAY :%s\r\n" message))
-    (riece-send-string "AWAY\r\n")))
+           current-prefix-arg)
+       (list (read-from-minibuffer
+             "Away message: " (cons (or riece-away-message "") 0)))))
+  (if (riece-with-server-buffer (riece-identity-server
+                                (riece-current-nickname))
+       (riece-user-get-away (riece-identity-prefix
+                             (riece-current-nickname))))
+      (riece-send-string "AWAY\r\n")
+    (riece-send-string (format "AWAY :%s\r\n" (or message
+                                                 riece-away-message)))))
 
 (defun riece-command-toggle-freeze (&optional arg)
   "Prevent automatic scrolling of the dialogue window.
@@ -587,8 +592,7 @@ If prefix argument ARG is non-nil, toggle frozen status."
          (let ((message
                 (if arg
                     (read-string "Message: ")
-                  (or riece-quit-message
-                      (riece-extended-version))))
+                  riece-quit-message))
                (alist riece-server-process-alist))
            (while alist
              (riece-quit-server-process (cdr (car alist)) message)
@@ -635,8 +639,7 @@ If prefix argument ARG is non-nil, toggle frozen status."
    (list (completing-read "Server: " riece-server-process-alist)
         (if current-prefix-arg
             (read-string "Message: ")
-          (or riece-quit-message
-              (riece-extended-version)))))
+          riece-quit-message)))
   (riece-quit-server-process (riece-server-process server-name) message))
 
 (defun riece-command-universal-server-name-argument ()