X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?a=blobdiff_plain;f=murk.el;h=e89df657a7490aab9eadd6d5ce4c5a4042aef579;hb=b91c95a6e7a26c70e794ea0acd862cc43e5b8a52;hp=59f76064d87f886e34be3ab71742aa8dd1731d3e;hpb=c89c5c26b8b189dee352847671e6701368350717;p=lurk.git

diff --git a/murk.el b/murk.el
index 59f7606..e89df65 100644
--- a/murk.el
+++ b/murk.el
@@ -37,7 +37,7 @@
   "Multiserver Unibuffer iRc Klient"
   :group 'network)
 
-(defcustom murk-nick "plugd"
+(defcustom murk-default-nick "plugd"
   "Default nick.")
 
 (defcustom murk-default-quit-msg "Bye"
@@ -98,6 +98,7 @@
 (defvar murk-debug nil
   "If non-nil, enable debug mode.")
 
+
 ;;; Utility procedures
 ;;
 
@@ -109,6 +110,7 @@
       (with-output-to-string (princ obj))
     nil))
 
+
 ;;; Network processes
 ;;
 
@@ -119,13 +121,23 @@ This includes the process and the response string.")
 (defun murk-connection-process (server)
   (elt (assoc server murk-connection-table) 1))
 
-(defun murk-connection-response (server)
+(defun murk-connection-nick (server)
   (elt (assoc server murk-connection-table) 2))
 
+(defun murk-set-connection-nick (server nick)
+  (setf (elt (assoc server murk-connection-table) 2) nick))
+
+(defun murk-connection-response (server)
+  (elt (assoc server murk-connection-table) 3))
+
 (defun murk-set-connection-response (server string)
-  (setf (elt (assoc server murk-connection-table) 2) string))
+  (setf (elt (assoc server murk-connection-table) 3) string))
 
-(defun murk-connection-close (server)
+(defun murk-connection-new (server process nick)
+  (add-to-list 'murk-connection-table
+               (list server process nick "")))
+
+(defun murk-connection-remove (server)
   (setq murk-connection-table (assoc-delete-all server murk-connection-table)))
 
 (defun murk-make-server-filter (server)
@@ -140,9 +152,9 @@ This includes the process and the response string.")
   (lambda (proc string)
     (unless (equal "open" (string-trim string))
       (murk-display-error "Disconnected from server.")
+      (murk-connection-remove server)
       (murk-remove-server-contexts server)
-      (murk-render-prompt)
-      (murk-connection-close server))))
+      (murk-render-prompt))))
 
 (defun murk-start-process (server)
   (let* ((row (assoc server murk-networks))
@@ -174,11 +186,11 @@ This includes the process and the response string.")
     (if (not (assoc server murk-networks))
         (murk-display-error "Network '" server "' is unknown.")
       (let ((proc (murk-start-process server)))
-        (add-to-list 'murk-connection-table
-                     (list server proc "")))
-      (murk-send-msg server (murk-msg nil nil "USER" murk-nick 0 "*" murk-nick))
-      (murk-send-msg server (murk-msg nil nil "NICK" murk-nick))
-      (murk-add-context (list server)))))
+        (murk-connection-new server proc murk-default-nick))
+      (murk-send-msg server (murk-msg nil nil "USER" murk-default-nick 0 "*" murk-default-nick))
+      (murk-send-msg server (murk-msg nil nil "NICK" murk-default-nick))
+      (murk-add-context (list server))
+      (murk-render-prompt))))
 
 (defun murk-send-msg (server msg)
   (if murk-debug
@@ -186,8 +198,8 @@ This includes the process and the response string.")
   (let ((proc (murk-connection-process server)))
     (if (and proc (eq (process-status proc) 'open))
         (process-send-string proc (concat (murk-msg->string msg) "\r\n"))
-      (murk-display-error "No server connection established.")
-      (error "No server connection established"))))
+      (murk-display-error "No server connection established."))))
+
 
 ;;; Server messages
 ;;
@@ -264,7 +276,7 @@ portion of the source component of the message, as mURK doesn't use this.")
 ;; representing either a channel name or nick, and server is a symbol
 ;; identifying the server.
 ;;
-;; Each server has a special context (server) used for messages
+;; Each server has a special context (server nil) used for messages
 ;; to/from the server itself.
 
 (defvar murk-contexts nil
@@ -277,16 +289,48 @@ The head of this list is always the current context.")
       (car murk-contexts)
     nil))
 
+(defun murk-contexts-equal (c1 c2)
+  (if (murk-server-context-p c1)
+      (and (murk-server-context-p c2)
+           (equal (murk-context-server c1)
+                  (murk-context-server c2)))
+    (and (not (murk-server-context-p c2))
+         (equal (seq-take c1 2)
+                (seq-take c2 2)))))
+
 (defun murk-context-server (ctx) (elt ctx 0))
 (defun murk-context-name (ctx) (elt ctx 1))
