Invisible messages now properly filled.

[lurk.git] / lurk.el

diff --git a/lurk.el b/lurk.el
index 9563237..26eb894 100644 (file)
--- a/lurk.el
+++ b/lurk.el
@@ -405,6 +405,15 @@ portion of the source component of the message, as LURK doesn't use this.")
       (puthash context facelist lurk-context-facelists))
     facelist))
 
+(defun lurk--fill-strings (col indent &rest strings)
+  (with-temp-buffer
+    (setq buffer-invisibility-spec nil)
+    (let ((fill-column col)
+          (adaptive-fill-regexp (rx-to-string `(= ,indent anychar))))
+      (apply #'insert strings)
+      (fill-region (point-min) (point-max) nil t)
+      (buffer-string))))
+
 (defun lurk-display-string (context prefix &rest strings)
   (with-current-buffer (get-buffer-create "*lurk*")
     (save-excursion
@@ -413,28 +422,26 @@ portion of the source component of the message, as LURK doesn't use this.")
              (old-pos (marker-position lurk-prompt-marker))
              (padded-timestamp (concat (format-time-string "%H:%M ")))
              (padded-prefix (if prefix (concat prefix " ") ""))
-             (adaptive-fill-regexp (rx-to-string
-                                    `(= ,(+ (length padded-timestamp)
-                                            (length padded-prefix))
-                                        anychar)))
-             (fill-column 80)
              (context-atom (if context (intern context) nil)))
         (insert-before-markers
-         (propertize padded-timestamp
-                     'face 'lurk-timestamp
-                     'read-only t
-                     'context context
-                     'invisible context-atom)
-         (propertize padded-prefix
-                     'read-only t
-                     'context context
-                     'invisible context-atom)
-         (propertize (concat (lurk-buttonify-urls (apply #'concat strings)) "\n")
-                     'face (lurk-get-context-facelist context)
-                     'read-only t
-                     'context context
-                     'invisible context-atom))
-        (fill-region old-pos lurk-prompt-marker nil t)))))
+         (lurk--fill-strings
+          80
+          (+ (length padded-timestamp)
+             (length padded-prefix))
+          (propertize padded-timestamp
+                      'face 'lurk-timestamp
+                      'read-only t
+                      'context context
+                      'invisible context-atom)
+          (propertize padded-prefix
+                      'read-only t
+                      'context context
+                      'invisible context-atom)
+          (propertize (concat (lurk-buttonify-urls (apply #'concat strings)) "\n")
+                      'face (lurk-get-context-facelist context)
+                      'read-only t
+                      'context context
+                      'invisible context-atom)))))))
 
 (defun lurk-display-message (from to text)
   (let ((context (if (eq 'channel (lurk-get-context-type to))
@@ -442,11 +449,13 @@ portion of the source component of the message, as LURK doesn't use this.")
                    (if (equal to lurk-nick) from to))))
     (lurk-display-string
      context
-     (pcase (lurk-get-context-type to)
-       ('channel (concat to " <" from ">"))
-       ('nick (concat "[" from " -> " to "]"))
-       (_
-        (error "Unsupported context type")))
+     (propertize
+      (pcase (lurk-get-context-type to)
+        ('channel (concat to " <" from ">"))
+        ('nick (concat "[" from " -> " to "]"))
+        (_
+         (error "Unsupported context type")))
+      'face (lurk-get-context-facelist context))
      text)))
 
 (defun lurk-display-action (from to action-text)
@@ -509,8 +518,9 @@ portion of the source component of the message, as LURK doesn't use this.")
        (opt (group (: ":" (+ digit))))
        (opt (group (: "/"
                       (opt
-                       (* (any alnum ",.-~/@|:%#=&_"))
-                       (+ (any alnum "-~/@|:%#=&")))))))))
+                       (* (any alnum "-/.,#:%=&_"))
+                       (any alnum "-/#:%=&_")))))))
+  "Imperfect regex used to find URLs in plain text.")
 
 (defun lurk-click-url (button)
   (browse-url (button-get button 'url)))
@@ -543,10 +553,8 @@ portion of the source component of the message, as LURK doesn't use this.")
       ("PING"
        (lurk-send-msg
         (lurk-msg nil nil "PONG" (lurk-msg-params msg))))
-       ;; (lurk-display-notice nil "ping-pong (server initiated)"))
 
       ("PONG")
-       ;; (lurk-display-notice nil "ping-pong (client initiated)"))
 
       ("001"
        (let* ((params (lurk-msg-params msg))
@@ -618,6 +626,21 @@ portion of the source component of the message, as LURK doesn't use this.")
          (if lurk-show-joins
              (lurk-display-notice channel nick " left channel " channel))))
 
+      ((and "KICK")
+       (let ((kicker-nick (lurk-msg-src msg))
+             (channel (car (lurk-msg-params msg)))
+             (nick (cadr (lurk-msg-params msg)))
+             (reason (caddr (lurk-msg-params msg))))
+         (if (equal nick lurk-nick)
+             (progn
+               (lurk-display-notice channel kicker-nick " kicked you from " channel ": " reason)
+               (lurk-del-context channel)
+               (if (equal channel lurk-current-context)
+                   (lurk-set-current-context (lurk-get-next-context)))
+               (lurk-render-prompt))
+           (lurk-del-context-user channel nick)
+           (lurk-display-notice channel kicker-nick " kicked " nick " from " channel ": " reason))))
+
       ("QUIT"
        (let ((nick (lurk-msg-src msg))
              (reason (mapconcat 'identity (lurk-msg-params msg) " ")))