* riece-commands.el (riece-command-change-mode): Don't send ":".

[riece] / lisp / riece-handle.el

diff --git a/lisp/riece-handle.el b/lisp/riece-handle.el
index e35515e..f08270d 100644 (file)
--- a/lisp/riece-handle.el
+++ b/lisp/riece-handle.el
@@ -28,7 +28,8 @@
 (require 'riece-message)
 (require 'riece-channel)
 (require 'riece-naming)
 (require 'riece-message)
 (require 'riece-channel)
 (require 'riece-naming)

-(require 'riece-display)
+(require 'riece-signal)
+(require 'riece-mode)

 
 (defun riece-handle-nick-message (prefix string)
   (let* ((old (riece-prefix-nickname prefix))
 
 (defun riece-handle-nick-message (prefix string)
   (let* ((old (riece-prefix-nickname prefix))


@@ -42,19 +43,12 @@
                             (riece-make-identity channel riece-server-name))
                           channels))))
     (riece-naming-assert-rename old new)
                             (riece-make-identity channel riece-server-name))
                           channels))))
     (riece-naming-assert-rename old new)

-    (let ((pointer (riece-identity-member old-identity
-                                         riece-current-channels)))
-      (when pointer
-       (setcar pointer new-identity)
-       (with-current-buffer (riece-channel-buffer-name new-identity)
-         (rename-buffer (riece-channel-buffer-name new-identity)))
-       (if (riece-identity-equal new-identity riece-current-channel)
-           (riece-switch-to-channel new-identity))
-       (setq channels (cons new-identity channels))))
+    (if (riece-identity-member old-identity riece-current-channels)
+       (setq channels (cons new channels)))

     (riece-insert-change (mapcar
                          (lambda (channel)
     (riece-insert-change (mapcar
                          (lambda (channel)

-                           (riece-channel-buffer-name
-                            (riece-make-identity channel riece-server-name)))
+                           (riece-channel-buffer (riece-make-identity
+                                                  channel riece-server-name)))

                          channels)
                         (format "%s -> %s\n"
                                 (riece-format-identity old-identity t)
                          channels)
                         (format "%s -> %s\n"
                                 (riece-format-identity old-identity t)


@@ -67,8 +61,7 @@
                           (format "%s -> %s"
                                 (riece-format-identity old-identity t)
                                 (riece-format-identity new-identity t)))
                           (format "%s -> %s"
                                 (riece-format-identity old-identity t)
                                 (riece-format-identity new-identity t)))

-                         "\n"))
-    (riece-redisplay-buffers)))
+                         "\n"))))

 
 (defun riece-handle-privmsg-message (prefix string)
   (let* ((user (riece-prefix-nickname prefix))
 
 (defun riece-handle-privmsg-message (prefix string)
   (let* ((user (riece-prefix-nickname prefix))


@@ -80,7 +73,9 @@
                                              riece-server-name)
                         (riece-make-identity (car targets)
                                              riece-server-name)
                                              riece-server-name)
                         (riece-make-identity (car targets)
                                              riece-server-name)

-                        message))))
+                        message nil
+                        (riece-identity-equal-no-server
+                         user riece-real-nickname)))))

 
 (defun riece-handle-notice-message (prefix string)
   (let* ((user (if prefix
 
 (defun riece-handle-notice-message (prefix string)
   (let* ((user (if prefix


@@ -94,7 +89,9 @@
                                                  riece-server-name)
                             (riece-make-identity (car targets)
                                                  riece-server-name)
                                                  riece-server-name)
                             (riece-make-identity (car targets)
                                                  riece-server-name)

-                            message 'notice))
+                            message 'notice
+                            (riece-identity-equal-no-server
+                             user riece-real-nickname)))

       ;; message from server
       (riece-insert-notice
        (list riece-dialogue-buffer riece-others-buffer)
       ;; message from server
       (riece-insert-notice
        (list riece-dialogue-buffer riece-others-buffer)


@@ -114,10 +111,12 @@
         (user-identity (riece-make-identity user riece-server-name)))
     (while channels
       (riece-naming-assert-join user (car channels))
         (user-identity (riece-make-identity user riece-server-name)))
     (while channels
       (riece-naming-assert-join user (car channels))

+      (if (and riece-gather-channel-modes
+              (riece-identity-equal-no-server user riece-real-nickname))
+         (riece-send-string (format "MODE %s\r\n" (car channels))))

       (let* ((channel-identity (riece-make-identity (car channels)
                                                    riece-server-name))
       (let* ((channel-identity (riece-make-identity (car channels)
                                                    riece-server-name))

-            (buffer (get-buffer (riece-channel-buffer-name
-                                 channel-identity))))
+            (buffer (riece-channel-buffer channel-identity)))

        (riece-insert-change
         buffer
         (format "%s (%s) has joined %s\n"
        (riece-insert-change
         buffer
         (format "%s (%s) has joined %s\n"


@@ -136,8 +135,7 @@
                   (riece-user-get-user-at-host user)
                   (riece-format-identity channel-identity t)))
          "\n")))
                   (riece-user-get-user-at-host user)
                   (riece-format-identity channel-identity t)))
          "\n")))

-      (setq channels (cdr channels)))
-    (riece-redisplay-buffers)))
+      (setq channels (cdr channels)))))

 
 (defun riece-handle-part-message (prefix string)
   (let* ((user (riece-prefix-nickname prefix))
 
 (defun riece-handle-part-message (prefix string)
   (let* ((user (riece-prefix-nickname prefix))


@@ -151,8 +149,7 @@
       (riece-naming-assert-part user (car channels))
       (let* ((channel-identity (riece-make-identity (car channels)
                                                    riece-server-name))
       (riece-naming-assert-part user (car channels))
       (let* ((channel-identity (riece-make-identity (car channels)
                                                    riece-server-name))

-            (buffer (get-buffer (riece-channel-buffer-name
-                                 channel-identity))))
+            (buffer (riece-channel-buffer channel-identity)))

        (riece-insert-change
         buffer
         (concat
        (riece-insert-change
         buffer
         (concat


@@ -175,8 +172,7 @@
                    (riece-format-identity channel-identity t))
            message))
          "\n")))
                    (riece-format-identity channel-identity t))
            message))
          "\n")))