+(defun murk-context-users (ctx) (seq-drop ctx 2))
+(defun murk-server-context-p (ctx) (not (cdr ctx)))
 
 (defun murk-add-context (ctx)
   (add-to-list 'murk-contexts ctx))
 
+(defun murk-remove-context (ctx)
+  (setq murk-contexts
+        (seq-remove
+         (lambda (this-ctx)
+           (murk-contexts-equal this-ctx ctx))
+         murk-contexts)))
+
 (defun murk-remove-server-contexts (server)
   (setq murk-contexts
         (assoc-delete-all server murk-contexts)))
 
+(defun murk-context->string (ctx)
+   (if (murk-server-context-p ctx)
+       (concat "[" (murk-context-server ctx) "]")
+     (concat (murk-context-name ctx) "@"
+             (murk-context-server ctx))))
+
+(defun murk-get-context (server &optional name)
+  (if name
+      (assoc server murk-contexts)
+    (let ((test-ctx (list server name)))
+      (seq-find (lambda (ctx)
+                  (equal (seq-take ctx 2) test-ctx))
+                murk-contexts))))
+
 ;;; Buffer
 ;;
 
@@ -306,7 +350,7 @@ The head of this list is always the current context.")
           (insert
            (propertize (let ((ctx (murk-current-context)))
                          (if ctx
-                             (concat (murk-context-name) "@" (murk-context-server ctx))
+                             (murk-context->string ctx)
                            ""))
                        'face 'murk-context
                        'read-only t)
@@ -330,8 +374,24 @@ The head of this list is always the current context.")
   "Marker for prompt position in murk buffer.")
 
 (defun murk-setup-header ()
-  ;; To do
-  )
+  (with-current-buffer "*murk*"
+    (setq-local header-line-format
+                '((:eval
+                   (let* ((ctx (murk-current-context)))
+                     (if ctx
+                         (let ((server (murk-context-server ctx)))
+                           (concat
+                            "Network: " server ", "
+                            (if (murk-server-context-p ctx)
+                                "Server"
+                              (concat
+                               "Channel: "
+                               (murk-context-name ctx)
+                               " ("
+                               (number-to-string
+                                (length (murk-context-users ctx)))
+                               ")"))))
+                       "No connection")))))))
 
 (defun murk-setup-buffer ()
   (with-current-buffer (get-buffer-create "*murk*")
@@ -367,11 +427,6 @@ The head of this list is always the current context.")
       (fill-region (point-min) (point-max) nil t)
       (buffer-string))))
 
-(defun murk-context->string (context)
-  (if context
-      (concat (murk-context-name) "@" (murk-context-server context))
-    nil))
-
 (defun murk-display-string (context prefix &rest strings)
   (with-current-buffer "*murk*"
     (save-excursion
@@ -402,6 +457,17 @@ The head of this list is always the current context.")
                        'invisible context-atom)))))))
   (murk-scroll-windows-to-last-line))
 
+(defun murk-display-message (server from to text)
+  (let ((context (if (string-prefix-p "#" to)
+                     (murk-get-context server to)
+                   (murk-get-context server))))
+    (murk-display-string
+     context
+     (if (murk-server-context-p context)
+         (concat "[" from " -> " to "]")
+       (concat (murk-context->string context) " <" from ">"))
+     text)))
+
 (defun murk-display-notice (context &rest notices)
   (murk-display-string
    context
@@ -512,6 +578,74 @@ The head of this list is always the current context.")
 
       ("PONG")
 
+      ("001"
+       (let* ((params (murk-msg-params msg))
+              (nick (elt params 0))
+              (text (string-join (seq-drop params 1) " ")))
+         (murk-set-connection-nick server nick)
+         (murk-display-notice nil text)))
+
+      ((rx (= 3 (any digit)))
+       (murk-display-notice nil (mapconcat 'identity (cdr (murk-msg-params msg)) " ")))
+
+      ((and "JOIN"
+            (guard (equal (murk-connection-nick server)
+                          (murk-msg-src msg))))
+       (let ((channel (car (murk-msg-params msg))))
+         (murk-add-context (list server channel))
+         (murk-display-notice (murk-current-context)
+                              "Joining channel " channel " on " server)
+         (murk-render-prompt)))
+
+      ((and "PART"
+            (guard (equal (murk-connection-nick server)
+                          (murk-msg-src msg))))
+       (let ((channel (car (murk-msg-params msg))))
+         (murk-display-notice (murk-current-context) "Left channel " channel)
+         (murk-remove-context (list server channel))
+         (murk-render-prompt)))
+
+      ("QUIT"
+       (let ((nick (murk-msg-src msg))
+             (reason (mapconcat 'identity (murk-msg-params msg) " ")))
+         (murk-del-user nick)
+         (if murk-show-joins
+             (murk-display-notice nil nick " quit: " reason))))
+
+      ("PRIVMSG"
+       (let* ((from (murk-msg-src msg))
+              (params (murk-msg-params msg))
+              (to (car params))
+              (text (cadr params)))
+         (pcase text
+           ("\01VERSION\01"
+            (let ((version-string (concat murk-version " - running on GNU Emacs " emacs-version)))
+              (murk-send-msg server
+                             (murk-msg nil nil "NOTICE"
+                                       (list from (concat "\01VERSION "
+                                                          version-string
+                                                          "\01")))))
+            (murk-display-notice nil "CTCP version request received from "
+                                 from " on " server))
+
+           ((rx (let ping (: "\01PING " (* (not "\01")) "\01")))
+            (murk-send-msg server (lurk-msg nil nil "NOTICE" (list from ping)))
+            (murk-display-notice nil "CTCP ping received from " from " on " server))
+
+           ("\01USERINFO\01"
+            (murk-display-notice nil "CTCP userinfo request from " from
+                                 " on " server " (no response sent)"))
+
+           ("\01CLIENTINFO\01"
+            (murk-display-notice nil "CTCP clientinfo request from " from
+                                 " on " server " (no response sent)"))
+
+           ((rx (: "\01ACTION " (let action-text (* (not "\01"))) "\01"))
+            (murk-display-action from to action-text))
+
+           (_
+            (murk-display-message server from to text)))))
+
       (_
        (murk-display-notice nil (murk-msg->string msg))))))
 
@@ -521,9 +655,11 @@ The head of this list is always the current context.")
 (defvar murk-command-table
   '(("DEBUG" "Toggle debug mode on/off." murk-command-debug murk-boolean-completions)
     ("HEADER" "Toggle display of header." murk-command-header murk-boolean-completions)
-    ("CONNECT" "Connect to an IRC network." murk-command-connect murk-network-completions)
     ("NETWORKS" "List known IRC networks." murk-command-networks)
+    ("CONNECT" "Connect to an IRC network." murk-command-connect murk-network-completions)
     ("QUIT" "Disconnect from current network." murk-command-quit)
+    ("JOIN" "Join one or more channels." murk-command-join)
+    ("PART" "Leave channel." murk-command-part murk-context-completions)
     ("NICK" "Change nick." murk-command-nick)
     ("MSG" "Send private message to user." murk-command-msg murk-nick-completions)
     ("CLEAR" "Clear buffer text." murk-command-clear murk-context-completions)
@@ -559,6 +695,17 @@ The head of this list is always the current context.")
           (not murk-debug)))
   (murk-display-notice nil "Debug mode now " (if murk-debug "on" "off") "."))
 
+(defun murk-command-header (params)
+  (if
+      (if params
+          (equal (upcase (car params)) "ON")
+        (not header-line-format))
+      (progn
+        (murk-setup-header)
+        (murk-display-notice nil "Header enabled."))
+    (setq-local header-line-format nil)
+    (murk-display-notice nil "Header disabled.")))
+
 (defun murk-command-clear (params)
   (if (not params)
       (murk-clear-buffer)
@@ -588,7 +735,34 @@ The head of this list is always the current context.")
       (let ((quit-msg (if params (string-join params " ") murk-default-quit-msg)))
         (murk-send-msg
          (murk-context-server ctx)
-         (lurk-msg nil nil "QUIT" quit-msg))))))
+         (murk-msg nil nil "QUIT" quit-msg))))))
+
+(defun murk-command-join (params)
+  (if params
+      (let ((server (murk-context-server (murk-current-context))))
+        (dolist (channel params)
+          (murk-send-msg server (murk-msg nil nil "JOIN" channel))))
+    (murk-display-notice nil "Usage: /join channel [channel2 ...]")))
+
+(defun murk-command-part (params)
+  (let* ((server (murk-context-server (murk-current-context)))
+         (channel (if params
+                      (car params)
+                    (murk-context-name (murk-current-context)))))
+    (if channel
+        (murk-send-msg server (murk-msg nil nil "PART" channel))
+      (murk-display-error "No current channel to leave."))))
+
+(defun murk-command-msg (params)
+  (let ((server (murk-context-server (murk-current-context))))
+    (if (and params (>= (length params) 2))
+        (let ((to (car params))
+              (text (string-join (cdr params) " ")))
+          (murk-send-msg server (lurk-msg nil nil "PRIVMSG" to text))
+          (murk-display-message server
+                                (murk-connection-nick server)
+                                to text))
+      (murk-display-notice nil "Usage: /msg <nick> <message>"))))
 
 ;;; Command entering
 ;;
@@ -613,12 +787,15 @@ The head of this list is always the current context.")
          (murk-display-error "Badly formed command.")))
     (unless (string-empty-p string)
       (if (murk-current-context)
-          (progn
+          (let ((server (murk-context-server (murk-current-context))))
             (murk-send-msg server
                            (murk-msg nil nil "PRIVMSG"
-                                     (murk-context-name murk-current-context)
+                                     (murk-context-name (murk-current-context))
                                      string))
-            (murk-display-message murk-nick (murk-context->string (murk-current-context)) string))
+            (murk-display-message server
+                                  murk-nick
+                                  (murk-context->string (murk-current-context))
+                                  string))
         (murk-display-error "No current context.")))))