-      (setq channels (cdr channels)))
-    (riece-redisplay-buffers)))
+      (setq channels (cdr channels)))))

 
 (defun riece-handle-kick-message (prefix string)
   (let* ((kicker (riece-prefix-nickname prefix))
 
 (defun riece-handle-kick-message (prefix string)
   (let* ((kicker (riece-prefix-nickname prefix))


@@ -188,7 +184,7 @@
         (channel-identity (riece-make-identity channel riece-server-name))
         (user-identity (riece-make-identity user riece-server-name)))
     (riece-naming-assert-part user channel)
         (channel-identity (riece-make-identity channel riece-server-name))
         (user-identity (riece-make-identity user riece-server-name)))
     (riece-naming-assert-part user channel)

-    (let ((buffer (get-buffer (riece-channel-buffer-name channel-identity))))
+    (let ((buffer (riece-channel-buffer channel-identity)))

       (riece-insert-change
        buffer
        (concat
       (riece-insert-change
        buffer
        (concat


@@ -212,8 +208,7 @@
                 (riece-format-identity user-identity t)
                 (riece-format-identity channel-identity t))
          message))
                 (riece-format-identity user-identity t)
                 (riece-format-identity channel-identity t))
          message))

-       "\n")))
-    (riece-redisplay-buffers)))
+       "\n")))))

 
 (defun riece-handle-quit-message (prefix string)
   (let* ((user (riece-prefix-nickname prefix))
 
 (defun riece-handle-quit-message (prefix string)
   (let* ((user (riece-prefix-nickname prefix))


@@ -232,9 +227,8 @@
     (let ((buffers
           (mapcar
            (lambda (channel)
     (let ((buffers
           (mapcar
            (lambda (channel)

-             (get-buffer
-              (riece-channel-buffer-name
-               (riece-make-identity channel riece-server-name))))
+             (riece-channel-buffer (riece-make-identity channel
+                                                        riece-server-name)))

            channels)))
       (riece-insert-change
        buffers
            channels)))
       (riece-insert-change
        buffers


@@ -255,8 +249,7 @@
          (format "%s has left IRC"
                  (riece-format-identity user-identity t))
          message))
          (format "%s has left IRC"
                  (riece-format-identity user-identity t))
          message))

-       "\n"))))
-  (riece-redisplay-buffers))
+       "\n")))))

 
 (defun riece-handle-kill-message (prefix string)
   (let* ((killer (riece-prefix-nickname prefix))
 
 (defun riece-handle-kill-message (prefix string)
   (let* ((killer (riece-prefix-nickname prefix))


@@ -277,9 +270,8 @@
     (let ((buffers
           (mapcar
            (lambda (channel)
     (let ((buffers
           (mapcar
            (lambda (channel)

-             (get-buffer
-              (riece-channel-buffer-name
-               (riece-make-identity channel riece-server-name))))
+             (riece-channel-buffer (riece-make-identity channel
+                                                        riece-server-name)))

            channels)))
       (riece-insert-change
        buffers
            channels)))
       (riece-insert-change
        buffers


@@ -302,8 +294,7 @@
                 (riece-format-identity killer-identity t)
                 (riece-format-identity user-identity t))
          message))
                 (riece-format-identity killer-identity t