From 050c1fe2eeffe1d815c5c84db4e783711b3298ee Mon Sep 17 00:00:00 2001 From: plugd Date: Mon, 20 May 2024 12:52:09 +0200 Subject: [PATCH 01/16] Changing own nick now also updates server users. --- murk.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/murk.el b/murk.el index 9ca5e2a..1903a33 100644 --- a/murk.el +++ b/murk.el @@ -706,8 +706,10 @@ The head of this list is always the current context.") ((and "NICK" (guard (equal (murk-connection-nick server) (murk-msg-src msg)))) - (let ((new-nick (car (murk-msg-params msg)))) + (let ((new-nick (car (murk-msg-params msg))) + (old-nick (murk-connection-nick server))) (murk-set-connection-nick server new-nick) + (murk-rename-server-user server old-nick new-nick) (murk-display-notice nil "Nick set to " new-nick " on " server))) ("NICK" -- 2.20.1 From 5d44f825451c39c26e010eb5bd889469005117d7 Mon Sep 17 00:00:00 2001 From: plugd Date: Mon, 20 May 2024 14:10:05 +0200 Subject: [PATCH 02/16] Implemented actions. --- murk.el | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/murk.el b/murk.el index 1903a33..e15bc84 100644 --- a/murk.el +++ b/murk.el @@ -346,7 +346,7 @@ The head of this list is always the current context.") (seq-find (lambda (ctx) (equal (seq-take ctx 2) test-ctx)) murk-contexts)) - (assoc server murk-contexts))) + (car (member (list server) murk-contexts)))) (defun murk-cycle-contexts (&optional reverse) (setq murk-contexts @@ -516,6 +516,15 @@ The head of this list is always the current context.") (concat (murk-context->string context) " <" from ">")) text))) +(defun murk-display-action (server from to action-text) + (let ((context (if (string-prefix-p "#" to) + (murk-get-context server to) + (murk-get-context server)))) + (murk-display-string + context + (concat (murk-context->string context) " *") + from " " action-text))) + (defun murk-display-notice (context &rest notices) (murk-display-string context @@ -762,7 +771,7 @@ The head of this list is always the current context.") " on " server " (no response sent)")) ((rx (: "\01ACTION " (let action-text (* (not "\01"))) "\01")) - (murk-display-action from to action-text)) + (murk-display-action server from to action-text)) (_ (murk-display-message server from to text))))) @@ -787,6 +796,7 @@ The head of this list is always the current context.") ("TOPIC" "Set/query topic for current channel." murk-command-topic) ("USERS" "List nicks of users in current context." murk-command-users) ("MSG" "Send private message to user." murk-command-msg murk-nick-completions) + ("ME" "Display action." murk-command-me) ("CLEAR" "Clear buffer text." murk-command-clear murk-context-completions) ("HELP" "Display help on client commands." murk-command-help murk-help-completions)) "Table of commands explicitly supported by murk.") @@ -928,6 +938,22 @@ The head of this list is always the current context.") to text)) (murk-display-notice nil "Usage: /msg ")))) +(defun murk-command-me (params) + (let* ((ctx (murk-current-context)) + (server (murk-context-server ctx))) + (if (and ctx (not (murk-server-context-p ctx))) + (if params + (let* ((channel (murk-context-channel ctx)) + (my-nick (murk-connection-nick server)) + (action (string-join params " ")) + (ctcp-text (concat "\01ACTION " action "\01"))) + (murk-send-msg server + (murk-msg nil nil "PRIVMSG" + (list channel ctcp-text))) + (murk-display-action server my-nick channel action)) + (murk-display-notice nil "Usage: /me ")) + (murk-display-notice nil "No current channel.")))) + (defun murk-command-users (_params) (let ((ctx (murk-current-context))) (if (and ctx (not (murk-server-context-p ctx))) -- 2.20.1 From 9bef2f474186f9fbbcd1a2ad2c3e1f30e0328d3c Mon Sep 17 00:00:00 2001 From: plugd Date: Mon, 20 May 2024 14:35:33 +0200 Subject: [PATCH 03/16] Added context switching primitives. --- murk.el | 40 ++++++++++++++++++++++++++++++++-------- 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/murk.el b/murk.el index e15bc84..64bc81d 100644 --- a/murk.el +++ b/murk.el @@ -53,7 +53,8 @@ '(("debug" "localhost" 6697) ("libera" "irc.libera.chat" 6697) ("tilde" "tilde.chat" 6697) - ("freenode" "chat.freenode.net" 6697)) + ("freenode" "chat.freenode.net" 6697) + ("mbr" "mbrserver.com" 6667 :notls)) "IRC networks." :type '(alist :key-type string)) @@ -312,12 +313,20 @@ The head of this list is always the current context.") (equal (seq-take c1 2) (seq-take c2 2))))) -(defun murk-context-server (ctx) (elt ctx 0)) -(defun murk-context-channel (ctx) (elt ctx 1)) -(defun murk-context-users (ctx) (elt ctx 2)) +(defun murk-context-server (ctx) + (elt ctx 0)) + +(defun murk-context-channel (ctx) + (elt ctx 1)) + +(defun murk-context-users (ctx) + (elt ctx 2)) + (defun murk-set-context-users (ctx users) (setcar (cddr ctx) users)) -(defun murk-server-context-p (ctx) (not (cdr ctx))) + +(defun murk-server-context-p (ctx) + (not (cdr ctx))) (defun murk-add-context (ctx) (add-to-list 'murk-contexts ctx)) @@ -340,9 +349,17 @@ The head of this list is always the current context.") (concat (murk-context-channel ctx) "@" (murk-context-server ctx)))) -(defun murk-get-context (server &optional name) - (if name - (let ((test-ctx (list server name))) +(defun murk-string->context (string) + (if (not (string-prefix-p "#" string)) + (murk-get-context string) + (let* ((parts (string-split string "@")) + (channel (elt parts 0)) + (server (elt parts 1))) + (murk-get-context server channel)))) + +(defun murk-get-context (server &optional channel) + (if channel + (let ((test-ctx (list server channel))) (seq-find (lambda (ctx) (equal (seq-take ctx 2) test-ctx)) murk-contexts)) @@ -357,6 +374,13 @@ The head of this list is always the current context.") (seq-take murk-contexts nminus1))) (append (cdr murk-contexts) (list (car murk-contexts)))))) +(defun murk-switch-to-context (ctx) + (setq murk-contexts + (let* ((new-head (memq ctx murk-contexts)) + (new-tail (take (- (length murk-contexts) + (length new-head))))) + (append new-head new-tail)))) + (defun murk-add-context-users (ctx users) (murk-set-context-users ctx -- 2.20.1 From 8f9509d726d0d86aae9ab72a7d49f5b9a29d18c4 Mon Sep 17 00:00:00 2001 From: plugd Date: Mon, 20 May 2024 18:17:00 +0200 Subject: [PATCH 04/16] Added ctcp version commands. --- murk.el | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/murk.el b/murk.el index 64bc81d..1014c1e 100644 --- a/murk.el +++ b/murk.el @@ -53,6 +53,7 @@ '(("debug" "localhost" 6697) ("libera" "irc.libera.chat" 6697) ("tilde" "tilde.chat" 6697) + ("sdf" "irc.sdf.org" 6697) ("freenode" "chat.freenode.net" 6697) ("mbr" "mbrserver.com" 6667 :notls)) "IRC networks." @@ -766,6 +767,19 @@ The head of this list is always the current context.") (if murk-show-joins (murk-display-notice nil nick " quit: " reason)))) + ("NOTICE" + (let ((nick (murk-msg-src msg)) + (channel (car (murk-msg-params msg))) + (text (cadr (murk-msg-params msg)))) + (pcase text + ((rx (: "\01VERSION " + (let version (* (not "\01"))) + "\01")) + (murk-display-notice (murk-get-context server) + "CTCP version reply from " nick ": " version)) + (_ + (murk-display-notice nil text))))) + ("PRIVMSG" (let* ((from (murk-msg-src msg)) (params (murk-msg-params msg)) @@ -821,6 +835,7 @@ The head of this list is always the current context.") ("USERS" "List nicks of users in current context." murk-command-users) ("MSG" "Send private message to user." murk-command-msg murk-nick-completions) ("ME" "Display action." murk-command-me) + ("VERSION" "Request version of another user's client via CTCP." murk-command-version murk-nick-completions) ("CLEAR" "Clear buffer text." murk-command-clear murk-context-completions) ("HELP" "Display help on client commands." murk-command-help murk-help-completions)) "Table of commands explicitly supported by murk.") @@ -978,6 +993,20 @@ The head of this list is always the current context.") (murk-display-notice nil "Usage: /me ")) (murk-display-notice nil "No current channel.")))) +(defun murk-command-version (params) + (let ((ctx (murk-current-context))) + (if ctx + (if params + (let ((server (murk-context-server ctx)) + (nick (car params))) + (murk-send-msg server + (lurk-msg nil nil "PRIVMSG" + (list nick "\01VERSION\01"))) + (murk-display-notice ctx "CTCP version request sent to " + nick " on " server)) + (murk-display-notice ctx "Usage: /version ")) + (murk-display-notice nil "No current channel.")))) + (defun murk-command-users (_params) (let ((ctx (murk-current-context))) (if (and ctx (not (murk-server-context-p ctx))) -- 2.20.1 From ab967a9257e9b1bd41cc97bf03f6eaba8507bee8 Mon Sep 17 00:00:00 2001 From: plugd Date: Mon, 20 May 2024 22:37:28 +0200 Subject: [PATCH 05/16] Zooming roughly works. --- murk.el | 144 +++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 122 insertions(+), 22 deletions(-) diff --git a/murk.el b/murk.el index 1014c1e..2b21449 100644 --- a/murk.el +++ b/murk.el @@ -170,6 +170,7 @@ This includes the process and the response string.") (murk-display-error "Disconnected from server.") (murk-connection-remove server) (murk-remove-server-contexts server) + (murk-highlight-current-context) (murk-render-prompt)))) (defun murk-start-process (server) @@ -206,6 +207,7 @@ This includes the process and the response string.") (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-highlight-current-context) (murk-render-prompt)))) (defun murk-send-msg (server msg) @@ -359,7 +361,7 @@ The head of this list is always the current context.") (murk-get-context server channel)))) (defun murk-get-context (server &optional channel) - (if channel + (if (and channel (string-prefix-p "#" channel)) (let ((test-ctx (list server channel))) (seq-find (lambda (ctx) (equal (seq-take ctx 2) test-ctx)) @@ -394,7 +396,8 @@ The head of this list is always the current context.") (defun murk-del-server-user (server user) (dolist (ctx murk-contexts) - (if (equal (murk-context-server ctx) server) + (if (and (equal (murk-context-server ctx) server) + (not (murk-server-context-p ctx))) (murk-del-context-user ctx user)))) (defun murk-rename-server-user (server old-nick new-nick) @@ -477,6 +480,7 @@ The head of this list is always the current context.") (set-marker murk-input-marker (point-max)) (setq murk-input-marker (point-max-marker))) (goto-char (point-max)) + (murk-highlight-current-context) (murk-render-prompt) (if murk-display-header (murk-setup-header)))) @@ -491,6 +495,31 @@ The head of this list is always the current context.") ;;; Output formatting and highlighting ;; +;; Idea: the face text property can be a list of faces, applied in +;; order. By assigning each context a unique list and keeping track +;; of these in a hash table, we can easily switch the face +;; corresponding to a particular context by modifying the elements of +;; this list. +;; +;; More subtly, we make only the cdrs of this list shared among +;; all text of a given context, allowing the cars to be different +;; and for different elements of the context-specific text to have +;; different styling. + +;; Additionally, we allow selective hiding of contexts via +;; the buffer-invisibility-spec. + +(defvar murk-context-facelists (make-hash-table :test 'equal) + "List of seen contexts and associated face lists.") + +(defun murk-get-context-facelist (context) + (let* ((short-ctx (take 2 context)) + (facelist (gethash short-ctx murk-context-facelists))) + (unless facelist + (setq facelist (list 'murk-text)) + (puthash short-ctx facelist murk-context-facelists)) + facelist)) + (defun murk--fill-strings (col indent &rest strings) (with-temp-buffer (setq buffer-invisibility-spec nil) @@ -508,7 +537,11 @@ The head of this list is always the current context.") (old-pos (marker-position murk-prompt-marker)) (padded-timestamp (concat (format-time-string "%H:%M "))) (padded-prefix (if prefix (concat prefix " ") "")) - (context-atom (if context (intern (murk-context->string context)) nil))) + (short-ctx (take 2 context)) + (context-atom (if short-ctx + (intern (murk-context->string short-ctx)) + nil)) + (context-face (murk-get-context-facelist short-ctx))) (insert-before-markers (murk--fill-strings 80 @@ -517,16 +550,17 @@ The head of this list is always the current context.") (propertize padded-timestamp 'face 'murk-timestamp 'read-only t - 'context context + 'context short-ctx 'invisible context-atom) (propertize padded-prefix 'read-only t - 'context context + 'context short-ctx 'invisible context-atom) (murk-add-formatting (propertize (concat (apply #'murk-buttonify-urls strings) "\n") + 'face context-face 'read-only t - 'context context + 'context short-ctx 'invisible context-atom))))))) (murk-scroll-windows-to-last-line)) @@ -536,9 +570,11 @@ The head of this list is always the current context.") (murk-get-context server)))) (murk-display-string context - (if (murk-server-context-p context) - (concat "[" from " -> " to "]") - (concat (murk-context->string context) " <" from ">")) + (propertize + (if (murk-server-context-p context) + (concat "[" from "->" to "]") + (concat (murk-context->string context) " <" from ">")) + 'face (murk-get-context-facelist context)) text))) (defun murk-display-action (server from to action-text) @@ -562,6 +598,42 @@ The head of this list is always the current context.") (propertize murk-error-prefix 'face 'murk-error) (apply #'concat messages))) +(defun murk-highlight-current-context () + (maphash + (lambda (this-context facelist) + (if (equal (take 2 this-context) (take 2 (murk-current-context))) + (setcar facelist 'murk-text) + (setcar facelist 'murk-faded))) + murk-context-facelists) + (force-window-update "*murk*")) + +(defun murk-zoom-in (context) + (with-current-buffer "*murk*" + (maphash + (lambda (this-context _) + (when this-context + (let ((this-context-atom + (intern (murk-context->string this-context)))) + (if (equal this-context (take 2 context)) + (remove-from-invisibility-spec this-context-atom) + (add-to-invisibility-spec this-context-atom))))) + murk-context-facelists) + (force-window-update "*murk*")) + (murk-scroll-windows-to-last-line)) + +(defun murk-zoom-out () + (with-current-buffer "*murk*" + (maphash + (lambda (this-context _) + (let ((this-context-atom + (if this-context + (intern (murk-context->string this-context)) + nil))) + (remove-from-invisibility-spec this-context-atom))) + murk-context-facelists) + (force-window-update "*murk*")) + (murk-scroll-windows-to-last-line)) + (defun murk--start-of-final-line () (with-current-buffer "*murk*" (save-excursion @@ -617,7 +689,7 @@ The head of this list is always the current context.") (strikethrough nil) (prev-point (point))) (while (re-search-forward (rx (or (any "\x02\x1D\x1F\x1E\x0F") - (: "\x03" (+ digit) (opt "," (* digit))))) + (: "\x03" (* digit) (opt "," (* digit))))) nil t) (let ((beg (+ (match-beginning 0) 1))) (if bold @@ -663,7 +735,7 @@ The head of this list is always the current context.") (nick (elt params 0)) (text (string-join (seq-drop params 1) " "))) (murk-set-connection-nick server nick) - (murk-display-notice nil text))) + (murk-display-notice (murk-get-context server) text))) ("353" ; NAMEREPLY (let* ((params (murk-msg-params msg)) @@ -700,7 +772,8 @@ The head of this list is always the current context.") (murk-display-notice ctx "Topic: " topic))) ((rx (= 3 (any digit))) - (murk-display-notice nil (mapconcat 'identity (cdr (murk-msg-params msg)) " "))) + (murk-display-notice (murk-get-context server) + (mapconcat 'identity (cdr (murk-msg-params msg)) " "))) ((and "JOIN" (guard (equal (murk-connection-nick server) @@ -709,6 +782,7 @@ The head of this list is always the current context.") (murk-add-context (list server channel nil)) (murk-display-notice (murk-current-context) "Joining channel " channel " on " server) + (murk-highlight-current-context) (murk-render-prompt))) ("JOIN" @@ -726,6 +800,7 @@ The head of this list is always the current context.") (let ((channel (car (murk-msg-params msg)))) (murk-display-notice (murk-current-context) "Left channel " channel) (murk-remove-context (list server channel)) + (murk-highlight-current-context) (murk-render-prompt))) ("PART" @@ -744,7 +819,8 @@ The head of this list is always the current context.") (old-nick (murk-connection-nick server))) (murk-set-connection-nick server new-nick) (murk-rename-server-user server old-nick new-nick) - (murk-display-notice nil "Nick set to " new-nick " on " server))) + (murk-display-notice (murk-get-context server) + "Nick set to " new-nick " on " server))) ("NICK" (let ((old-nick (murk-msg-src msg)) @@ -765,7 +841,8 @@ The head of this list is always the current context.") (reason (mapconcat 'identity (murk-msg-params msg) " "))) (murk-del-server-user server nick) (if murk-show-joins - (murk-display-notice nil nick " quit: " reason)))) + (murk-display-notice (murk-get-context server) + nick " quit: " reason)))) ("NOTICE" (let ((nick (murk-msg-src msg)) @@ -778,7 +855,7 @@ The head of this list is always the current context.") (murk-display-notice (murk-get-context server) "CTCP version reply from " nick ": " version)) (_ - (murk-display-notice nil text))))) + (murk-display-notice (murk-get-context server channel) text))))) ("PRIVMSG" (let* ((from (murk-msg-src msg)) @@ -793,19 +870,23 @@ The head of this list is always the current context.") (list from (concat "\01VERSION " version-string "\01"))))) - (murk-display-notice nil "CTCP version request received from " + (murk-display-notice (murk-get-context server) + "CTCP version request received from " from " on " server)) ((rx (let ping (: "\01PING " (* (not "\01")) "\01"))) (murk-send-msg server (murk-msg nil nil "NOTICE" (list from ping))) - (murk-display-notice nil "CTCP ping received from " from " on " server)) + (murk-display-notice (murk-get-context server) + "CTCP ping received from " from " on " server)) ("\01USERINFO\01" - (murk-display-notice nil "CTCP userinfo request from " from + (murk-display-notice (murk-get-context server) + "CTCP userinfo request from " from " on " server " (no response sent)")) ("\01CLIENTINFO\01" - (murk-display-notice nil "CTCP clientinfo request from " from + (murk-display-notice (murk-get-context server) + "CTCP clientinfo request from " from " on " server " (no response sent)")) ((rx (: "\01ACTION " (let action-text (* (not "\01"))) "\01")) @@ -815,7 +896,8 @@ The head of this list is always the current context.") (murk-display-message server from to text))))) (_ - (murk-display-notice nil (murk-msg->string msg)))))) + (murk-display-notice (murk-get-context server) + (murk-msg->string msg)))))) ;;; Commands ;; @@ -1100,12 +1182,29 @@ The head of this list is always the current context.") (defun murk-cycle-contexts-forward () (interactive) (murk-cycle-contexts) - (murk-render-prompt)) + (murk-highlight-current-context) + (murk-render-prompt) + (if murk-zoomed + (murk-zoom-in (murk-current-context)))) (defun murk-cycle-contexts-reverse () (interactive) (murk-cycle-contexts t) - (murk-render-prompt)) + (murk-highlight-current-context) + (murk-render-prompt) + (if murk-zoomed + (murk-zoom-in (murk-current-context)))) + +(defvar murk-zoomed nil + "Keeps track of zoom status.") + +(defun murk-toggle-zoom () + (interactive) + (if murk-zoomed + (murk-zoom-out) + (murk-zoom-in (murk-current-context))) + (setq murk-zoomed (not murk-zoomed))) + (defun murk-complete-input () (interactive) @@ -1144,6 +1243,7 @@ The head of this list is always the current context.") (let ((map (make-sparse-keymap))) (define-key map (kbd "RET") 'murk-enter) (define-key map (kbd "TAB") 'murk-complete-input) + (define-key map (kbd "C-c C-z") 'murk-toggle-zoom) (define-key map (kbd "") 'murk-history-prev) (define-key map (kbd "") 'murk-history-next) (define-key map (kbd "") 'murk-cycle-contexts-forward) -- 2.20.1 From 99b0e06f0d24b84345a1938302c2fa94b87d9999 Mon Sep 17 00:00:00 2001 From: plugd Date: Mon, 20 May 2024 22:44:29 +0200 Subject: [PATCH 06/16] Assigned action prefix correct face. --- murk.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/murk.el b/murk.el index 2b21449..09bda81 100644 --- a/murk.el +++ b/murk.el @@ -583,7 +583,9 @@ The head of this list is always the current context.") (murk-get-context server)))) (murk-display-string context - (concat (murk-context->string context) " *") + (propertize + (concat (murk-context->string context) " *") + 'face (murk-get-context-facelist context)) from " " action-text))) (defun murk-display-notice (context &rest notices) -- 2.20.1 From 2d5b239d6b1b43beec02e7b0b2612772e2d1e316 Mon Sep 17 00:00:00 2001 From: plugd Date: Thu, 23 May 2024 11:32:38 +0200 Subject: [PATCH 07/16] Added autoreply --- murk.el | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/murk.el b/murk.el index 09bda81..0766b7d 100644 --- a/murk.el +++ b/murk.el @@ -66,6 +66,24 @@ "If non-nil, use buffer header to display current host and channel." :type '(boolean)) +(defcustom murk-autoreply-table nil + "Table of autoreply messages. + +Each autoreply is a list of two elements: (matcher reply) + +Here matcher is a list: + +(network src cmd params ...) + +and reply is another list: + + (cmd params ...) + +Each entry in the matcher list is a regular expression tested against the +corresponding values in the incomming message. Entries can be nil, +in which case they match anything." + :type '(list (list) (list))) + ;;; Faces ;; @@ -725,6 +743,7 @@ The head of this list is always the current context.") (if murk-debug (murk-display-string nil nil string)) (let* ((msg (murk-string->msg string))) + (murk-process-autoreplies server msg) (pcase (murk-msg-cmd msg) ("PING" (murk-send-msg server @@ -901,6 +920,38 @@ The head of this list is always the current context.") (murk-display-notice (murk-get-context server) (murk-msg->string msg)))))) + +;;; User-defined responses +;; + +(defun murk--lists-equal (l1 l2) + (if (and l1 l2) + (if (or (not (and (car l1) (car l2))) + (string-match (car l1) (car l2))) + (murk--lists-equal (cdr l1) (cdr l2)) + nil) + t)) + +(defun murk-process-autoreply (server msg autoreply) + (let ((matcher (car autoreply)) + (reply (cadr autoreply))) + (let ((target-server (car matcher))) + (when (and (or (not target-server) + (and (equal server target-server))) + (murk--lists-equal (cdr matcher) + (append (list (lurk-msg-src msg) + (lurk-msg-cmd msg)) + (murk-msg-params msg)))) + (murk-send-msg server + (murk-msg nil nil (car reply) (cdr reply))))))) + +(defun murk-process-autoreplies (server msg) + (mapc + (lambda (autoreply) + (murk-process-autoreply server msg autoreply)) + murk-autoreply-table)) + + ;;; Commands ;; @@ -993,7 +1044,7 @@ The head of this list is always the current context.") (defun murk-command-quit (params) (let ((ctx (murk-current-context))) (if (not ctx) - (murk-display-error "No current context") + (murk-display-error "No current server") (let ((quit-msg (if params (string-join params " ") murk-default-quit-msg))) (murk-send-msg (murk-context-server ctx) -- 2.20.1 From 0a919f36d688bb2495321b46705e5ad39a0a9175 Mon Sep 17 00:00:00 2001 From: plugd Date: Thu, 23 May 2024 20:21:13 +0200 Subject: [PATCH 08/16] Removed some residual lurk references --- murk.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/murk.el b/murk.el index 0766b7d..e67d8e6 100644 --- a/murk.el +++ b/murk.el @@ -939,8 +939,8 @@ The head of this list is always the current context.") (when (and (or (not target-server) (and (equal server target-server))) (murk--lists-equal (cdr matcher) - (append (list (lurk-msg-src msg) - (lurk-msg-cmd msg)) + (append (list (murk-msg-src msg) + (murk-msg-cmd msg)) (murk-msg-params msg)))) (murk-send-msg server (murk-msg nil nil (car reply) (cdr reply))))))) @@ -1135,7 +1135,7 @@ The head of this list is always the current context.") (let ((server (murk-context-server ctx)) (nick (car params))) (murk-send-msg server - (lurk-msg nil nil "PRIVMSG" + (murk-msg nil nil "PRIVMSG" (list nick "\01VERSION\01"))) (murk-display-notice ctx "CTCP version request sent to " nick " on " server)) -- 2.20.1 From e12b0f7c522cffd808fb603f6a15b41460b2a83d Mon Sep 17 00:00:00 2001 From: plugd Date: Thu, 23 May 2024 20:24:29 +0200 Subject: [PATCH 09/16] Added autoload to main start procedure. --- murk.el | 1 + 1 file changed, 1 insertion(+) diff --git a/murk.el b/murk.el index e67d8e6..373b7c1 100644 --- a/murk.el +++ b/murk.el @@ -1316,6 +1316,7 @@ The head of this list is always the current context.") ;;; Main start procedure ;; +;;;###autoload (defun murk () "Start murk or just switch to the murk buffer if one already exists." (interactive) -- 2.20.1 From 9a72e95e5f108eb4acfa397d2ede3e7c125bada3 Mon Sep 17 00:00:00 2001 From: plugd Date: Thu, 23 May 2024 21:13:29 +0200 Subject: [PATCH 10/16] Replaced references to "server" with network. --- murk.el | 340 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 170 insertions(+), 170 deletions(-) diff --git a/murk.el b/murk.el index 373b7c1..8ea2fa3 100644 --- a/murk.el +++ b/murk.el @@ -1,4 +1,4 @@ -;;; murk.el --- Multiserver Unibuffer iRc Klient -*- lexical-binding:t -*- +;;; murk.el --- Multinetwork Unibuffer iRc Klient -*- lexical-binding:t -*- ;; Copyright (C) 2024 plugd @@ -26,7 +26,7 @@ ;;; Commentary: -;; A very simple IRC server which uses only a single buffer. +;; A very simple IRC client which uses only a single buffer. ;;; Code: @@ -38,7 +38,7 @@ ;;; Customizations (defgroup murk nil - "Multiserver Unibuffer iRc Klient" + "Multinetwork Unibuffer iRc Klient" :group 'network) (defcustom murk-default-nick "plugd" @@ -147,61 +147,61 @@ in which case they match anything." ;; (defvar murk-connection-table nil - "An alist associating servers to connection information. + "An alist associating networks to connection information. This includes the process and the response string.") -(defun murk-connection-process (server) - (elt (assoc server murk-connection-table) 1)) +(defun murk-connection-process (network) + (elt (assoc network murk-connection-table) 1)) -(defun murk-connection-nick (server) - (elt (assoc server murk-connection-table) 2)) +(defun murk-connection-nick (network) + (elt (assoc network murk-connection-table) 2)) -(defun murk-set-connection-nick (server nick) - (setf (elt (assoc server murk-connection-table) 2) nick)) +(defun murk-set-connection-nick (network nick) + (setf (elt (assoc network murk-connection-table) 2) nick)) -(defun murk-connection-response (server) - (elt (assoc server murk-connection-table) 3)) +(defun murk-connection-response (network) + (elt (assoc network murk-connection-table) 3)) -(defun murk-set-connection-response (server string) - (setf (elt (assoc server murk-connection-table) 3) string)) +(defun murk-set-connection-response (network string) + (setf (elt (assoc network murk-connection-table) 3) string)) -(defun murk-connection-new (server process nick) +(defun murk-connection-new (network process nick) (add-to-list 'murk-connection-table - (list server process nick ""))) + (list network process nick ""))) -(defun murk-connection-remove (server) +(defun murk-connection-remove (network) (setq murk-connection-table - (seq-remove (lambda (row) (equal (car row) server)) + (seq-remove (lambda (row) (equal (car row) network)) murk-connection-table))) -(defun murk-make-server-filter (server) +(defun murk-make-network-filter (network) (lambda (_proc string) - (dolist (line (split-string (concat (murk-connection-response server) string) + (dolist (line (split-string (concat (murk-connection-response network) string) "\n")) (if (string-suffix-p "\r" line) - (murk-eval-msg-string server (string-trim line)) - (murk-set-connection-response server line))))) + (murk-eval-msg-string network (string-trim line)) + (murk-set-connection-response network line))))) -(defun murk-make-server-sentinel (server) +(defun murk-make-network-sentinel (network) (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-display-error "Disconnected from network.") + (murk-connection-remove network) + (murk-remove-network-contexts network) (murk-highlight-current-context) (murk-render-prompt)))) -(defun murk-start-process (server) - (let* ((row (assoc server murk-networks)) +(defun murk-start-process (network) + (let* ((row (assoc network murk-networks)) (host (elt row 1)) (port (elt row 2)) (flags (seq-drop row 3))) - (make-network-process :name (concat "murk-" server) + (make-network-process :name (concat "murk-" network) :host host :service port :family nil - :filter (murk-make-server-filter server) - :sentinel (murk-make-server-sentinel server) + :filter (murk-make-network-filter network) + :sentinel (murk-make-network-sentinel network) :nowait nil :tls-parameters (if (memq :notls flags) nil @@ -215,29 +215,29 @@ This includes the process and the response string.") ;; IDEA: Have a single ping timer which pings all connected hosts -(defun murk-connect (server) - (if (assoc server murk-connection-table) +(defun murk-connect (network) + (if (assoc network murk-connection-table) (murk-display-error "Already connected to this network") - (if (not (assoc server murk-networks)) - (murk-display-error "Network '" server "' is unknown.") - (let ((proc (murk-start-process 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)) + (if (not (assoc network murk-networks)) + (murk-display-error "Network '" network "' is unknown.") + (let ((proc (murk-start-process network))) + (murk-connection-new network proc murk-default-nick)) + (murk-send-msg network (murk-msg nil nil "USER" murk-default-nick 0 "*" murk-default-nick)) + (murk-send-msg network (murk-msg nil nil "NICK" murk-default-nick)) + (murk-add-context (list network)) (murk-highlight-current-context) (murk-render-prompt)))) -(defun murk-send-msg (server msg) +(defun murk-send-msg (network msg) (if murk-debug (murk-display-string nil nil (murk-msg->string msg))) - (let ((proc (murk-connection-process server))) + (let ((proc (murk-connection-process network))) (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")))) + (murk-display-error "No network connection established")))) -;;; Server messages +;;; network messages ;; (defun murk-msg (tags src cmd &rest params) @@ -308,12 +308,12 @@ portion of the source component of the message, as mURK doesn't use this.") ;;; Contexts ;; -;; A context is a list (server channel users) identifying the server +;; A context is a list (network channel users) identifying the network ;; and channel. The tail of the list contains the nicks of users ;; present in the channel. ;; -;; Each server has a special context (server) used for messages -;; to/from the server itself. +;; Each network has a special context (network) used for messages +;; to/from the network itself. (defvar murk-contexts nil "List of currently-available contexts. @@ -326,15 +326,15 @@ The head of this list is always the current context.") 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)) + (if (murk-network-context-p c1) + (and (murk-network-context-p c2) + (equal (murk-context-network c1) + (murk-context-network c2))) + (and (not (murk-network-context-p c2)) (equal (seq-take c1 2) (seq-take c2 2))))) -(defun murk-context-server (ctx) +(defun murk-context-network (ctx) (elt ctx 0)) (defun murk-context-channel (ctx) @@ -346,7 +346,7 @@ The head of this list is always the current context.") (defun murk-set-context-users (ctx users) (setcar (cddr ctx) users)) -(defun murk-server-context-p (ctx) +(defun murk-network-context-p (ctx) (not (cdr ctx))) (defun murk-add-context (ctx) @@ -359,32 +359,32 @@ The head of this list is always the current context.") (murk-contexts-equal this-ctx ctx)) murk-contexts))) -(defun murk-remove-server-contexts (server) +(defun murk-remove-network-contexts (network) (setq murk-contexts - (seq-remove (lambda (row) (equal (car row) server)) + (seq-remove (lambda (row) (equal (car row) network)) murk-contexts))) (defun murk-context->string (ctx) - (if (murk-server-context-p ctx) - (concat "[" (murk-context-server ctx) "]") + (if (murk-network-context-p ctx) + (concat "[" (murk-context-network ctx) "]") (concat (murk-context-channel ctx) "@" - (murk-context-server ctx)))) + (murk-context-network ctx)))) (defun murk-string->context (string) (if (not (string-prefix-p "#" string)) (murk-get-context string) (let* ((parts (string-split string "@")) (channel (elt parts 0)) - (server (elt parts 1))) - (murk-get-context server channel)))) + (network (elt parts 1))) + (murk-get-context network channel)))) -(defun murk-get-context (server &optional channel) +(defun murk-get-context (network &optional channel) (if (and channel (string-prefix-p "#" channel)) - (let ((test-ctx (list server channel))) + (let ((test-ctx (list network channel))) (seq-find (lambda (ctx) (equal (seq-take ctx 2) test-ctx)) murk-contexts)) - (car (member (list server) murk-contexts)))) + (car (member (list network) murk-contexts)))) (defun murk-cycle-contexts (&optional reverse) (setq murk-contexts @@ -412,15 +412,15 @@ The head of this list is always the current context.") ctx (delete user (murk-context-users ctx)))) -(defun murk-del-server-user (server user) +(defun murk-del-network-user (network user) (dolist (ctx murk-contexts) - (if (and (equal (murk-context-server ctx) server) - (not (murk-server-context-p ctx))) + (if (and (equal (murk-context-network ctx) network) + (not (murk-network-context-p ctx))) (murk-del-context-user ctx user)))) -(defun murk-rename-server-user (server old-nick new-nick) +(defun murk-rename-network-user (network old-nick new-nick) (dolist (ctx murk-contexts) - (when (and (equal (murk-context-server ctx) server) + (when (and (equal (murk-context-network ctx) network) (member old-nick (murk-context-users ctx))) (murk-del-context-user ctx old-nick) (murk-add-context-users ctx (list new-nick))))) @@ -473,11 +473,11 @@ The head of this list is always the current context.") '((:eval (let* ((ctx (murk-current-context))) (if ctx - (let ((server (murk-context-server ctx))) + (let ((network (murk-context-network ctx))) (concat - "Network: " server ", " - (if (murk-server-context-p ctx) - "Server" + "Network: " network ", " + (if (murk-network-context-p ctx) + "network" (concat "Channel: " (murk-context-channel ctx) @@ -582,23 +582,23 @@ 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) +(defun murk-display-message (network from to text) (let ((context (if (string-prefix-p "#" to) - (murk-get-context server to) - (murk-get-context server)))) + (murk-get-context network to) + (murk-get-context network)))) (murk-display-string context (propertize - (if (murk-server-context-p context) + (if (murk-network-context-p context) (concat "[" from "->" to "]") (concat (murk-context->string context) " <" from ">")) 'face (murk-get-context-facelist context)) text))) -(defun murk-display-action (server from to action-text) +(defun murk-display-action (network from to action-text) (let ((context (if (string-prefix-p "#" to) - (murk-get-context server to) - (murk-get-context server)))) + (murk-get-context network to) + (murk-get-context network)))) (murk-display-string context (propertize @@ -739,14 +739,14 @@ The head of this list is always the current context.") ;;; Message evaluation ;; -(defun murk-eval-msg-string (server string) +(defun murk-eval-msg-string (network string) (if murk-debug (murk-display-string nil nil string)) (let* ((msg (murk-string->msg string))) - (murk-process-autoreplies server msg) + (murk-process-autoreplies network msg) (pcase (murk-msg-cmd msg) ("PING" - (murk-send-msg server + (murk-send-msg network (murk-msg nil nil "PONG" (murk-msg-params msg)))) ("PONG") @@ -755,14 +755,14 @@ The head of this list is always the current context.") (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 (murk-get-context server) text))) + (murk-set-connection-nick network nick) + (murk-display-notice (murk-get-context network) text))) ("353" ; NAMEREPLY (let* ((params (murk-msg-params msg)) (channel (elt params 2)) (names (split-string (elt params 3))) - (ctx (murk-get-context server channel))) + (ctx (murk-get-context network channel))) (if ctx (murk-add-context-users ctx names) (murk-display-notice nil "Users in " channel @@ -771,7 +771,7 @@ The head of this list is always the current context.") ("366" ; ENDOFNAMES (let* ((params (murk-msg-params msg)) (channel (elt params 1)) - (ctx (murk-get-context server channel))) + (ctx (murk-get-context network channel))) (if ctx (murk-display-notice ctx @@ -782,88 +782,88 @@ The head of this list is always the current context.") ("331" ; RPL_NOTOPIC (let* ((params (murk-msg-params msg)) (channel (elt params 1)) - (ctx (murk-get-context server channel))) + (ctx (murk-get-context network channel))) (murk-display-notice ctx "No topic set."))) ("332" ; RPL_TOPIC (let* ((params (murk-msg-params msg)) (channel (elt params 1)) (topic (elt params 2)) - (ctx (murk-get-context server channel))) + (ctx (murk-get-context network channel))) (murk-display-notice ctx "Topic: " topic))) ((rx (= 3 (any digit))) - (murk-display-notice (murk-get-context server) + (murk-display-notice (murk-get-context network) (mapconcat 'identity (cdr (murk-msg-params msg)) " "))) ((and "JOIN" - (guard (equal (murk-connection-nick server) + (guard (equal (murk-connection-nick network) (murk-msg-src msg)))) (let ((channel (car (murk-msg-params msg)))) - (murk-add-context (list server channel nil)) + (murk-add-context (list network channel nil)) (murk-display-notice (murk-current-context) - "Joining channel " channel " on " server) + "Joining channel " channel " on " network) (murk-highlight-current-context) (murk-render-prompt))) ("JOIN" (let* ((channel (car (murk-msg-params msg))) (nick (murk-msg-src msg)) - (ctx (murk-get-context server channel))) + (ctx (murk-get-context network channel))) (murk-add-context-users ctx (list nick)) (if murk-show-joins (murk-display-notice ctx nick " joined channel " channel - " on " server)))) + " on " network)))) ((and "PART" - (guard (equal (murk-connection-nick server) + (guard (equal (murk-connection-nick network) (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-remove-context (list network channel)) (murk-highlight-current-context) (murk-render-prompt))) ("PART" (let* ((channel (car (murk-msg-params msg))) (nick (murk-msg-src msg)) - (ctx (murk-get-context server channel))) + (ctx (murk-get-context network channel))) (murk-del-context-user ctx nick) (if murk-show-joins (murk-display-notice ctx nick " left channel " channel - " on " server)))) + " on " network)))) ((and "NICK" - (guard (equal (murk-connection-nick server) + (guard (equal (murk-connection-nick network) (murk-msg-src msg)))) (let ((new-nick (car (murk-msg-params msg))) - (old-nick (murk-connection-nick server))) - (murk-set-connection-nick server new-nick) - (murk-rename-server-user server old-nick new-nick) - (murk-display-notice (murk-get-context server) - "Nick set to " new-nick " on " server))) + (old-nick (murk-connection-nick network))) + (murk-set-connection-nick network new-nick) + (murk-rename-network-user network old-nick new-nick) + (murk-display-notice (murk-get-context network) + "Nick set to " new-nick " on " network))) ("NICK" (let ((old-nick (murk-msg-src msg)) (new-nick (car (murk-msg-params msg)))) (murk-display-notice nil old-nick " is now known as " new-nick - " on " server) - (murk-rename-server-user server old-nick new-nick))) + " on " network) + (murk-rename-network-user network old-nick new-nick))) ("TOPIC" (let ((channel (car (murk-msg-params msg))) (nick (murk-msg-src msg)) (topic (cadr (murk-msg-params msg)))) - (murk-display-notice (murk-get-context server channel) + (murk-display-notice (murk-get-context network channel) nick " set the topic: " topic))) ("QUIT" (let ((nick (murk-msg-src msg)) (reason (mapconcat 'identity (murk-msg-params msg) " "))) - (murk-del-server-user server nick) + (murk-del-network-user network nick) (if murk-show-joins - (murk-display-notice (murk-get-context server) - nick " quit: " reason)))) + (murk-display-notice (murk-get-context network) + nick " on " network " has quit: " reason)))) ("NOTICE" (let ((nick (murk-msg-src msg)) @@ -873,10 +873,10 @@ The head of this list is always the current context.") ((rx (: "\01VERSION " (let version (* (not "\01"))) "\01")) - (murk-display-notice (murk-get-context server) + (murk-display-notice (murk-get-context network) "CTCP version reply from " nick ": " version)) (_ - (murk-display-notice (murk-get-context server channel) text))))) + (murk-display-notice (murk-get-context network channel) text))))) ("PRIVMSG" (let* ((from (murk-msg-src msg)) @@ -886,38 +886,38 @@ The head of this list is always the current context.") (pcase text ("\01VERSION\01" (let ((version-string (concat murk-version " - running on GNU Emacs " emacs-version))) - (murk-send-msg server + (murk-send-msg network (murk-msg nil nil "NOTICE" (list from (concat "\01VERSION " version-string "\01"))))) - (murk-display-notice (murk-get-context server) + (murk-display-notice (murk-get-context network) "CTCP version request received from " - from " on " server)) + from " on " network)) ((rx (let ping (: "\01PING " (* (not "\01")) "\01"))) - (murk-send-msg server (murk-msg nil nil "NOTICE" (list from ping))) - (murk-display-notice (murk-get-context server) - "CTCP ping received from " from " on " server)) + (murk-send-msg network (murk-msg nil nil "NOTICE" (list from ping))) + (murk-display-notice (murk-get-context network) + "CTCP ping received from " from " on " network)) ("\01USERINFO\01" - (murk-display-notice (murk-get-context server) + (murk-display-notice (murk-get-context network) "CTCP userinfo request from " from - " on " server " (no response sent)")) + " on " network " (no response sent)")) ("\01CLIENTINFO\01" - (murk-display-notice (murk-get-context server) + (murk-display-notice (murk-get-context network) "CTCP clientinfo request from " from - " on " server " (no response sent)")) + " on " network " (no response sent)")) ((rx (: "\01ACTION " (let action-text (* (not "\01"))) "\01")) - (murk-display-action server from to action-text)) + (murk-display-action network from to action-text)) (_ - (murk-display-message server from to text))))) + (murk-display-message network from to text))))) (_ - (murk-display-notice (murk-get-context server) + (murk-display-notice (murk-get-context network) (murk-msg->string msg)))))) @@ -932,23 +932,23 @@ The head of this list is always the current context.") nil) t)) -(defun murk-process-autoreply (server msg autoreply) +(defun murk-process-autoreply (network msg autoreply) (let ((matcher (car autoreply)) (reply (cadr autoreply))) - (let ((target-server (car matcher))) - (when (and (or (not target-server) - (and (equal server target-server))) + (let ((target-network (car matcher))) + (when (and (or (not target-network) + (and (equal network target-network))) (murk--lists-equal (cdr matcher) (append (list (murk-msg-src msg) (murk-msg-cmd msg)) (murk-msg-params msg)))) - (murk-send-msg server + (murk-send-msg network (murk-msg nil nil (car reply) (cdr reply))))))) -(defun murk-process-autoreplies (server msg) +(defun murk-process-autoreplies (network msg) (mapc (lambda (autoreply) - (murk-process-autoreply server msg autoreply)) + (murk-process-autoreply network msg autoreply)) murk-autoreply-table)) @@ -1035,35 +1035,35 @@ The head of this list is always the current context.") (defun murk-command-networks (_params) (murk-display-notice nil "Currently-known networks:") (dolist (row murk-networks) - (seq-let (network server port &rest _others) row + (seq-let (network network port &rest _others) row (murk-display-notice nil "\t" network - " [" server + " [" network " " (number-to-string port) "]"))) (murk-display-notice nil "(Modify the `murk-networks' variable to add more.)")) (defun murk-command-quit (params) (let ((ctx (murk-current-context))) (if (not ctx) - (murk-display-error "No current server") + (murk-display-error "No current network") (let ((quit-msg (if params (string-join params " ") murk-default-quit-msg))) (murk-send-msg - (murk-context-server ctx) + (murk-context-network ctx) (murk-msg nil nil "QUIT" quit-msg)))))) (defun murk-command-join (params) (if params - (let ((server (murk-context-server (murk-current-context)))) + (let ((network (murk-context-network (murk-current-context)))) (dolist (channel params) - (murk-send-msg server (murk-msg nil nil "JOIN" channel)))) + (murk-send-msg network (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))) + (let* ((network (murk-context-network (murk-current-context))) (channel (if params (car params) (murk-context-channel (murk-current-context))))) (if channel - (murk-send-msg server (murk-msg nil nil "PART" channel)) + (murk-send-msg network (murk-msg nil nil "PART" channel)) (murk-display-error "No current channel to leave")))) (defun murk-command-nick (params) @@ -1071,7 +1071,7 @@ The head of this list is always the current context.") (let ((new-nick (string-join params " ")) (ctx (murk-current-context))) (if ctx - (murk-send-msg (murk-context-server ctx) + (murk-send-msg (murk-context-network ctx) (murk-msg nil nil "NICK" new-nick)) (murk-display-error "No current connection"))) (murk-display-notice nil "Usage: /nick "))) @@ -1081,50 +1081,50 @@ The head of this list is always the current context.") (if ctx (if (not params) (murk-display-notice nil "This command can generate lots of output. Use `/LIST -yes' if you really want this, or `/LIST ' to reduce the output.") - (let ((server (murk-context-server ctx))) + (let ((network (murk-context-network ctx))) (if (equal (upcase (car params)) "-YES") - (murk-send-msg server (murk-msg nil nil "LIST")) - (murk-send-msg server (murk-msg nil nil "LIST" + (murk-send-msg network (murk-msg nil nil "LIST")) + (murk-send-msg network (murk-msg nil nil "LIST" (car params)))))) (murk-display-error "No current connection")))) (defun murk-command-topic (params) (let ((ctx (murk-current-context))) - (if (and ctx (not (murk-server-context-p ctx))) - (let ((server (murk-context-server ctx)) + (if (and ctx (not (murk-network-context-p ctx))) + (let ((network (murk-context-network ctx)) (channel (murk-context-channel ctx))) (if params - (murk-send-msg server + (murk-send-msg network (murk-msg nil nil "TOPIC" channel (string-join params " "))) - (murk-send-msg server + (murk-send-msg network (murk-msg nil nil "TOPIC" channel)))) (murk-display-notice nil "No current channel.")))) (defun murk-command-msg (params) - (let ((server (murk-context-server (murk-current-context)))) + (let ((network (murk-context-network (murk-current-context)))) (if (and params (>= (length params) 2)) (let ((to (car params)) (text (string-join (cdr params) " "))) - (murk-send-msg server (murk-msg nil nil "PRIVMSG" to text)) - (murk-display-message server - (murk-connection-nick server) + (murk-send-msg network (murk-msg nil nil "PRIVMSG" to text)) + (murk-display-message network + (murk-connection-nick network) to text)) (murk-display-notice nil "Usage: /msg ")))) (defun murk-command-me (params) (let* ((ctx (murk-current-context)) - (server (murk-context-server ctx))) - (if (and ctx (not (murk-server-context-p ctx))) + (network (murk-context-network ctx))) + (if (and ctx (not (murk-network-context-p ctx))) (if params (let* ((channel (murk-context-channel ctx)) - (my-nick (murk-connection-nick server)) + (my-nick (murk-connection-nick network)) (action (string-join params " ")) (ctcp-text (concat "\01ACTION " action "\01"))) - (murk-send-msg server + (murk-send-msg network (murk-msg nil nil "PRIVMSG" (list channel ctcp-text))) - (murk-display-action server my-nick channel action)) + (murk-display-action network my-nick channel action)) (murk-display-notice nil "Usage: /me ")) (murk-display-notice nil "No current channel.")))) @@ -1132,23 +1132,23 @@ The head of this list is always the current context.") (let ((ctx (murk-current-context))) (if ctx (if params - (let ((server (murk-context-server ctx)) + (let ((network (murk-context-network ctx)) (nick (car params))) - (murk-send-msg server + (murk-send-msg network (murk-msg nil nil "PRIVMSG" (list nick "\01VERSION\01"))) (murk-display-notice ctx "CTCP version request sent to " - nick " on " server)) + nick " on " network)) (murk-display-notice ctx "Usage: /version ")) (murk-display-notice nil "No current channel.")))) (defun murk-command-users (_params) (let ((ctx (murk-current-context))) - (if (and ctx (not (murk-server-context-p ctx))) + (if (and ctx (not (murk-network-context-p ctx))) (let ((channel (murk-context-channel ctx)) - (server (murk-context-server ctx)) + (network (murk-context-network ctx)) (users (murk-context-users ctx))) - (murk-display-notice ctx "Users in " channel " on " server ":") + (murk-display-notice ctx "Users in " channel " on " network ":") (murk-display-notice ctx (string-join users " "))) (murk-display-notice nil "No current channel.")))) @@ -1170,20 +1170,20 @@ The head of this list is always the current context.") (if (and command-row (elt command-row 2)) (funcall (elt command-row 2) params) (murk-send-msg - (murk-context-server (murk-current-context)) + (murk-context-network (murk-current-context)) (murk-msg nil nil (upcase cmd-str) params))))) (_ (murk-display-error "Badly formed command"))) (unless (string-empty-p string) (let ((ctx (murk-current-context))) (if ctx - (if (not (murk-server-context-p ctx)) - (let ((server (murk-context-server ctx)) + (if (not (murk-network-context-p ctx)) + (let ((network (murk-context-network ctx)) (channel (murk-context-channel ctx))) - (murk-send-msg server + (murk-send-msg network (murk-msg nil nil "PRIVMSG" channel string)) - (murk-display-message server - (murk-connection-nick server) + (murk-display-message network + (murk-connection-nick network) channel string)) (murk-display-error "No current channel")) (murk-display-error "No current context")))))) -- 2.20.1 From 44a80d963cfe3bdffc606d34d776a50fd05346a9 Mon Sep 17 00:00:00 2001 From: plugd Date: Fri, 24 May 2024 14:23:50 +0200 Subject: [PATCH 11/16] Added switchcontext command --- murk.el | 54 +++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 41 insertions(+), 13 deletions(-) diff --git a/murk.el b/murk.el index 8ea2fa3..708ed2c 100644 --- a/murk.el +++ b/murk.el @@ -365,10 +365,11 @@ The head of this list is always the current context.") murk-contexts))) (defun murk-context->string (ctx) + (concat (if (murk-network-context-p ctx) - (concat "[" (murk-context-network ctx) "]") - (concat (murk-context-channel ctx) "@" - (murk-context-network ctx)))) + "" + (concat (murk-context-channel ctx) "@")) + (murk-context-network ctx))) (defun murk-string->context (string) (if (not (string-prefix-p "#" string)) @@ -399,7 +400,8 @@ The head of this list is always the current context.") (setq murk-contexts (let* ((new-head (memq ctx murk-contexts)) (new-tail (take (- (length murk-contexts) - (length new-head))))) + (length new-head)) + murk-contexts))) (append new-head new-tail)))) (defun murk-add-context-users (ctx users) @@ -963,11 +965,12 @@ The head of this list is always the current context.") ("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) + ("PART" "Leave channel." murk-command-part murk-channel-completions) + ("SWITCHCONTEXT" "Switch current context" murk-command-switch-context murk-context-completions) ("NICK" "Change nick." murk-command-nick) ("LIST" "Display details of one or more channels." murk-command-list) ("TOPIC" "Set/query topic for current channel." murk-command-topic) - ("USERS" "List nicks of users in current context." murk-command-users) + ("USERS" "List nicks of users in current channel." murk-command-users) ("MSG" "Send private message to user." murk-command-msg murk-nick-completions) ("ME" "Display action." murk-command-me) ("VERSION" "Request version of another user's client via CTCP." murk-command-version murk-nick-completions) @@ -981,6 +984,19 @@ The head of this list is always the current context.") (defun murk-network-completions () (mapcar (lambda (row) (car row)) murk-networks)) +(defun murk-help-completions () + (mapcar (lambda (row) (car row)) murk-command-table)) + +(defun murk-channel-completions () + (mapcar (lambda (ctx) + (murk-context->string ctx)) + (seq-filter (lambda (ctx) + (not (murk-network-context-p ctx))) + murk-contexts))) + +(defun murk-context-completions () + (mapcar (lambda (ctx) (murk-context->string ctx)) murk-contexts)) + (defun murk-command-help (params) (if params (let* ((cmd-str (upcase (car params))) @@ -1058,13 +1074,25 @@ The head of this list is always the current context.") (murk-display-notice nil "Usage: /join channel [channel2 ...]"))) (defun murk-command-part (params) - (let* ((network (murk-context-network (murk-current-context))) - (channel (if params - (car params) - (murk-context-channel (murk-current-context))))) - (if channel - (murk-send-msg network (murk-msg nil nil "PART" channel)) - (murk-display-error "No current channel to leave")))) + (let ((ctx (cond + ((not params) (murk-current-context)) + ((seq-contains (car params) "@") (murk-string->context (car params))) + (t (list (murk-context-network (murk-current-context)) (car params)))))) + (let ((network (murk-context-network ctx)) + (channel (murk-context-channel ctx))) + (if channel + (murk-send-msg network (murk-msg nil nil "PART" channel)) + (murk-display-error "Specify which channel to leave"))))) + +(defun murk-command-switch-context (params) + (if (not params) + (murk-display-notice nil "Usage: /switchcontext #channel@network") + (let ((ctx (murk-string->context (car params)))) + (murk-switch-to-context ctx) + (murk-highlight-current-context) + (murk-render-prompt) + (if murk-zoomed + (murk-zoom-in (murk-current-context)))))) (defun murk-command-nick (params) (if params -- 2.20.1 From 2402ca25a34852367cd92b329c8fc2935e5d58b5 Mon Sep 17 00:00:00 2001 From: plugd Date: Sun, 26 May 2024 12:25:28 +0200 Subject: [PATCH 12/16] Added channel autojoin. --- murk.el | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/murk.el b/murk.el index 708ed2c..4e35c1a 100644 --- a/murk.el +++ b/murk.el @@ -621,12 +621,13 @@ The head of this list is always the current context.") (apply #'concat messages))) (defun murk-highlight-current-context () - (maphash - (lambda (this-context facelist) - (if (equal (take 2 this-context) (take 2 (murk-current-context))) - (setcar facelist 'murk-text) - (setcar facelist 'murk-faded))) - murk-context-facelists) + (with-current-buffer "*murk*" + (maphash + (lambda (this-context facelist) + (if (equal (take 2 this-context) (take 2 (murk-current-context))) + (setcar facelist 'murk-text) + (setcar facelist 'murk-faded))) + murk-context-facelists)) (force-window-update "*murk*")) (defun murk-zoom-in (context) @@ -758,7 +759,13 @@ The head of this list is always the current context.") (nick (elt params 0)) (text (string-join (seq-drop params 1) " "))) (murk-set-connection-nick network nick) - (murk-display-notice (murk-get-context network) text))) + (murk-display-notice (murk-get-context network) text)) + (let* ((row (assoc network murk-networks)) + (channels (if (memq :channels row) + (cdr (memq :channels row)) + nil))) + (dolist (channel channels) + (murk-command-join (list channel))))) ("353" ; NAMEREPLY (let* ((params (murk-msg-params msg)) @@ -767,7 +774,7 @@ The head of this list is always the current context.") (ctx (murk-get-context network channel))) (if ctx (murk-add-context-users ctx names) - (murk-display-notice nil "Users in " channel + (murk-display-notice ctx "Users in " channel ": " (string-join names " "))))) ("366" ; ENDOFNAMES @@ -779,7 +786,8 @@ The head of this list is always the current context.") ctx (murk--as-string (length (murk-context-users ctx))) " users in " channel) - (murk-display-notice nil "End of " channel " names list.")))) + (murk-display-notice (murk-get-context network) + "End of " channel " names list.")))) ("331" ; RPL_NOTOPIC (let* ((params (murk-msg-params msg)) @@ -848,7 +856,8 @@ The head of this list is always the current context.") ("NICK" (let ((old-nick (murk-msg-src msg)) (new-nick (car (murk-msg-params msg)))) - (murk-display-notice nil old-nick " is now known as " new-nick + (murk-display-notice (murk-get-context network) + old-nick " is now known as " new-nick " on " network) (murk-rename-network-user network old-nick new-nick))) @@ -1108,7 +1117,9 @@ The head of this list is always the current context.") (let ((ctx (murk-current-context))) (if ctx (if (not params) - (murk-display-notice nil "This command can generate lots of output. Use `/LIST -yes' if you really want this, or `/LIST ' to reduce the output.") + (murk-display-notice nil "This command can generate lots of output." + " Use `/LIST -yes' if you really want this," + " or `/LIST ' to reduce the output.") (let ((network (murk-context-network ctx))) (if (equal (upcase (car params)) "-YES") (murk-send-msg network (murk-msg nil nil "LIST")) -- 2.20.1 From 0a49a839c3407146f869af552dfdce60f31a4519 Mon Sep 17 00:00:00 2001 From: plugd Date: Sun, 26 May 2024 16:35:15 +0200 Subject: [PATCH 13/16] Extracted users from contexts. --- murk.el | 81 +++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 50 insertions(+), 31 deletions(-) diff --git a/murk.el b/murk.el index 4e35c1a..20d8b06 100644 --- a/murk.el +++ b/murk.el @@ -308,7 +308,7 @@ portion of the source component of the message, as mURK doesn't use this.") ;;; Contexts ;; -;; A context is a list (network channel users) identifying the network +;; A context is a list (network channel) identifying the network ;; and channel. The tail of the list contains the nicks of users ;; present in the channel. ;; @@ -340,12 +340,6 @@ The head of this list is always the current context.") (defun murk-context-channel (ctx) (elt ctx 1)) -(defun murk-context-users (ctx) - (elt ctx 2)) - -(defun murk-set-context-users (ctx users) - (setcar (cddr ctx) users)) - (defun murk-network-context-p (ctx) (not (cdr ctx))) @@ -404,15 +398,31 @@ The head of this list is always the current context.") murk-contexts))) (append new-head new-tail)))) +;;; Context users +;; + +(defvar murk-context-users nil + "Association list between channel contexts and users.") + +(defun murk-get-context-users (ctx) + (cdr (assoc ctx murk-context-users))) + +(defun murk-set-context-users (ctx users) + (setq murk-context-users + (cons (cons ctx users) (assoc-delete-all ctx murk-context-users)))) + (defun murk-add-context-users (ctx users) (murk-set-context-users ctx - (cl-union users (murk-context-users ctx)))) + (cl-union users (murk-get-context-users ctx)))) (defun murk-del-context-user (ctx user) (murk-set-context-users ctx - (delete user (murk-context-users ctx)))) + (delete user (murk-get-context-users ctx)))) + +(defun murk-del-all-context-users (ctx) + (murk-set-context-users ctx nil)) (defun murk-del-network-user (network user) (dolist (ctx murk-contexts) @@ -420,13 +430,20 @@ The head of this list is always the current context.") (not (murk-network-context-p ctx))) (murk-del-context-user ctx user)))) +(defun murk-del-all-network-users (network) + (dolist (ctx murk-contexts) + (if (and (equal (murk-context-network ctx) network) + (not (murk-network-context-p ctx))) + (murk-del-all-context-users ctx)))) + (defun murk-rename-network-user (network old-nick new-nick) (dolist (ctx murk-contexts) (when (and (equal (murk-context-network ctx) network) - (member old-nick (murk-context-users ctx))) + (member old-nick (murk-get-context-users ctx))) (murk-del-context-user ctx old-nick) (murk-add-context-users ctx (list new-nick))))) + ;;; Buffer ;; @@ -485,7 +502,7 @@ The head of this list is always the current context.") (murk-context-channel ctx) " (" (number-to-string - (length (murk-context-users ctx))) + (length (murk-get-context-users ctx))) ")")))) "No connection"))))))) @@ -533,11 +550,10 @@ The head of this list is always the current context.") "List of seen contexts and associated face lists.") (defun murk-get-context-facelist (context) - (let* ((short-ctx (take 2 context)) - (facelist (gethash short-ctx murk-context-facelists))) + (let* ((facelist (gethash context murk-context-facelists))) (unless facelist (setq facelist (list 'murk-text)) - (puthash short-ctx facelist murk-context-facelists)) + (puthash context facelist murk-context-facelists)) facelist)) (defun murk--fill-strings (col indent &rest strings) @@ -557,11 +573,10 @@ The head of this list is always the current context.") (old-pos (marker-position murk-prompt-marker)) (padded-timestamp (concat (format-time-string "%H:%M "))) (padded-prefix (if prefix (concat prefix " ") "")) - (short-ctx (take 2 context)) - (context-atom (if short-ctx - (intern (murk-context->string short-ctx)) + (context-atom (if context + (intern (murk-context->string context)) nil)) - (context-face (murk-get-context-facelist short-ctx))) + (context-face (murk-get-context-facelist context))) (insert-before-markers (murk--fill-strings 80 @@ -570,17 +585,17 @@ The head of this list is always the current context.") (propertize padded-timestamp 'face 'murk-timestamp 'read-only t - 'context short-ctx + 'context context 'invisible context-atom) (propertize padded-prefix 'read-only t - 'context short-ctx + 'context context 'invisible context-atom) (murk-add-formatting (propertize (concat (apply #'murk-buttonify-urls strings) "\n") 'face context-face 'read-only t - 'context short-ctx + 'context context 'invisible context-atom))))))) (murk-scroll-windows-to-last-line)) @@ -624,7 +639,7 @@ The head of this list is always the current context.") (with-current-buffer "*murk*" (maphash (lambda (this-context facelist) - (if (equal (take 2 this-context) (take 2 (murk-current-context))) + (if (equal this-context (murk-current-context)) (setcar facelist 'murk-text) (setcar facelist 'murk-faded))) murk-context-facelists)) @@ -637,7 +652,7 @@ The head of this list is always the current context.") (when this-context (let ((this-context-atom (intern (murk-context->string this-context)))) - (if (equal this-context (take 2 context)) + (if (equal this-context context) (remove-from-invisibility-spec this-context-atom) (add-to-invisibility-spec this-context-atom))))) murk-context-facelists) @@ -784,7 +799,7 @@ The head of this list is always the current context.") (if ctx (murk-display-notice ctx - (murk--as-string (length (murk-context-users ctx))) + (murk--as-string (length (murk-get-context-users ctx))) " users in " channel) (murk-display-notice (murk-get-context network) "End of " channel " names list.")))) @@ -809,8 +824,10 @@ The head of this list is always the current context.") ((and "JOIN" (guard (equal (murk-connection-nick network) (murk-msg-src msg)))) - (let ((channel (car (murk-msg-params msg)))) - (murk-add-context (list network channel nil)) + (let* ((channel (car (murk-msg-params msg))) + (context (list network channel))) + (murk-add-context context) + (murk-del-all-context-users context) (murk-display-notice (murk-current-context) "Joining channel " channel " on " network) (murk-highlight-current-context) @@ -828,9 +845,11 @@ The head of this list is always the current context.") ((and "PART" (guard (equal (murk-connection-nick network) (murk-msg-src msg)))) - (let ((channel (car (murk-msg-params msg)))) - (murk-display-notice (murk-current-context) "Left channel " channel) - (murk-remove-context (list network channel)) + (let* ((channel (car (murk-msg-params msg))) + (context (list network channel))) + (murk-display-notice context "Left channel " channel) + (murk-remove-context context) + (murk-del-all-context-users context) (murk-highlight-current-context) (murk-render-prompt))) @@ -1186,7 +1205,7 @@ The head of this list is always the current context.") (if (and ctx (not (murk-network-context-p ctx))) (let ((channel (murk-context-channel ctx)) (network (murk-context-network ctx)) - (users (murk-context-users ctx))) + (users (murk-get-context-users ctx))) (murk-display-notice ctx "Users in " channel " on " network ":") (murk-display-notice ctx (string-join users " "))) (murk-display-notice nil "No current channel.")))) @@ -1322,7 +1341,7 @@ The head of this list is always the current context.") (re-search-backward " " murk-input-marker t))) (start (if space-idx (+ 1 space-idx) murk-input-marker))) (unless (string-prefix-p "/" (buffer-substring start end)) - (let* ((users (murk-context-users (murk-current-context))) + (let* ((users (murk-get-context-users (murk-current-context))) (users-no@ (mapcar (lambda (u) (car (split-string u "@" t))) users))) -- 2.20.1 From 85e71a387dc514bc7de3e497408ff211b458a657 Mon Sep 17 00:00:00 2001 From: plugd Date: Sun, 26 May 2024 20:50:39 +0200 Subject: [PATCH 14/16] Added context buttons. --- murk.el | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/murk.el b/murk.el index 20d8b06..b438aa3 100644 --- a/murk.el +++ b/murk.el @@ -599,6 +599,23 @@ The head of this list is always the current context.") 'invisible context-atom))))))) (murk-scroll-windows-to-last-line)) +(defun murk-click-context (button) + (murk-switch-to-context (button-get button 'context)) + (murk-highlight-current-context) + (murk-render-prompt) + (if murk-zoomed + (murk-zoom-in (murk-current-context)))) + +(defun murk-make-context-button (context &optional string) + (with-temp-buffer + (let ((label (or string (murk-context->string context)))) + (insert-text-button label + 'action #'murk-click-context + 'context context + 'follow-link t + 'help-echo "Switch context")) + (buffer-string))) + (defun murk-display-message (network from to text) (let ((context (if (string-prefix-p "#" to) (murk-get-context network to) @@ -608,7 +625,9 @@ The head of this list is always the current context.") (propertize (if (murk-network-context-p context) (concat "[" from "->" to "]") - (concat (murk-context->string context) " <" from ">")) + (concat + (murk-make-context-button context) + " <" from ">")) 'face (murk-get-context-facelist context)) text))) -- 2.20.1 From 8981ad226a61b893b279e64a86cba35005708a04 Mon Sep 17 00:00:00 2001 From: plugd Date: Sun, 26 May 2024 21:25:11 +0200 Subject: [PATCH 15/16] Merged murk back into lurk. --- lurk.el | 1112 +++++++++++++++++++++++++------------------ murk.el | 1407 ------------------------------------------------------- 2 files changed, 655 insertions(+), 1864 deletions(-) delete mode 100644 murk.el diff --git a/lurk.el b/lurk.el index 52ee3b6..8114597 100644 --- a/lurk.el +++ b/lurk.el @@ -1,13 +1,13 @@ ;;; lurk.el --- Little Unibuffer iRc Klient -*- lexical-binding:t -*- -;; Copyright (C) 2021 Tim Vaughan +;; Copyright (C) 2021--2024 plugd -;; Author: Tim Vaughan +;; Author: plugd ;; Created: 14 June 2021 -;; Version: 1.0 -;; Keywords: network +;; Version: 2.0 ;; Homepage: http://thelambdalab.xyz/lurk -;; Package-Requires: ((emacs "26")) +;; Keywords: comm +;; Package-Requires: ((emacs "26.1")) ;; This file is not part of GNU Emacs. @@ -26,43 +26,68 @@ ;;; Commentary: +;; A very simple IRC client which uses only a single buffer. + ;;; Code: (provide 'lurk) +(require 'cl-lib) + ;;; Customizations -;; (defgroup lurk nil - "Little Unibuffer iRc Klient." + "Multinetwork Unibuffer iRc Klient" :group 'network) -(defcustom lurk-nick "plugd" - "Default nick.") +(defcustom lurk-default-nick "plugd" + "Default nick." + :type '(string)) (defcustom lurk-default-quit-msg "Bye" - "Default quit message when none supplied.") + "Default quit message when none supplied." + :type '(string)) (defcustom lurk-networks - '(("libera" "irc.libera.chat" 6697)) - "IRC networks.") - -(defcustom lurk-allow-ipv6 nil - "Set to non-nil to allow use of IPv6.") + '(("libera" "irc.libera.chat" 6697) + ("tilde" "tilde.chat" 6697) + ("sdf" "irc.sdf.org" 6697)) + "IRC networks." + :type '(alist :key-type string)) (defcustom lurk-show-joins nil "Set to non-nil to be notified of joins, parts and quits.") (defcustom lurk-display-header t - "If non-nil, use buffer header to display information on current host and channel.") + "If non-nil, use buffer header to display current host and channel." + :type '(boolean)) + +(defcustom lurk-autoreply-table nil + "Table of autoreply messages. + +Each autoreply is a list of two elements: (matcher reply) + +Here matcher is a list: + +(network src cmd params ...) + +and reply is another list: + + (cmd params ...) + +Each entry in the matcher list is a regular expression tested against the +corresponding values in the incomming message. Entries can be nil, +in which case they match anything." + :type '(list (list) (list))) + ;;; Faces ;; (defface lurk-text '((t :inherit default)) - "Face used for Lurk text.") + "Face used for lurk text.") (defface lurk-prompt '((t :inherit font-lock-keyword-face)) @@ -74,7 +99,7 @@ (defface lurk-faded '((t :inherit shadow)) - "Face used for faded Lurk text.") + "Face used for faded lurk text.") (defface lurk-timestamp '((t :inherit shadow)) @@ -82,22 +107,21 @@ (defface lurk-error '((t :inherit error)) - "Face used for Lurk error text.") + "Face used for lurk error text.") (defface lurk-notice '((t :inherit warning)) - "Face used for Lurk notice text.") + "Face used for lurk notice text.") + ;;; Global variables ;; -(defvar lurk-version "Lurk v0.1" +(defvar lurk-version "Lurk v0.0" "Value of this string is used in response to CTCP version queries.") (defvar lurk-notice-prefix "-!-") - (defvar lurk-error-prefix "!!!") - (defvar lurk-prompt-string ">") (defvar lurk-debug nil @@ -116,36 +140,65 @@ nil)) -;;; Network process +;;; Network processes ;; -(defvar lurk-response "") +(defvar lurk-connection-table nil + "An alist associating networks to connection information. +This includes the process and the response string.") -(defun lurk-filter (proc string) - (dolist (line (split-string (concat lurk-response string) "\n")) - (if (string-suffix-p "\r" line) - (lurk-eval-msg-string (string-trim line)) - (setq lurk-response line)))) +(defun lurk-connection-process (network) + (elt (assoc network lurk-connection-table) 1)) -(defun lurk-sentinel (proc string) - (unless (equal "open" (string-trim string)) - (lurk-display-error "Disconnected from server.") - (clrhash lurk-contexts) - (lurk-set-current-context nil) - (lurk-render-prompt) - (cancel-timer lurk-ping-timer))) +(defun lurk-connection-nick (network) + (elt (assoc network lurk-connection-table) 2)) + +(defun lurk-set-connection-nick (network nick) + (setf (elt (assoc network lurk-connection-table) 2) nick)) + +(defun lurk-connection-response (network) + (elt (assoc network lurk-connection-table) 3)) + +(defun lurk-set-connection-response (network string) + (setf (elt (assoc network lurk-connection-table) 3) string)) + +(defun lurk-connection-new (network process nick) + (add-to-list 'lurk-connection-table + (list network process nick ""))) + +(defun lurk-connection-remove (network) + (setq lurk-connection-table + (seq-remove (lambda (row) (equal (car row) network)) + lurk-connection-table))) + +(defun lurk-make-network-filter (network) + (lambda (_proc string) + (dolist (line (split-string (concat (lurk-connection-response network) string) + "\n")) + (if (string-suffix-p "\r" line) + (lurk-eval-msg-string network (string-trim line)) + (lurk-set-connection-response network line))))) + +(defun lurk-make-network-sentinel (network) + (lambda (_proc string) + (unless (equal "open" (string-trim string)) + (lurk-display-error "Disconnected from network.") + (lurk-connection-remove network) + (lurk-remove-network-contexts network) + (lurk-highlight-current-context) + (lurk-render-prompt)))) (defun lurk-start-process (network) (let* ((row (assoc network lurk-networks)) (host (elt row 1)) (port (elt row 2)) (flags (seq-drop row 3))) - (make-network-process :name "lurk" + (make-network-process :name (concat "lurk-" network) :host host :service port - :family (if lurk-allow-ipv6 nil 'ipv4) - :filter #'lurk-filter - :sentinel #'lurk-sentinel + :family nil + :filter (lurk-make-network-filter network) + :sentinel (lurk-make-network-sentinel network) :nowait nil :tls-parameters (if (memq :notls flags) nil @@ -155,40 +208,33 @@ :hostname host))) :buffer "*lurk*"))) -(defvar lurk-ping-timer nil) (defvar lurk-ping-period 60) -(defun lurk-ping-function () - (lurk-send-msg (lurk-msg nil nil "PING" (car (process-contact (get-process "lurk"))))) - (setq lurk-ping-timer (run-with-timer lurk-ping-period nil #'lurk-ping-function))) +;; IDEA: Have a single ping timer which pings all connected hosts (defun lurk-connect (network) - (if (get-process "lurk") - (lurk-display-error "Already connected. Disconnect first.") + (if (assoc network lurk-connection-table) + (lurk-display-error "Already connected to this network") (if (not (assoc network lurk-networks)) (lurk-display-error "Network '" network "' is unknown.") - (clrhash lurk-contexts) - (lurk-set-current-context nil) - (lurk-start-process network) - (lurk-send-msg (lurk-msg nil nil "USER" lurk-nick 0 "*" lurk-nick)) - (lurk-send-msg (lurk-msg nil nil "NICK" lurk-nick)) - (setq lurk-ping-timer (run-with-timer lurk-ping-period nil #'lurk-ping-function))))) - -(defun lurk-connected-p () - (let ((proc (get-process "lurk"))) - (and proc (eq (process-status proc) 'open)))) - -(defun lurk-send-msg (msg) + (let ((proc (lurk-start-process network))) + (lurk-connection-new network proc lurk-default-nick)) + (lurk-send-msg network (lurk-msg nil nil "USER" lurk-default-nick 0 "*" lurk-default-nick)) + (lurk-send-msg network (lurk-msg nil nil "NICK" lurk-default-nick)) + (lurk-add-context (list network)) + (lurk-highlight-current-context) + (lurk-render-prompt)))) + +(defun lurk-send-msg (network msg) (if lurk-debug (lurk-display-string nil nil (lurk-msg->string msg))) - (let ((proc (get-process "lurk"))) + (let ((proc (lurk-connection-process network))) (if (and proc (eq (process-status proc) 'open)) (process-send-string proc (concat (lurk-msg->string msg) "\r\n")) - (lurk-display-error "No server connection established.") - (error "No server connection established")))) + (lurk-display-error "No network connection established")))) -;;; Server messages +;;; network messages ;; (defun lurk-msg (tags src cmd &rest params) @@ -221,7 +267,7 @@ (opt (group (+ not-newline)))) "Regex used to parse IRC messages. Note that this regex is incomplete. Noteably, we discard the non-nick -portion of the source component of the message, as LURK doesn't use this.") +portion of the source component of the message, as lurk doesn't use this.") (defun lurk-string->msg (string) (if (string-match lurk-msg-regex string) @@ -231,13 +277,13 @@ portion of the source component of the message, as LURK doesn't use this.") (params-str (match-string 4 string)) (params (if params-str - (let* ((idx (cl-search ":" params-str)) + (let* ((idx (seq-position params-str ?:)) (l (split-string (string-trim (substring params-str 0 idx)))) (r (if idx (list (substring params-str (+ 1 idx))) nil))) (append l r)) nil))) (apply #'lurk-msg (append (list tags src cmd) params))) - (error "Failed to parse string " string))) + (error "Failed to parse string %s" string))) (defun lurk-msg->string (msg) (let ((tags (lurk-msg-tags msg)) @@ -259,81 +305,152 @@ portion of the source component of the message, as LURK doesn't use this.") ;;; Contexts ;; -(defvar lurk-current-context nil) -(defvar lurk-contexts (make-hash-table :test #'equal)) - -(defun lurk-add-context (name) - (puthash name nil lurk-contexts)) - -(defun lurk-del-context (name) - (remhash name lurk-contexts)) - -(defun lurk-get-context-users (name) - (gethash name lurk-contexts)) - -(defun lurk-context-known-p (name) - (not (eq (gethash name lurk-contexts 0) 0))) - -(defun lurk-add-context-users (context users) - (puthash context - (cl-union users - (gethash context lurk-contexts)) - lurk-contexts)) - -(defun lurk-del-context-user (context user) - (puthash context - (remove user (gethash context lurk-contexts)) - lurk-contexts)) - -(defun lurk-del-user (user) - (dolist (context (lurk-get-context-list)) - (lurk-del-context-user context user))) - -(defun lurk-rename-user (old-nick new-nick) - (dolist (context (lurk-get-context-list)) - (lurk-del-context-user context old-nick) - (lurk-add-context-users context (list new-nick)))) - -(defun lurk-get-context-type (name) - (cond - ((string-prefix-p "#" name) 'channel) - ((string-match-p (rx (or "." "localhost")) name) 'host) - (t 'nick))) - -(defun lurk-get-context-list () - (let ((res nil)) - (maphash (lambda (key val) - (cl-pushnew key res)) - lurk-contexts) - res)) - -(defun lurk-get-next-context (&optional prev) - (if lurk-current-context - (let* ((context-list (if prev - (reverse (lurk-get-context-list)) - (lurk-get-context-list))) - (context-list* (member lurk-current-context context-list))) - (if (> (length context-list*) 1) - (cadr context-list*) - (car context-list))) +;; A context is a list (network channel) identifying the network +;; and channel. The tail of the list contains the nicks of users +;; present in the channel. +;; +;; Each network has a special context (network) used for messages +;; to/from the network itself. + +(defvar lurk-contexts nil + "List of currently-available contexts. +The head of this list is always the current context.") + +(defun lurk-current-context () + "Return the current context." + (if lurk-contexts + (car lurk-contexts) nil)) -(defun lurk-set-current-context (context) - (setq lurk-current-context context) - (lurk-highlight-context context) - (lurk-render-prompt) - (if lurk-zoomed - (lurk-zoom-in lurk-current-context))) +(defun lurk-contexts-equal (c1 c2) + (if (lurk-network-context-p c1) + (and (lurk-network-context-p c2) + (equal (lurk-context-network c1) + (lurk-context-network c2))) + (and (not (lurk-network-context-p c2)) + (equal (seq-take c1 2) + (seq-take c2 2))))) + +(defun lurk-context-network (ctx) + (elt ctx 0)) + +(defun lurk-context-channel (ctx) + (elt ctx 1)) + +(defun lurk-network-context-p (ctx) + (not (cdr ctx))) + +(defun lurk-add-context (ctx) + (add-to-list 'lurk-contexts ctx)) + +(defun lurk-remove-context (ctx) + (setq lurk-contexts + (seq-remove + (lambda (this-ctx) + (lurk-contexts-equal this-ctx ctx)) + lurk-contexts))) + +(defun lurk-remove-network-contexts (network) + (setq lurk-contexts + (seq-remove (lambda (row) (equal (car row) network)) + lurk-contexts))) + +(defun lurk-context->string (ctx) + (concat + (if (lurk-network-context-p ctx) + "" + (concat (lurk-context-channel ctx) "@")) + (lurk-context-network ctx))) + +(defun lurk-string->context (string) + (if (not (string-prefix-p "#" string)) + (lurk-get-context string) + (let* ((parts (string-split string "@")) + (channel (elt parts 0)) + (network (elt parts 1))) + (lurk-get-context network channel)))) + +(defun lurk-get-context (network &optional channel) + (if (and channel (string-prefix-p "#" channel)) + (let ((test-ctx (list network channel))) + (seq-find (lambda (ctx) + (equal (seq-take ctx 2) test-ctx)) + lurk-contexts)) + (car (member (list network) lurk-contexts)))) + +(defun lurk-cycle-contexts (&optional reverse) + (setq lurk-contexts + (if reverse + (let ((nminus1 (- (length lurk-contexts) 1))) + (cons + (elt lurk-contexts nminus1) + (seq-take lurk-contexts nminus1))) + (append (cdr lurk-contexts) (list (car lurk-contexts)))))) + +(defun lurk-switch-to-context (ctx) + (setq lurk-contexts + (let* ((new-head (memq ctx lurk-contexts)) + (new-tail (take (- (length lurk-contexts) + (length new-head)) + lurk-contexts))) + (append new-head new-tail)))) + + +;;; Context users +;; + +(defvar lurk-context-users nil + "Association list between channel contexts and users.") + +(defun lurk-get-context-users (ctx) + (cdr (assoc ctx lurk-context-users))) + +(defun lurk-set-context-users (ctx users) + (setq lurk-context-users + (cons (cons ctx users) (assoc-delete-all ctx lurk-context-users)))) + +(defun lurk-add-context-users (ctx users) + (lurk-set-context-users + ctx + (cl-union users (lurk-get-context-users ctx)))) + +(defun lurk-del-context-user (ctx user) + (lurk-set-context-users + ctx + (delete user (lurk-get-context-users ctx)))) -(defun lurk-cycle-contexts (&optional rev) - (if lurk-current-context - (lurk-set-current-context (lurk-get-next-context rev)) - (lurk-display-error "No channels joined."))) +(defun lurk-del-all-context-users (ctx) + (lurk-set-context-users ctx nil)) + +(defun lurk-del-network-user (network user) + (dolist (ctx lurk-contexts) + (if (and (equal (lurk-context-network ctx) network) + (not (lurk-network-context-p ctx))) + (lurk-del-context-user ctx user)))) + +(defun lurk-del-all-network-users (network) + (dolist (ctx lurk-contexts) + (if (and (equal (lurk-context-network ctx) network) + (not (lurk-network-context-p ctx))) + (lurk-del-all-context-users ctx)))) + +(defun lurk-rename-network-user (network old-nick new-nick) + (dolist (ctx lurk-contexts) + (when (and (equal (lurk-context-network ctx) network) + (member old-nick (lurk-get-context-users ctx))) + (lurk-del-context-user ctx old-nick) + (lurk-add-context-users ctx (list new-nick))))) ;;; Buffer ;; +(defvar lurk-prompt-marker nil + "Marker for prompt position in lurk buffer.") + +(defvar lurk-input-marker nil + "Marker for prompt position in lurk buffer.") + (defun lurk-render-prompt () (with-current-buffer "*lurk*" (let ((update-point (= lurk-input-marker (point))) @@ -348,9 +465,10 @@ portion of the source component of the message, as LURK doesn't use this.") (delete-region lurk-prompt-marker lurk-input-marker) (goto-char lurk-prompt-marker) (insert - (propertize (if lurk-current-context - lurk-current-context - "") + (propertize (let ((ctx (lurk-current-context))) + (if ctx + (lurk-context->string ctx) + "")) 'face 'lurk-context 'read-only t) (propertize lurk-prompt-string @@ -366,32 +484,25 @@ portion of the source component of the message, as LURK doesn't use this.") (if (car v) (set-window-point (cadr v) lurk-input-marker)))))) -(defvar lurk-prompt-marker nil - "Marker for prompt position in LURK buffer.") - -(defvar lurk-input-marker nil - "Marker for prompt position in LURK buffer.") - (defun lurk-setup-header () (with-current-buffer "*lurk*" (setq-local header-line-format '((:eval - (let ((proc (get-process "lurk"))) - (if proc - (concat - "Host: " (car (process-contact proc)) - ", Context: " - (if lurk-current-context + (let* ((ctx (lurk-current-context))) + (if ctx + (let ((network (lurk-context-network ctx))) + (concat + "Network: " network ", " + (if (lurk-network-context-p ctx) + "network" (concat - lurk-current-context + "Channel: " + (lurk-context-channel ctx) " (" (number-to-string - (length (lurk-get-context-users lurk-current-context))) - " users)") - "Server")) - "No connection"))) - (:eval - (if lurk-zoomed " [ZOOMED]" "")))))) + (length (lurk-get-context-users ctx))) + ")")))) + "No connection"))))))) (defun lurk-setup-buffer () (with-current-buffer (get-buffer-create "*lurk*") @@ -404,6 +515,7 @@ portion of the source component of the message, as LURK doesn't use this.") (set-marker lurk-input-marker (point-max)) (setq lurk-input-marker (point-max-marker))) (goto-char (point-max)) + (lurk-highlight-current-context) (lurk-render-prompt) (if lurk-display-header (lurk-setup-header)))) @@ -414,6 +526,7 @@ portion of the source component of the message, as LURK doesn't use this.") (let ((inhibit-read-only t)) (delete-region (point-min) lurk-prompt-marker)))) + ;;; Output formatting and highlighting ;; @@ -435,7 +548,7 @@ portion of the source component of the message, as LURK doesn't use this.") "List of seen contexts and associated face lists.") (defun lurk-get-context-facelist (context) - (let ((facelist (gethash context lurk-context-facelists))) + (let* ((facelist (gethash context lurk-context-facelists))) (unless facelist (setq facelist (list 'lurk-text)) (puthash context facelist lurk-context-facelists)) @@ -450,33 +563,6 @@ portion of the source component of the message, as LURK doesn't use this.") (fill-region (point-min) (point-max) nil t) (buffer-string)))) -(defun lurk--start-of-final-line () - (with-current-buffer "*lurk*" - (save-excursion - (goto-char (point-max)) - (line-beginning-position)))) - -(defun lurk-scroll-windows-to-last-line () - (with-current-buffer "*lurk*" - (dolist (window (get-buffer-window-list)) - (if (>= (window-point window) (lurk--start-of-final-line)) - (with-selected-window window - (recenter -1)))))) - -(defun lurk-make-context-button (context &optional label) - (with-temp-buffer - (insert-text-button (or label context) - 'action #'lurk--context-button-action - 'follow-link t - 'help-echo "Switch context.") - (buffer-string))) - -(defun lurk--context-button-action (button) - (let ((context (button-get button 'context))) - (if (eq lurk-current-context context) - (lurk-toggle-zoom) - (lurk-set-current-context context)))) - (defun lurk-display-string (context prefix &rest strings) (with-current-buffer "*lurk*" (save-excursion @@ -485,7 +571,10 @@ 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 " ") "")) - (context-atom (if context (intern context) nil))) + (context-atom (if context + (intern (lurk-context->string context)) + nil)) + (context-face (lurk-get-context-facelist context))) (insert-before-markers (lurk--fill-strings 80 @@ -502,39 +591,54 @@ portion of the source component of the message, as LURK doesn't use this.") 'invisible context-atom) (lurk-add-formatting (propertize (concat (apply #'lurk-buttonify-urls strings) "\n") - 'face (lurk-get-context-facelist context) + 'face context-face 'read-only t 'context context 'invisible context-atom))))))) (lurk-scroll-windows-to-last-line)) -(defun lurk-display-message (from to text) - (let ((context (if (eq 'channel (lurk-get-context-type to)) - to - (if (equal to lurk-nick) from to)))) +(defun lurk-click-context (button) + (lurk-switch-to-context (button-get button 'context)) + (lurk-highlight-current-context) + (lurk-render-prompt) + (if lurk-zoomed + (lurk-zoom-in (lurk-current-context)))) + +(defun lurk-make-context-button (context &optional string) + (with-temp-buffer + (let ((label (or string (lurk-context->string context)))) + (insert-text-button label + 'action #'lurk-click-context + 'context context + 'follow-link t + 'help-echo "Switch context")) + (buffer-string))) + +(defun lurk-display-message (network from to text) + (let ((context (if (string-prefix-p "#" to) + (lurk-get-context network to) + (lurk-get-context network)))) (lurk-display-string context (propertize - (pcase (lurk-get-context-type to) - ('channel (concat - (lurk-make-context-button to) - " <" from ">")) - ('nick (lurk-make-context-button context (concat "[" from " -> " to "]"))) - (_ - (error "Unsupported context type"))) + (if (lurk-network-context-p context) + (concat "[" from "->" to "]") + (concat + (lurk-make-context-button context) + " <" from ">")) 'face (lurk-get-context-facelist context)) text))) -(defun lurk-display-action (from to action-text) - (let ((context (if (eq 'channel (lurk-get-context-type to)) - to - (if (equal to lurk-nick) from to)))) +(defun lurk-display-action (network from to action-text) + (let ((context (if (string-prefix-p "#" to) + (lurk-get-context network to) + (lurk-get-context network)))) (lurk-display-string context (propertize - (concat (lurk-make-context-button context) " * " from) + (concat (lurk-context->string context) " *") 'face (lurk-get-context-facelist context)) - action-text))) + from " " action-text))) (defun lurk-display-notice (context &rest notices) (lurk-display-string @@ -548,13 +652,14 @@ portion of the source component of the message, as LURK doesn't use this.") (propertize lurk-error-prefix 'face 'lurk-error) (apply #'concat messages))) -(defun lurk-highlight-context (context) - (maphash - (lambda (this-context facelist) - (if (equal this-context context) - (setcar facelist 'lurk-text) - (setcar facelist 'lurk-faded))) - lurk-context-facelists) +(defun lurk-highlight-current-context () + (with-current-buffer "*lurk*" + (maphash + (lambda (this-context facelist) + (if (equal this-context (lurk-current-context)) + (setcar facelist 'lurk-text) + (setcar facelist 'lurk-faded))) + lurk-context-facelists)) (force-window-update "*lurk*")) (defun lurk-zoom-in (context) @@ -562,7 +667,8 @@ portion of the source component of the message, as LURK doesn't use this.") (maphash (lambda (this-context _) (when this-context - (let ((this-context-atom (intern this-context))) + (let ((this-context-atom + (intern (lurk-context->string this-context)))) (if (equal this-context context) (remove-from-invisibility-spec this-context-atom) (add-to-invisibility-spec this-context-atom))))) @@ -574,21 +680,27 @@ portion of the source component of the message, as LURK doesn't use this.") (with-current-buffer "*lurk*" (maphash (lambda (this-context _) - (let ((this-context-atom (if this-context (intern this-context) nil))) + (let ((this-context-atom + (if this-context + (intern (lurk-context->string this-context)) + nil))) (remove-from-invisibility-spec this-context-atom))) lurk-context-facelists) (force-window-update "*lurk*")) (lurk-scroll-windows-to-last-line)) -(defun lurk-clear-context (context) +(defun lurk--start-of-final-line () (with-current-buffer "*lurk*" (save-excursion - (goto-char (point-min)) - (let ((inhibit-read-only t) - (match nil)) - (while (setq match (text-property-search-forward 'context context t)) - (delete-region (prop-match-beginning match) - (prop-match-end match))))))) + (goto-char (point-max)) + (line-beginning-position)))) + +(defun lurk-scroll-windows-to-last-line () + (with-current-buffer "*lurk*" + (dolist (window (get-buffer-window-list)) + (if (>= (window-point window) (lurk--start-of-final-line)) + (with-selected-window window + (recenter -1)))))) (defconst lurk-url-regex (rx (: @@ -632,7 +744,7 @@ portion of the source component of the message, as LURK doesn't use this.") (strikethrough nil) (prev-point (point))) (while (re-search-forward (rx (or (any "\x02\x1D\x1F\x1E\x0F") - (: "\x03" (+ digit) (opt "," (* digit))))) + (: "\x03" (* digit) (opt "," (* digit))))) nil t) (let ((beg (+ (match-beginning 0) 1))) (if bold @@ -662,124 +774,143 @@ portion of the source component of the message, as LURK doesn't use this.") ;;; Message evaluation ;; -(defun lurk-eval-msg-string (string) +(defun lurk-eval-msg-string (network string) (if lurk-debug (lurk-display-string nil nil string)) (let* ((msg (lurk-string->msg string))) - (lurk-process-autoreplies msg) + (lurk-process-autoreplies network msg) (pcase (lurk-msg-cmd msg) ("PING" - (lurk-send-msg + (lurk-send-msg network (lurk-msg nil nil "PONG" (lurk-msg-params msg)))) ("PONG") - ("001" + ("001" ; RPL_WELCOME (let* ((params (lurk-msg-params msg)) (nick (elt params 0)) (text (string-join (seq-drop params 1) " "))) - (setq lurk-nick nick) - (lurk-display-notice nil text))) + (lurk-set-connection-nick network nick) + (lurk-display-notice (lurk-get-context network) text)) + (let* ((row (assoc network lurk-networks)) + (channels (if (memq :channels row) + (cdr (memq :channels row)) + nil))) + (dolist (channel channels) + (lurk-command-join (list channel))))) ("353" ; NAMEREPLY (let* ((params (lurk-msg-params msg)) (channel (elt params 2)) - (names (split-string (elt params 3)))) - (if (lurk-context-known-p channel) - (lurk-add-context-users channel names) - (lurk-display-notice nil "Users in " channel ": " (string-join names " "))))) + (names (split-string (elt params 3))) + (ctx (lurk-get-context network channel))) + (if ctx + (lurk-add-context-users ctx names) + (lurk-display-notice ctx "Users in " channel + ": " (string-join names " "))))) ("366" ; ENDOFNAMES (let* ((params (lurk-msg-params msg)) - (channel (elt params 1))) - (if (lurk-context-known-p channel) + (channel (elt params 1)) + (ctx (lurk-get-context network channel))) + (if ctx (lurk-display-notice - channel - (lurk--as-string (length (lurk-get-context-users channel))) + ctx + (lurk--as-string (length (lurk-get-context-users ctx))) " users in " channel) - (lurk-display-notice nil "End of " channel " names list.")))) + (lurk-display-notice (lurk-get-context network) + "End of " channel " names list.")))) - ("331" + ("331" ; RPL_NOTOPIC (let* ((params (lurk-msg-params msg)) - (channel (elt params 1))) - (lurk-display-notice - channel - "No topic set."))) + (channel (elt params 1)) + (ctx (lurk-get-context network channel))) + (lurk-display-notice ctx "No topic set."))) - ("332" + ("332" ; RPL_TOPIC (let* ((params (lurk-msg-params msg)) (channel (elt params 1)) - (topic (elt params 2))) - (lurk-display-notice channel "Topic: " topic))) - - ("333") ; Avoid displaying these + (topic (elt params 2)) + (ctx (lurk-get-context network channel))) + (lurk-display-notice ctx "Topic: " topic))) ((rx (= 3 (any digit))) - (lurk-display-notice nil (mapconcat 'identity (cdr (lurk-msg-params msg)) " "))) + (lurk-display-notice (lurk-get-context network) + (mapconcat 'identity (cdr (lurk-msg-params msg)) " "))) ((and "JOIN" - (guard (equal lurk-nick (lurk-msg-src msg)))) - (let ((channel (car (lurk-msg-params msg)))) - (lurk-add-context channel) - (lurk-set-current-context channel) - (lurk-display-notice channel "Joining channel " channel) + (guard (equal (lurk-connection-nick network) + (lurk-msg-src msg)))) + (let* ((channel (car (lurk-msg-params msg))) + (context (list network channel))) + (lurk-add-context context) + (lurk-del-all-context-users context) + (lurk-display-notice (lurk-current-context) + "Joining channel " channel " on " network) + (lurk-highlight-current-context) (lurk-render-prompt))) ("JOIN" - (let ((channel (car (lurk-msg-params msg))) - (nick (lurk-msg-src msg))) - (lurk-add-context-users channel (list nick)) + (let* ((channel (car (lurk-msg-params msg))) + (nick (lurk-msg-src msg)) + (ctx (lurk-get-context network channel))) + (lurk-add-context-users ctx (list nick)) (if lurk-show-joins - (lurk-display-notice channel nick " joined channel " channel)))) + (lurk-display-notice ctx nick " joined channel " channel + " on " network)))) ((and "PART" - (guard (equal lurk-nick (lurk-msg-src msg)))) - (let ((channel (car (lurk-msg-params msg)))) - (lurk-display-notice channel "Left channel " channel) - (lurk-del-context channel) - (if (equal channel lurk-current-context) - (lurk-set-current-context (lurk-get-next-context))) + (guard (equal (lurk-connection-nick network) + (lurk-msg-src msg)))) + (let* ((channel (car (lurk-msg-params msg))) + (context (list network channel))) + (lurk-display-notice context "Left channel " channel) + (lurk-remove-context context) + (lurk-del-all-context-users context) + (lurk-highlight-current-context) (lurk-render-prompt))) ("PART" - (let ((channel (car (lurk-msg-params msg))) - (nick (lurk-msg-src msg))) - (lurk-del-context-user channel nick) + (let* ((channel (car (lurk-msg-params msg))) + (nick (lurk-msg-src msg)) + (ctx (lurk-get-context network channel))) + (lurk-del-context-user ctx nick) (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) " "))) - (lurk-del-user nick) - (if lurk-show-joins - (lurk-display-notice nil nick " quit: " reason)))) + (lurk-display-notice ctx nick " left channel " channel + " on " network)))) ((and "NICK" - (guard (equal lurk-nick (lurk-msg-src msg)))) - (setq lurk-nick (car (lurk-msg-params msg))) - (lurk-display-notice nil "Set nick to " lurk-nick)) + (guard (equal (lurk-connection-nick network) + (lurk-msg-src msg)))) + (let ((new-nick (car (lurk-msg-params msg))) + (old-nick (lurk-connection-nick network))) + (lurk-set-connection-nick network new-nick) + (lurk-rename-network-user network old-nick new-nick) + (lurk-display-notice (lurk-get-context network) + "Nick set to " new-nick " on " network))) ("NICK" (let ((old-nick (lurk-msg-src msg)) (new-nick (car (lurk-msg-params msg)))) - (lurk-display-notice nil old-nick " is now known as " new-nick) - (lurk-rename-user old-nick new-nick))) + (lurk-display-notice (lurk-get-context network) + old-nick " is now known as " new-nick + " on " network) + (lurk-rename-network-user network old-nick new-nick))) + + ("TOPIC" + (let ((channel (car (lurk-msg-params msg))) + (nick (lurk-msg-src msg)) + (topic (cadr (lurk-msg-params msg)))) + (lurk-display-notice (lurk-get-context network channel) + nick " set the topic: " topic))) + + ("QUIT" + (let ((nick (lurk-msg-src msg)) + (reason (mapconcat 'identity (lurk-msg-params msg) " "))) + (lurk-del-network-user network nick) + (if lurk-show-joins + (lurk-display-notice (lurk-get-context network) + nick " on " network " has quit: " reason)))) ("NOTICE" (let ((nick (lurk-msg-src msg)) @@ -789,9 +920,10 @@ portion of the source component of the message, as LURK doesn't use this.") ((rx (: "\01VERSION " (let version (* (not "\01"))) "\01")) - (lurk-display-notice nil "CTCP version reply from " nick ": " version)) + (lurk-display-notice (lurk-get-context network) + "CTCP version reply from " nick ": " version)) (_ - (lurk-display-notice nil text))))) + (lurk-display-notice (lurk-get-context network channel) text))))) ("PRIVMSG" (let* ((from (lurk-msg-src msg)) @@ -801,47 +933,43 @@ portion of the source component of the message, as LURK doesn't use this.") (pcase text ("\01VERSION\01" (let ((version-string (concat lurk-version " - running on GNU Emacs " emacs-version))) - (lurk-send-msg (lurk-msg nil nil "NOTICE" + (lurk-send-msg network + (lurk-msg nil nil "NOTICE" (list from (concat "\01VERSION " version-string "\01"))))) - (lurk-display-notice nil "CTCP version request received from " from)) + (lurk-display-notice (lurk-get-context network) + "CTCP version request received from " + from " on " network)) ((rx (let ping (: "\01PING " (* (not "\01")) "\01"))) - (lurk-send-msg (lurk-msg nil nil "NOTICE" (list from ping))) - (lurk-display-notice from "CTCP ping received from " from)) + (lurk-send-msg network (lurk-msg nil nil "NOTICE" (list from ping))) + (lurk-display-notice (lurk-get-context network) + "CTCP ping received from " from " on " network)) ("\01USERINFO\01" - (lurk-display-notice from "CTCP userinfo request from " from " (no response sent)")) + (lurk-display-notice (lurk-get-context network) + "CTCP userinfo request from " from + " on " network " (no response sent)")) + + ("\01CLIENTINFO\01" + (lurk-display-notice (lurk-get-context network) + "CTCP clientinfo request from " from + " on " network " (no response sent)")) ((rx (: "\01ACTION " (let action-text (* (not "\01"))) "\01")) - (lurk-display-action from to action-text)) + (lurk-display-action network from to action-text)) (_ - (lurk-display-message from to text))))) + (lurk-display-message network from to text))))) + (_ - (lurk-display-notice nil (lurk-msg->string msg)))))) + (lurk-display-notice (lurk-get-context network) + (lurk-msg->string msg)))))) ;;; User-defined responses - - -(defvar lurk-autoreply-table nil - "Table of autoreply messages. - -Each autoreply is a list of two elements: (matcher reply) - -Here matcher is a list: - -(network src cmd params ...) - -and reply is another list: - - (cmd params ...) - -Each entry in the matcher list is a regular expression tested against the -corresponding values in the incomming message. Entries can be nil, -in which case they match anything.") +;; (defun lurk--lists-equal (l1 l2) (if (and l1 l2) @@ -851,25 +979,23 @@ in which case they match anything.") nil) t)) -(defun lurk-process-autoreply (msg autoreply) +(defun lurk-process-autoreply (network msg autoreply) (let ((matcher (car autoreply)) (reply (cadr autoreply))) - (let ((network (car matcher))) - (when (and (or (not network) - (and (get-process "lurk") - (equal (car (process-contact (get-process "lurk"))) - (cadr (assoc network lurk-networks))))) + (let ((target-network (car matcher))) + (when (and (or (not target-network) + (and (equal network target-network))) (lurk--lists-equal (cdr matcher) (append (list (lurk-msg-src msg) (lurk-msg-cmd msg)) (lurk-msg-params msg)))) - (lurk-send-msg + (lurk-send-msg network (lurk-msg nil nil (car reply) (cdr reply))))))) -(defun lurk-process-autoreplies (msg) +(defun lurk-process-autoreplies (network msg) (mapc (lambda (autoreply) - (lurk-process-autoreply msg autoreply)) + (lurk-process-autoreply network msg autoreply)) lurk-autoreply-table)) @@ -879,22 +1005,23 @@ in which case they match anything.") (defvar lurk-command-table '(("DEBUG" "Toggle debug mode on/off." lurk-command-debug lurk-boolean-completions) ("HEADER" "Toggle display of header." lurk-command-header lurk-boolean-completions) - ("CONNECT" "Connect to an IRC network." lurk-command-connect lurk-network-completions) + ("SHOWJOINS" "Toggles display of joins/parts." lurk-command-showjoins lurk-boolean-completions) ("NETWORKS" "List known IRC networks." lurk-command-networks) - ("JOIN" "Join one or more channels." lurk-command-join) - ("TOPIC" "Set topic for current channel." lurk-command-topic) - ("ME" "Display action." lurk-command-me) - ("VERSION" "Request version of another user's client via CTCP." lurk-command-version lurk-nick-completions) - ("PART" "Leave channel." lurk-command-part lurk-context-completions) + ("CONNECT" "Connect to an IRC network." lurk-command-connect lurk-network-completions) ("QUIT" "Disconnect from current network." lurk-command-quit) + ("JOIN" "Join one or more channels." lurk-command-join) + ("PART" "Leave channel." lurk-command-part lurk-channel-completions) + ("SWITCHCONTEXT" "Switch current context" lurk-command-switch-context lurk-context-completions) ("NICK" "Change nick." lurk-command-nick) ("LIST" "Display details of one or more channels." lurk-command-list) - ("WHOIS" "Ask server for details of nick." nil lurk-nick-completions) - ("USERS" "List nicks of users in current context." lurk-command-users) + ("TOPIC" "Set/query topic for current channel." lurk-command-topic) + ("USERS" "List nicks of users in current channel." lurk-command-users) ("MSG" "Send private message to user." lurk-command-msg lurk-nick-completions) + ("ME" "Display action." lurk-command-me) + ("VERSION" "Request version of another user's client via CTCP." lurk-command-version lurk-nick-completions) ("CLEAR" "Clear buffer text." lurk-command-clear lurk-context-completions) ("HELP" "Display help on client commands." lurk-command-help lurk-help-completions)) - "Table of commands explicitly supported by Lurk.") + "Table of commands explicitly supported by lurk.") (defun lurk-boolean-completions () '("on" "off")) @@ -902,15 +1029,19 @@ in which case they match anything.") (defun lurk-network-completions () (mapcar (lambda (row) (car row)) lurk-networks)) -(defun lurk-nick-completions () - (lurk-get-context-users lurk-current-context)) - -(defun lurk-context-completions () - (lurk-get-context-list)) - (defun lurk-help-completions () (mapcar (lambda (row) (car row)) lurk-command-table)) +(defun lurk-channel-completions () + (mapcar (lambda (ctx) + (lurk-context->string ctx)) + (seq-filter (lambda (ctx) + (not (lurk-network-context-p ctx))) + lurk-contexts))) + +(defun lurk-context-completions () + (mapcar (lambda (ctx) (lurk-context->string ctx)) lurk-contexts)) + (defun lurk-command-help (params) (if params (let* ((cmd-str (upcase (car params))) @@ -945,6 +1076,16 @@ in which case they match anything.") (setq-local header-line-format nil) (lurk-display-notice nil "Header disabled."))) +(defun lurk-command-showjoins (params) + (setq lurk-show-joins + (if params + (if (equal (upcase (car params)) "ON") + t + nil) + (not lurk-show-joins))) + (lurk-display-notice nil "Joins/parts will now be " + (if lurk-show-joins "shown" "hidden") ".")) + (defun lurk-command-connect (params) (if params (let ((network (car params))) @@ -952,95 +1093,140 @@ in which case they match anything.") (lurk-connect network)) (lurk-display-notice nil "Usage: /connect "))) -(defun lurk-command-networks (params) +(defun lurk-command-networks (_params) (lurk-display-notice nil "Currently-known networks:") (dolist (row lurk-networks) - (seq-let (network server port &rest others) row + (seq-let (network network port &rest _others) row (lurk-display-notice nil "\t" network - " [" server + " [" network " " (number-to-string port) "]"))) (lurk-display-notice nil "(Modify the `lurk-networks' variable to add more.)")) +(defun lurk-command-quit (params) + (let ((ctx (lurk-current-context))) + (if (not ctx) + (lurk-display-error "No current network") + (let ((quit-msg (if params (string-join params " ") lurk-default-quit-msg))) + (lurk-send-msg + (lurk-context-network ctx) + (lurk-msg nil nil "QUIT" quit-msg)))))) + (defun lurk-command-join (params) (if params - (dolist (channel params) - (lurk-send-msg (lurk-msg nil nil "JOIN" channel))) + (let ((network (lurk-context-network (lurk-current-context)))) + (dolist (channel params) + (lurk-send-msg network (lurk-msg nil nil "JOIN" channel)))) (lurk-display-notice nil "Usage: /join channel [channel2 ...]"))) (defun lurk-command-part (params) - (let ((channel (if params (car params) lurk-current-context))) - (if channel - (lurk-send-msg (lurk-msg nil nil "PART" channel)) - (lurk-display-error "No current channel to leave.")))) - -(defun lurk-command-version (params) - (if params - (let ((nick (car params))) - (lurk-send-msg (lurk-msg nil nil "PRIVMSG" - (list nick "\01VERSION\01"))) - (lurk-display-notice nil "CTCP version request sent to " nick)) - (lurk-display-notice nil "Usage: /version "))) - -(defun lurk-command-quit (params) - (let ((quit-msg (if params (string-join params " ") lurk-default-quit-msg))) - (lurk-send-msg (lurk-msg nil nil "QUIT" quit-msg)))) + (let ((ctx (cond + ((not params) (lurk-current-context)) + ((seq-contains (car params) "@") (lurk-string->context (car params))) + (t (list (lurk-context-network (lurk-current-context)) (car params)))))) + (let ((network (lurk-context-network ctx)) + (channel (lurk-context-channel ctx))) + (if channel + (lurk-send-msg network (lurk-msg nil nil "PART" channel)) + (lurk-display-error "Specify which channel to leave"))))) + +(defun lurk-command-switch-context (params) + (if (not params) + (lurk-display-notice nil "Usage: /switchcontext #channel@network") + (let ((ctx (lurk-string->context (car params)))) + (lurk-switch-to-context ctx) + (lurk-highlight-current-context) + (lurk-render-prompt) + (if lurk-zoomed + (lurk-zoom-in (lurk-current-context)))))) (defun lurk-command-nick (params) - (let ((new-nick (if params (string-join params " ") nil))) - (if new-nick - (if (lurk-connected-p) - (lurk-send-msg (lurk-msg nil nil "NICK" new-nick)) - (setq lurk-nick new-nick) - (lurk-display-notice nil "Set default nick to '" lurk-nick "'.")) - (lurk-display-notice nil "Current nick: " lurk-nick)))) - -(defun lurk-command-me (params) - (if lurk-current-context - (if params - (let* ((action (string-join params " ")) - (ctcp-text (concat "\01ACTION " action "\01"))) - (lurk-send-msg (lurk-msg nil nil "PRIVMSG" - (list lurk-current-context ctcp-text))) - (lurk-display-action lurk-nick lurk-current-context action)) - (lurk-display-notice nil "Usage: /me ")) - (lurk-display-notice nil "No current channel."))) + (if params + (let ((new-nick (string-join params " ")) + (ctx (lurk-current-context))) + (if ctx + (lurk-send-msg (lurk-context-network ctx) + (lurk-msg nil nil "NICK" new-nick)) + (lurk-display-error "No current connection"))) + (lurk-display-notice nil "Usage: /nick "))) (defun lurk-command-list (params) - (if (not params) - (lurk-display-notice nil "This command can generate lots of output. Use `/LIST -yes' if you really want this, or `/LIST ' to reduce the output.") - (if (equal (upcase (car params)) "-YES") - (lurk-send-msg (lurk-msg nil nil "LIST")) - (lurk-send-msg (lurk-msg nil nil "LIST" (car params)))))) + (let ((ctx (lurk-current-context))) + (if ctx + (if (not params) + (lurk-display-notice nil "This command can generate lots of output." + " Use `/LIST -yes' if you really want this," + " or `/LIST ' to reduce the output.") + (let ((network (lurk-context-network ctx))) + (if (equal (upcase (car params)) "-YES") + (lurk-send-msg network (lurk-msg nil nil "LIST")) + (lurk-send-msg network (lurk-msg nil nil "LIST" + (car params)))))) + (lurk-display-error "No current connection")))) (defun lurk-command-topic (params) - (if lurk-current-context - (if params - (lurk-send-msg (lurk-msg nil nil "TOPIC" lurk-current-context (string-join params " "))) - (lurk-display-notice nil "Usage: /topic ")) - (lurk-display-notice nil "No current channel."))) + (let ((ctx (lurk-current-context))) + (if (and ctx (not (lurk-network-context-p ctx))) + (let ((network (lurk-context-network ctx)) + (channel (lurk-context-channel ctx))) + (if params + (lurk-send-msg network + (lurk-msg nil nil "TOPIC" channel + (string-join params " "))) + (lurk-send-msg network + (lurk-msg nil nil "TOPIC" channel)))) + (lurk-display-notice nil "No current channel.")))) (defun lurk-command-msg (params) - (if (and params (>= (length params) 2)) - (let ((to (car params)) - (text (string-join (cdr params) " "))) - (lurk-send-msg (lurk-msg nil nil "PRIVMSG" to text)) - (lurk-display-message lurk-nick to text)) - (lurk-display-notice nil "Usage: /msg "))) - -(defun lurk-command-clear (params) - (if (not params) - (lurk-clear-buffer) - (dolist (context params) - (lurk-clear-context context)))) + (let ((network (lurk-context-network (lurk-current-context)))) + (if (and params (>= (length params) 2)) + (let ((to (car params)) + (text (string-join (cdr params) " "))) + (lurk-send-msg network (lurk-msg nil nil "PRIVMSG" to text)) + (lurk-display-message network + (lurk-connection-nick network) + to text)) + (lurk-display-notice nil "Usage: /msg ")))) + +(defun lurk-command-me (params) + (let* ((ctx (lurk-current-context)) + (network (lurk-context-network ctx))) + (if (and ctx (not (lurk-network-context-p ctx))) + (if params + (let* ((channel (lurk-context-channel ctx)) + (my-nick (lurk-connection-nick network)) + (action (string-join params " ")) + (ctcp-text (concat "\01ACTION " action "\01"))) + (lurk-send-msg network + (lurk-msg nil nil "PRIVMSG" + (list channel ctcp-text))) + (lurk-display-action network my-nick channel action)) + (lurk-display-notice nil "Usage: /me ")) + (lurk-display-notice nil "No current channel.")))) + +(defun lurk-command-version (params) + (let ((ctx (lurk-current-context))) + (if ctx + (if params + (let ((network (lurk-context-network ctx)) + (nick (car params))) + (lurk-send-msg network + (lurk-msg nil nil "PRIVMSG" + (list nick "\01VERSION\01"))) + (lurk-display-notice ctx "CTCP version request sent to " + nick " on " network)) + (lurk-display-notice ctx "Usage: /version ")) + (lurk-display-notice nil "No current channel.")))) + +(defun lurk-command-users (_params) + (let ((ctx (lurk-current-context))) + (if (and ctx (not (lurk-network-context-p ctx))) + (let ((channel (lurk-context-channel ctx)) + (network (lurk-context-network ctx)) + (users (lurk-get-context-users ctx))) + (lurk-display-notice ctx "Users in " channel " on " network ":") + (lurk-display-notice ctx (string-join users " "))) + (lurk-display-notice nil "No current channel.")))) -(defun lurk-command-users (params) - (if lurk-current-context - (progn - (lurk-display-notice lurk-current-context "Users in " lurk-current-context ":") - (lurk-display-notice - lurk-current-context - (string-join (lurk-get-context-users lurk-current-context) " "))) - (lurk-display-notice nil "No current channel."))) ;;; Command entering ;; @@ -1058,17 +1244,24 @@ in which case they match anything.") nil))) (if (and command-row (elt command-row 2)) (funcall (elt command-row 2) params) - (lurk-send-msg (lurk-msg nil nil (upcase cmd-str) params))))) + (lurk-send-msg + (lurk-context-network (lurk-current-context)) + (lurk-msg nil nil (upcase cmd-str) params))))) (_ - (lurk-display-error "Badly formed command."))) + (lurk-display-error "Badly formed command"))) (unless (string-empty-p string) - (if lurk-current-context - (progn - (lurk-send-msg (lurk-msg nil nil "PRIVMSG" - lurk-current-context - string)) - (lurk-display-message lurk-nick lurk-current-context string)) - (lurk-display-error "No current context."))))) + (let ((ctx (lurk-current-context))) + (if ctx + (if (not (lurk-network-context-p ctx)) + (let ((network (lurk-context-network ctx)) + (channel (lurk-context-channel ctx))) + (lurk-send-msg network + (lurk-msg nil nil "PRIVMSG" channel string)) + (lurk-display-message network + (lurk-connection-nick network) + channel string)) + (lurk-display-error "No current channel")) + (lurk-display-error "No current context")))))) ;;; Command history @@ -1092,16 +1285,43 @@ in which case they match anything.") (insert (elt lurk-history lurk-history-index))))) -;;; Interactive functions +;;; Interactive commands ;; +(defun lurk-enter () + "Enter current contents of line after prompt." + (interactive) + (with-current-buffer "*lurk*" + (let ((line (buffer-substring lurk-input-marker (point-max)))) + (push line lurk-history) + (setq lurk-history-index nil) + (let ((inhibit-read-only t)) + (delete-region lurk-input-marker (point-max))) + (lurk-enter-string line)))) + +(defun lurk-history-next () + (interactive) + (lurk-history-cycle -1)) + +(defun lurk-history-prev () + (interactive) + (lurk-history-cycle +1)) + (defun lurk-cycle-contexts-forward () (interactive) - (lurk-cycle-contexts)) + (lurk-cycle-contexts) + (lurk-highlight-current-context) + (lurk-render-prompt) + (if lurk-zoomed + (lurk-zoom-in (lurk-current-context)))) (defun lurk-cycle-contexts-reverse () (interactive) - (lurk-cycle-contexts t)) + (lurk-cycle-contexts t) + (lurk-highlight-current-context) + (lurk-render-prompt) + (if lurk-zoomed + (lurk-zoom-in (lurk-current-context)))) (defvar lurk-zoomed nil "Keeps track of zoom status.") @@ -1110,16 +1330,9 @@ in which case they match anything.") (interactive) (if lurk-zoomed (lurk-zoom-out) - (lurk-zoom-in lurk-current-context)) + (lurk-zoom-in (lurk-current-context))) (setq lurk-zoomed (not lurk-zoomed))) -(defun lurk-history-next () - (interactive) - (lurk-history-cycle -1)) - -(defun lurk-history-prev () - (interactive) - (lurk-history-cycle +1)) (defun lurk-complete-input () (interactive) @@ -1145,24 +1358,12 @@ in which case they match anything.") (re-search-backward " " lurk-input-marker t))) (start (if space-idx (+ 1 space-idx) lurk-input-marker))) (unless (string-prefix-p "/" (buffer-substring start end)) - (let* ((users (lurk-get-context-users lurk-current-context)) + (let* ((users (lurk-get-context-users (lurk-current-context))) (users-no@ (mapcar (lambda (u) (car (split-string u "@" t))) users))) (completion-in-region start end users-no@))))))))) -(defun lurk-enter () - "Enter current contents of line after prompt." - (interactive) - (with-current-buffer "*lurk*" - (let ((line (buffer-substring lurk-input-marker (point-max)))) - (push line lurk-history) - (setq lurk-history-index nil) - (let ((inhibit-read-only t)) - (delete-region lurk-input-marker (point-max))) - (lurk-enter-string line)))) - - ;;; Mode ;; @@ -1171,37 +1372,34 @@ in which case they match anything.") (define-key map (kbd "RET") 'lurk-enter) (define-key map (kbd "TAB") 'lurk-complete-input) (define-key map (kbd "C-c C-z") 'lurk-toggle-zoom) - (define-key map (kbd "") 'lurk-cycle-contexts-forward) - (define-key map (kbd "") 'lurk-cycle-contexts-reverse) (define-key map (kbd "") 'lurk-history-prev) (define-key map (kbd "") 'lurk-history-next) + (define-key map (kbd "") 'lurk-cycle-contexts-forward) + (define-key map (kbd "") 'lurk-cycle-contexts-reverse) + (define-key map (kbd "") 'lurk-cycle-contexts-reverse) (when (fboundp 'evil-define-key*) (evil-define-key* 'motion map (kbd "TAB") 'lurk-complete-input)) map)) (define-derived-mode lurk-mode text-mode "lurk" - "Major mode for LURK.") + "Major mode for lurk.") (when (fboundp 'evil-set-initial-state) (evil-set-initial-state 'lurk-mode 'insert)) - ;;; Main start procedure ;; -(defun lurk (&optional network) - "Start lurk or just switch to the lurk buffer if one already exists. -Also connect to NETWORK if non-nil." +;;;###autoload +(defun lurk () + "Start lurk or just switch to the lurk buffer if one already exists." (interactive) (if (get-buffer "*lurk*") (switch-to-buffer "*lurk*") (switch-to-buffer "*lurk*") (lurk-mode) - (lurk-setup-buffer) - (if network - (lurk-command-connect (list network)))) - "Started LURK.") - + (lurk-setup-buffer)) + "Started lurk.") ;;; lurk.el ends here diff --git a/murk.el b/murk.el deleted file mode 100644 index b438aa3..0000000 --- a/murk.el +++ /dev/null @@ -1,1407 +0,0 @@ -;;; murk.el --- Multinetwork Unibuffer iRc Klient -*- lexical-binding:t -*- - -;; Copyright (C) 2024 plugd - -;; Author: plugd -;; Created: 11 May 2024 -;; Version: 0.0 -;; Homepage: http://thelambdalab.xyz/murk -;; Keywords: comm -;; Package-Requires: ((emacs "26.1")) - -;; This file is not part of GNU Emacs. - -;; This program is free software: you can redistribute it and/or modify -;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation, either version 3 of the License, or -;; (at your option) any later version. - -;; This program is distributed in the hope that it will be useful, -;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;; GNU General Public License for more details. - -;; You should have received a copy of the GNU General Public License -;; along with this file. If not, see . - -;;; Commentary: - -;; A very simple IRC client which uses only a single buffer. - -;;; Code: - -(provide 'murk) - -(require 'cl-lib) - - -;;; Customizations - -(defgroup murk nil - "Multinetwork Unibuffer iRc Klient" - :group 'network) - -(defcustom murk-default-nick "plugd" - "Default nick." - :type '(string)) - -(defcustom murk-default-quit-msg "Bye" - "Default quit message when none supplied." - :type '(string)) - -(defcustom murk-networks - '(("debug" "localhost" 6697) - ("libera" "irc.libera.chat" 6697) - ("tilde" "tilde.chat" 6697) - ("sdf" "irc.sdf.org" 6697) - ("freenode" "chat.freenode.net" 6697) - ("mbr" "mbrserver.com" 6667 :notls)) - "IRC networks." - :type '(alist :key-type string)) - -(defcustom murk-show-joins nil - "Set to non-nil to be notified of joins, parts and quits.") - -(defcustom murk-display-header t - "If non-nil, use buffer header to display current host and channel." - :type '(boolean)) - -(defcustom murk-autoreply-table nil - "Table of autoreply messages. - -Each autoreply is a list of two elements: (matcher reply) - -Here matcher is a list: - -(network src cmd params ...) - -and reply is another list: - - (cmd params ...) - -Each entry in the matcher list is a regular expression tested against the -corresponding values in the incomming message. Entries can be nil, -in which case they match anything." - :type '(list (list) (list))) - - -;;; Faces -;; - -(defface murk-text - '((t :inherit default)) - "Face used for murk text.") - -(defface murk-prompt - '((t :inherit font-lock-keyword-face)) - "Face used for the prompt.") - -(defface murk-context - '((t :inherit murk-context)) - "Face used for the context name in the prompt.") - -(defface murk-faded - '((t :inherit shadow)) - "Face used for faded murk text.") - -(defface murk-timestamp - '((t :inherit shadow)) - "Face used for timestamps.") - -(defface murk-error - '((t :inherit error)) - "Face used for murk error text.") - -(defface murk-notice - '((t :inherit warning)) - "Face used for murk notice text.") - - -;;; Global variables -;; - -(defvar murk-version "Murk v0.0" - "Value of this string is used in response to CTCP version queries.") - -(defvar murk-notice-prefix "-!-") -(defvar murk-error-prefix "!!!") -(defvar murk-prompt-string ">") - -(defvar murk-debug nil - "If non-nil, enable debug mode.") - - -;;; Utility procedures -;; - -(defun murk--filtered-join (&rest args) - (string-join (seq-filter (lambda (el) el) args) " ")) - -(defun murk--as-string (obj) - (if obj - (with-output-to-string (princ obj)) - nil)) - - -;;; Network processes -;; - -(defvar murk-connection-table nil - "An alist associating networks to connection information. -This includes the process and the response string.") - -(defun murk-connection-process (network) - (elt (assoc network murk-connection-table) 1)) - -(defun murk-connection-nick (network) - (elt (assoc network murk-connection-table) 2)) - -(defun murk-set-connection-nick (network nick) - (setf (elt (assoc network murk-connection-table) 2) nick)) - -(defun murk-connection-response (network) - (elt (assoc network murk-connection-table) 3)) - -(defun murk-set-connection-response (network string) - (setf (elt (assoc network murk-connection-table) 3) string)) - -(defun murk-connection-new (network process nick) - (add-to-list 'murk-connection-table - (list network process nick ""))) - -(defun murk-connection-remove (network) - (setq murk-connection-table - (seq-remove (lambda (row) (equal (car row) network)) - murk-connection-table))) - -(defun murk-make-network-filter (network) - (lambda (_proc string) - (dolist (line (split-string (concat (murk-connection-response network) string) - "\n")) - (if (string-suffix-p "\r" line) - (murk-eval-msg-string network (string-trim line)) - (murk-set-connection-response network line))))) - -(defun murk-make-network-sentinel (network) - (lambda (_proc string) - (unless (equal "open" (string-trim string)) - (murk-display-error "Disconnected from network.") - (murk-connection-remove network) - (murk-remove-network-contexts network) - (murk-highlight-current-context) - (murk-render-prompt)))) - -(defun murk-start-process (network) - (let* ((row (assoc network murk-networks)) - (host (elt row 1)) - (port (elt row 2)) - (flags (seq-drop row 3))) - (make-network-process :name (concat "murk-" network) - :host host - :service port - :family nil - :filter (murk-make-network-filter network) - :sentinel (murk-make-network-sentinel network) - :nowait nil - :tls-parameters (if (memq :notls flags) - nil - (cons 'gnutls-x509pki - (gnutls-boot-parameters - :type 'gnutls-x509pki - :hostname host))) - :buffer "*murk*"))) - -(defvar murk-ping-period 60) - -;; IDEA: Have a single ping timer which pings all connected hosts - -(defun murk-connect (network) - (if (assoc network murk-connection-table) - (murk-display-error "Already connected to this network") - (if (not (assoc network murk-networks)) - (murk-display-error "Network '" network "' is unknown.") - (let ((proc (murk-start-process network))) - (murk-connection-new network proc murk-default-nick)) - (murk-send-msg network (murk-msg nil nil "USER" murk-default-nick 0 "*" murk-default-nick)) - (murk-send-msg network (murk-msg nil nil "NICK" murk-default-nick)) - (murk-add-context (list network)) - (murk-highlight-current-context) - (murk-render-prompt)))) - -(defun murk-send-msg (network msg) - (if murk-debug - (murk-display-string nil nil (murk-msg->string msg))) - (let ((proc (murk-connection-process network))) - (if (and proc (eq (process-status proc) 'open)) - (process-send-string proc (concat (murk-msg->string msg) "\r\n")) - (murk-display-error "No network connection established")))) - - -;;; network messages -;; - -(defun murk-msg (tags src cmd &rest params) - (list (murk--as-string tags) - (murk--as-string src) - (upcase (murk--as-string cmd)) - (mapcar #'murk--as-string - (if (and params (listp (elt params 0))) - (elt params 0) - params)))) - -(defun murk-msg-tags (msg) (elt msg 0)) -(defun murk-msg-src (msg) (elt msg 1)) -(defun murk-msg-cmd (msg) (elt msg 2)) -(defun murk-msg-params (msg) (elt msg 3)) -(defun murk-msg-trail (msg) - (let ((params (murk-msg-params msg))) - (if params - (elt params (- (length params) 1))))) - -(defvar murk-msg-regex - (rx - (opt (: "@" (group (* (not (or "\n" "\r" ";" " "))))) - (* whitespace)) - (opt (: ":" (: (group (* (not (any space "!" "@")))) - (* (not (any space))))) - (* whitespace)) - (group (: (* (not whitespace)))) - (* whitespace) - (opt (group (+ not-newline)))) - "Regex used to parse IRC messages. -Note that this regex is incomplete. Noteably, we discard the non-nick -portion of the source component of the message, as mURK doesn't use this.") - -(defun murk-string->msg (string) - (if (string-match murk-msg-regex string) - (let* ((tags (match-string 1 string)) - (src (match-string 2 string)) - (cmd (upcase (match-string 3 string))) - (params-str (match-string 4 string)) - (params - (if params-str - (let* ((idx (seq-position params-str ?:)) - (l (split-string (string-trim (substring params-str 0 idx)))) - (r (if idx (list (substring params-str (+ 1 idx))) nil))) - (append l r)) - nil))) - (apply #'murk-msg (append (list tags src cmd) params))) - (error "Failed to parse string %s" string))) - -(defun murk-msg->string (msg) - (let ((tags (murk-msg-tags msg)) - (src (murk-msg-src msg)) - (cmd (murk-msg-cmd msg)) - (params (murk-msg-params msg))) - (murk--filtered-join - (if tags (concat "@" tags) nil) - (if src (concat ":" src) nil) - cmd - (if (> (length params) 1) - (string-join (seq-take params (- (length params) 1)) " ") - nil) - (if (> (length params) 0) - (concat ":" (elt params (- (length params) 1))) - nil)))) - - -;;; Contexts -;; - -;; A context is a list (network channel) identifying the network -;; and channel. The tail of the list contains the nicks of users -;; present in the channel. -;; -;; Each network has a special context (network) used for messages -;; to/from the network itself. - -(defvar murk-contexts nil - "List of currently-available contexts. -The head of this list is always the current context.") - -(defun murk-current-context () - "Return the current context." - (if murk-contexts - (car murk-contexts) - nil)) - -(defun murk-contexts-equal (c1 c2) - (if (murk-network-context-p c1) - (and (murk-network-context-p c2) - (equal (murk-context-network c1) - (murk-context-network c2))) - (and (not (murk-network-context-p c2)) - (equal (seq-take c1 2) - (seq-take c2 2))))) - -(defun murk-context-network (ctx) - (elt ctx 0)) - -(defun murk-context-channel (ctx) - (elt ctx 1)) - -(defun murk-network-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-network-contexts (network) - (setq murk-contexts - (seq-remove (lambda (row) (equal (car row) network)) - murk-contexts))) - -(defun murk-context->string (ctx) - (concat - (if (murk-network-context-p ctx) - "" - (concat (murk-context-channel ctx) "@")) - (murk-context-network ctx))) - -(defun murk-string->context (string) - (if (not (string-prefix-p "#" string)) - (murk-get-context string) - (let* ((parts (string-split string "@")) - (channel (elt parts 0)) - (network (elt parts 1))) - (murk-get-context network channel)))) - -(defun murk-get-context (network &optional channel) - (if (and channel (string-prefix-p "#" channel)) - (let ((test-ctx (list network channel))) - (seq-find (lambda (ctx) - (equal (seq-take ctx 2) test-ctx)) - murk-contexts)) - (car (member (list network) murk-contexts)))) - -(defun murk-cycle-contexts (&optional reverse) - (setq murk-contexts - (if reverse - (let ((nminus1 (- (length murk-contexts) 1))) - (cons - (elt murk-contexts nminus1) - (seq-take murk-contexts nminus1))) - (append (cdr murk-contexts) (list (car murk-contexts)))))) - -(defun murk-switch-to-context (ctx) - (setq murk-contexts - (let* ((new-head (memq ctx murk-contexts)) - (new-tail (take (- (length murk-contexts) - (length new-head)) - murk-contexts))) - (append new-head new-tail)))) - -;;; Context users -;; - -(defvar murk-context-users nil - "Association list between channel contexts and users.") - -(defun murk-get-context-users (ctx) - (cdr (assoc ctx murk-context-users))) - -(defun murk-set-context-users (ctx users) - (setq murk-context-users - (cons (cons ctx users) (assoc-delete-all ctx murk-context-users)))) - -(defun murk-add-context-users (ctx users) - (murk-set-context-users - ctx - (cl-union users (murk-get-context-users ctx)))) - -(defun murk-del-context-user (ctx user) - (murk-set-context-users - ctx - (delete user (murk-get-context-users ctx)))) - -(defun murk-del-all-context-users (ctx) - (murk-set-context-users ctx nil)) - -(defun murk-del-network-user (network user) - (dolist (ctx murk-contexts) - (if (and (equal (murk-context-network ctx) network) - (not (murk-network-context-p ctx))) - (murk-del-context-user ctx user)))) - -(defun murk-del-all-network-users (network) - (dolist (ctx murk-contexts) - (if (and (equal (murk-context-network ctx) network) - (not (murk-network-context-p ctx))) - (murk-del-all-context-users ctx)))) - -(defun murk-rename-network-user (network old-nick new-nick) - (dolist (ctx murk-contexts) - (when (and (equal (murk-context-network ctx) network) - (member old-nick (murk-get-context-users ctx))) - (murk-del-context-user ctx old-nick) - (murk-add-context-users ctx (list new-nick))))) - - -;;; Buffer -;; - -(defvar murk-prompt-marker nil - "Marker for prompt position in murk buffer.") - -(defvar murk-input-marker nil - "Marker for prompt position in murk buffer.") - -(defun murk-render-prompt () - (with-current-buffer "*murk*" - (let ((update-point (= murk-input-marker (point))) - (update-window-points (mapcar (lambda (w) - (list (= (window-point w) murk-input-marker) - w)) - (get-buffer-window-list nil nil t)))) - (save-excursion - (set-marker-insertion-type murk-prompt-marker nil) - (set-marker-insertion-type murk-input-marker t) - (let ((inhibit-read-only t)) - (delete-region murk-prompt-marker murk-input-marker) - (goto-char murk-prompt-marker) - (insert - (propertize (let ((ctx (murk-current-context))) - (if ctx - (murk-context->string ctx) - "")) - 'face 'murk-context - 'read-only t) - (propertize murk-prompt-string - 'face 'murk-prompt - 'read-only t) - (propertize " " ; Need this to be separate to mark it as rear-nonsticky - 'read-only t - 'rear-nonsticky t))) - (set-marker-insertion-type murk-input-marker nil)) - (if update-point - (goto-char murk-input-marker)) - (dolist (v update-window-points) - (if (car v) - (set-window-point (cadr v) murk-input-marker)))))) - -(defun murk-setup-header () - (with-current-buffer "*murk*" - (setq-local header-line-format - '((:eval - (let* ((ctx (murk-current-context))) - (if ctx - (let ((network (murk-context-network ctx))) - (concat - "Network: " network ", " - (if (murk-network-context-p ctx) - "network" - (concat - "Channel: " - (murk-context-channel ctx) - " (" - (number-to-string - (length (murk-get-context-users ctx))) - ")")))) - "No connection"))))))) - -(defun murk-setup-buffer () - (with-current-buffer (get-buffer-create "*murk*") - (setq-local scroll-conservatively 1) - (setq-local buffer-invisibility-spec nil) - (if (markerp murk-prompt-marker) - (set-marker murk-prompt-marker (point-max)) - (setq murk-prompt-marker (point-max-marker))) - (if (markerp murk-input-marker) - (set-marker murk-input-marker (point-max)) - (setq murk-input-marker (point-max-marker))) - (goto-char (point-max)) - (murk-highlight-current-context) - (murk-render-prompt) - (if murk-display-header - (murk-setup-header)))) - -(defun murk-clear-buffer () - "Completely erase all non-prompt and non-input text from murk buffer." - (with-current-buffer "*murk*" - (let ((inhibit-read-only t)) - (delete-region (point-min) murk-prompt-marker)))) - - -;;; Output formatting and highlighting -;; - -;; Idea: the face text property can be a list of faces, applied in -;; order. By assigning each context a unique list and keeping track -;; of these in a hash table, we can easily switch the face -;; corresponding to a particular context by modifying the elements of -;; this list. -;; -;; More subtly, we make only the cdrs of this list shared among -;; all text of a given context, allowing the cars to be different -;; and for different elements of the context-specific text to have -;; different styling. - -;; Additionally, we allow selective hiding of contexts via -;; the buffer-invisibility-spec. - -(defvar murk-context-facelists (make-hash-table :test 'equal) - "List of seen contexts and associated face lists.") - -(defun murk-get-context-facelist (context) - (let* ((facelist (gethash context murk-context-facelists))) - (unless facelist - (setq facelist (list 'murk-text)) - (puthash context facelist murk-context-facelists)) - facelist)) - -(defun murk--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 murk-display-string (context prefix &rest strings) - (with-current-buffer "*murk*" - (save-excursion - (goto-char murk-prompt-marker) - (let* ((inhibit-read-only t) - (old-pos (marker-position murk-prompt-marker)) - (padded-timestamp (concat (format-time-string "%H:%M "))) - (padded-prefix (if prefix (concat prefix " ") "")) - (context-atom (if context - (intern (murk-context->string context)) - nil)) - (context-face (murk-get-context-facelist context))) - (insert-before-markers - (murk--fill-strings - 80 - (+ (length padded-timestamp) - (length padded-prefix)) - (propertize padded-timestamp - 'face 'murk-timestamp - 'read-only t - 'context context - 'invisible context-atom) - (propertize padded-prefix - 'read-only t - 'context context - 'invisible context-atom) - (murk-add-formatting - (propertize (concat (apply #'murk-buttonify-urls strings) "\n") - 'face context-face - 'read-only t - 'context context - 'invisible context-atom))))))) - (murk-scroll-windows-to-last-line)) - -(defun murk-click-context (button) - (murk-switch-to-context (button-get button 'context)) - (murk-highlight-current-context) - (murk-render-prompt) - (if murk-zoomed - (murk-zoom-in (murk-current-context)))) - -(defun murk-make-context-button (context &optional string) - (with-temp-buffer - (let ((label (or string (murk-context->string context)))) - (insert-text-button label - 'action #'murk-click-context - 'context context - 'follow-link t - 'help-echo "Switch context")) - (buffer-string))) - -(defun murk-display-message (network from to text) - (let ((context (if (string-prefix-p "#" to) - (murk-get-context network to) - (murk-get-context network)))) - (murk-display-string - context - (propertize - (if (murk-network-context-p context) - (concat "[" from "->" to "]") - (concat - (murk-make-context-button context) - " <" from ">")) - 'face (murk-get-context-facelist context)) - text))) - -(defun murk-display-action (network from to action-text) - (let ((context (if (string-prefix-p "#" to) - (murk-get-context network to) - (murk-get-context network)))) - (murk-display-string - context - (propertize - (concat (murk-context->string context) " *") - 'face (murk-get-context-facelist context)) - from " " action-text))) - -(defun murk-display-notice (context &rest notices) - (murk-display-string - context - (propertize murk-notice-prefix 'face 'murk-notice) - (apply #'concat notices))) - -(defun murk-display-error (&rest messages) - (murk-display-string - nil - (propertize murk-error-prefix 'face 'murk-error) - (apply #'concat messages))) - -(defun murk-highlight-current-context () - (with-current-buffer "*murk*" - (maphash - (lambda (this-context facelist) - (if (equal this-context (murk-current-context)) - (setcar facelist 'murk-text) - (setcar facelist 'murk-faded))) - murk-context-facelists)) - (force-window-update "*murk*")) - -(defun murk-zoom-in (context) - (with-current-buffer "*murk*" - (maphash - (lambda (this-context _) - (when this-context - (let ((this-context-atom - (intern (murk-context->string this-context)))) - (if (equal this-context context) - (remove-from-invisibility-spec this-context-atom) - (add-to-invisibility-spec this-context-atom))))) - murk-context-facelists) - (force-window-update "*murk*")) - (murk-scroll-windows-to-last-line)) - -(defun murk-zoom-out () - (with-current-buffer "*murk*" - (maphash - (lambda (this-context _) - (let ((this-context-atom - (if this-context - (intern (murk-context->string this-context)) - nil))) - (remove-from-invisibility-spec this-context-atom))) - murk-context-facelists) - (force-window-update "*murk*")) - (murk-scroll-windows-to-last-line)) - -(defun murk--start-of-final-line () - (with-current-buffer "*murk*" - (save-excursion - (goto-char (point-max)) - (line-beginning-position)))) - -(defun murk-scroll-windows-to-last-line () - (with-current-buffer "*murk*" - (dolist (window (get-buffer-window-list)) - (if (>= (window-point window) (murk--start-of-final-line)) - (with-selected-window window - (recenter -1)))))) - -(defconst murk-url-regex - (rx (: - (group (+ alpha)) - "://" - (group (or (+ (any alnum "." "-")) - (+ (any alnum ":")))) - (opt (group (: ":" (+ digit)))) - (opt (group (: "/" - (opt - (* (any alnum "-/.,#:%=&_?~@+")) - (any alnum "-/#:%=&_~@+"))))))) - "Imperfect regex used to find URLs in plain text.") - -(defun murk-click-url (button) - (browse-url (button-get button 'url))) - -(defun murk-buttonify-urls (&rest strings) - "Turn substrings which look like urls in STRING into clickable buttons." - (with-temp-buffer - (apply #'insert strings) - (goto-char (point-min)) - (while (re-search-forward murk-url-regex nil t) - (let ((url (match-string 0))) - (make-text-button (match-beginning 0) - (match-end 0) - 'action #'murk-click-url - 'url url - 'follow-link t - 'face 'button - 'help-echo "Open URL in browser."))) - (buffer-string))) - -(defun murk-add-formatting (string) - (with-temp-buffer - (insert string) - (goto-char (point-min)) - (let ((bold nil) - (italics nil) - (underline nil) - (strikethrough nil) - (prev-point (point))) - (while (re-search-forward (rx (or (any "\x02\x1D\x1F\x1E\x0F") - (: "\x03" (* digit) (opt "," (* digit))))) - nil t) - (let ((beg (+ (match-beginning 0) 1))) - (if bold - (add-face-text-property prev-point beg '(:weight bold))) - (if italics - (add-face-text-property prev-point beg '(:slant italic))) - (if underline - (add-face-text-property prev-point beg '(:underline t))) - (if strikethrough - (add-face-text-property prev-point beg '(:strike-through t))) - (pcase (match-string 0) - ("\x02" (setq bold (not bold))) - ("\x1D" (setq italics (not italics))) - ("\x1F" (setq underline (not underline))) - ("\x1E" (setq strikethrough (not strikethrough))) - ("\x0F" ; Reset - (setq bold nil) - (setq italics nil) - (setq underline nil) - (setq strikethrough nil)) - (_)) - (delete-region (match-beginning 0) (match-end 0)) - (setq prev-point (point))))) - (buffer-string))) - - -;;; Message evaluation -;; - -(defun murk-eval-msg-string (network string) - (if murk-debug - (murk-display-string nil nil string)) - (let* ((msg (murk-string->msg string))) - (murk-process-autoreplies network msg) - (pcase (murk-msg-cmd msg) - ("PING" - (murk-send-msg network - (murk-msg nil nil "PONG" (murk-msg-params msg)))) - - ("PONG") - - ("001" ; RPL_WELCOME - (let* ((params (murk-msg-params msg)) - (nick (elt params 0)) - (text (string-join (seq-drop params 1) " "))) - (murk-set-connection-nick network nick) - (murk-display-notice (murk-get-context network) text)) - (let* ((row (assoc network murk-networks)) - (channels (if (memq :channels row) - (cdr (memq :channels row)) - nil))) - (dolist (channel channels) - (murk-command-join (list channel))))) - - ("353" ; NAMEREPLY - (let* ((params (murk-msg-params msg)) - (channel (elt params 2)) - (names (split-string (elt params 3))) - (ctx (murk-get-context network channel))) - (if ctx - (murk-add-context-users ctx names) - (murk-display-notice ctx "Users in " channel - ": " (string-join names " "))))) - - ("366" ; ENDOFNAMES - (let* ((params (murk-msg-params msg)) - (channel (elt params 1)) - (ctx (murk-get-context network channel))) - (if ctx - (murk-display-notice - ctx - (murk--as-string (length (murk-get-context-users ctx))) - " users in " channel) - (murk-display-notice (murk-get-context network) - "End of " channel " names list.")))) - - ("331" ; RPL_NOTOPIC - (let* ((params (murk-msg-params msg)) - (channel (elt params 1)) - (ctx (murk-get-context network channel))) - (murk-display-notice ctx "No topic set."))) - - ("332" ; RPL_TOPIC - (let* ((params (murk-msg-params msg)) - (channel (elt params 1)) - (topic (elt params 2)) - (ctx (murk-get-context network channel))) - (murk-display-notice ctx "Topic: " topic))) - - ((rx (= 3 (any digit))) - (murk-display-notice (murk-get-context network) - (mapconcat 'identity (cdr (murk-msg-params msg)) " "))) - - ((and "JOIN" - (guard (equal (murk-connection-nick network) - (murk-msg-src msg)))) - (let* ((channel (car (murk-msg-params msg))) - (context (list network channel))) - (murk-add-context context) - (murk-del-all-context-users context) - (murk-display-notice (murk-current-context) - "Joining channel " channel " on " network) - (murk-highlight-current-context) - (murk-render-prompt))) - - ("JOIN" - (let* ((channel (car (murk-msg-params msg))) - (nick (murk-msg-src msg)) - (ctx (murk-get-context network channel))) - (murk-add-context-users ctx (list nick)) - (if murk-show-joins - (murk-display-notice ctx nick " joined channel " channel - " on " network)))) - - ((and "PART" - (guard (equal (murk-connection-nick network) - (murk-msg-src msg)))) - (let* ((channel (car (murk-msg-params msg))) - (context (list network channel))) - (murk-display-notice context "Left channel " channel) - (murk-remove-context context) - (murk-del-all-context-users context) - (murk-highlight-current-context) - (murk-render-prompt))) - - ("PART" - (let* ((channel (car (murk-msg-params msg))) - (nick (murk-msg-src msg)) - (ctx (murk-get-context network channel))) - (murk-del-context-user ctx nick) - (if murk-show-joins - (murk-display-notice ctx nick " left channel " channel - " on " network)))) - - ((and "NICK" - (guard (equal (murk-connection-nick network) - (murk-msg-src msg)))) - (let ((new-nick (car (murk-msg-params msg))) - (old-nick (murk-connection-nick network))) - (murk-set-connection-nick network new-nick) - (murk-rename-network-user network old-nick new-nick) - (murk-display-notice (murk-get-context network) - "Nick set to " new-nick " on " network))) - - ("NICK" - (let ((old-nick (murk-msg-src msg)) - (new-nick (car (murk-msg-params msg)))) - (murk-display-notice (murk-get-context network) - old-nick " is now known as " new-nick - " on " network) - (murk-rename-network-user network old-nick new-nick))) - - ("TOPIC" - (let ((channel (car (murk-msg-params msg))) - (nick (murk-msg-src msg)) - (topic (cadr (murk-msg-params msg)))) - (murk-display-notice (murk-get-context network channel) - nick " set the topic: " topic))) - - ("QUIT" - (let ((nick (murk-msg-src msg)) - (reason (mapconcat 'identity (murk-msg-params msg) " "))) - (murk-del-network-user network nick) - (if murk-show-joins - (murk-display-notice (murk-get-context network) - nick " on " network " has quit: " reason)))) - - ("NOTICE" - (let ((nick (murk-msg-src msg)) - (channel (car (murk-msg-params msg))) - (text (cadr (murk-msg-params msg)))) - (pcase text - ((rx (: "\01VERSION " - (let version (* (not "\01"))) - "\01")) - (murk-display-notice (murk-get-context network) - "CTCP version reply from " nick ": " version)) - (_ - (murk-display-notice (murk-get-context network channel) text))))) - - ("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 network - (murk-msg nil nil "NOTICE" - (list from (concat "\01VERSION " - version-string - "\01"))))) - (murk-display-notice (murk-get-context network) - "CTCP version request received from " - from " on " network)) - - ((rx (let ping (: "\01PING " (* (not "\01")) "\01"))) - (murk-send-msg network (murk-msg nil nil "NOTICE" (list from ping))) - (murk-display-notice (murk-get-context network) - "CTCP ping received from " from " on " network)) - - ("\01USERINFO\01" - (murk-display-notice (murk-get-context network) - "CTCP userinfo request from " from - " on " network " (no response sent)")) - - ("\01CLIENTINFO\01" - (murk-display-notice (murk-get-context network) - "CTCP clientinfo request from " from - " on " network " (no response sent)")) - - ((rx (: "\01ACTION " (let action-text (* (not "\01"))) "\01")) - (murk-display-action network from to action-text)) - - (_ - (murk-display-message network from to text))))) - - (_ - (murk-display-notice (murk-get-context network) - (murk-msg->string msg)))))) - - -;;; User-defined responses -;; - -(defun murk--lists-equal (l1 l2) - (if (and l1 l2) - (if (or (not (and (car l1) (car l2))) - (string-match (car l1) (car l2))) - (murk--lists-equal (cdr l1) (cdr l2)) - nil) - t)) - -(defun murk-process-autoreply (network msg autoreply) - (let ((matcher (car autoreply)) - (reply (cadr autoreply))) - (let ((target-network (car matcher))) - (when (and (or (not target-network) - (and (equal network target-network))) - (murk--lists-equal (cdr matcher) - (append (list (murk-msg-src msg) - (murk-msg-cmd msg)) - (murk-msg-params msg)))) - (murk-send-msg network - (murk-msg nil nil (car reply) (cdr reply))))))) - -(defun murk-process-autoreplies (network msg) - (mapc - (lambda (autoreply) - (murk-process-autoreply network msg autoreply)) - murk-autoreply-table)) - - -;;; Commands -;; - -(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) - ("SHOWJOINS" "Toggles display of joins/parts." murk-command-showjoins murk-boolean-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-channel-completions) - ("SWITCHCONTEXT" "Switch current context" murk-command-switch-context murk-context-completions) - ("NICK" "Change nick." murk-command-nick) - ("LIST" "Display details of one or more channels." murk-command-list) - ("TOPIC" "Set/query topic for current channel." murk-command-topic) - ("USERS" "List nicks of users in current channel." murk-command-users) - ("MSG" "Send private message to user." murk-command-msg murk-nick-completions) - ("ME" "Display action." murk-command-me) - ("VERSION" "Request version of another user's client via CTCP." murk-command-version murk-nick-completions) - ("CLEAR" "Clear buffer text." murk-command-clear murk-context-completions) - ("HELP" "Display help on client commands." murk-command-help murk-help-completions)) - "Table of commands explicitly supported by murk.") - -(defun murk-boolean-completions () - '("on" "off")) - -(defun murk-network-completions () - (mapcar (lambda (row) (car row)) murk-networks)) - -(defun murk-help-completions () - (mapcar (lambda (row) (car row)) murk-command-table)) - -(defun murk-channel-completions () - (mapcar (lambda (ctx) - (murk-context->string ctx)) - (seq-filter (lambda (ctx) - (not (murk-network-context-p ctx))) - murk-contexts))) - -(defun murk-context-completions () - (mapcar (lambda (ctx) (murk-context->string ctx)) murk-contexts)) - -(defun murk-command-help (params) - (if params - (let* ((cmd-str (upcase (car params))) - (row (assoc cmd-str murk-command-table #'equal))) - (if row - (progn - (murk-display-notice nil "Help for \x02" cmd-str "\x02:") - (murk-display-notice nil " " (elt row 1))) - (murk-display-notice nil "No such (client-interpreted) command."))) - (murk-display-notice nil "Client-interpreted commands:") - (dolist (row murk-command-table) - (murk-display-notice nil " \x02" (elt row 0) "\x02: " (elt row 1))) - (murk-display-notice nil "Use /HELP COMMAND to display information about a specific command."))) - -(defun murk-command-debug (params) - (setq murk-debug - (if params - (if (equal (upcase (car params)) "ON") - t - nil) - (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-showjoins (params) - (setq murk-show-joins - (if params - (if (equal (upcase (car params)) "ON") - t - nil) - (not murk-show-joins))) - (murk-display-notice nil "Joins/parts will now be " - (if murk-show-joins "shown" "hidden") ".")) - -(defun murk-command-connect (params) - (if params - (let ((network (car params))) - (murk-display-notice nil "Attempting to connect to " network "...") - (murk-connect network)) - (murk-display-notice nil "Usage: /connect "))) - -(defun murk-command-networks (_params) - (murk-display-notice nil "Currently-known networks:") - (dolist (row murk-networks) - (seq-let (network network port &rest _others) row - (murk-display-notice nil "\t" network - " [" network - " " (number-to-string port) "]"))) - (murk-display-notice nil "(Modify the `murk-networks' variable to add more.)")) - -(defun murk-command-quit (params) - (let ((ctx (murk-current-context))) - (if (not ctx) - (murk-display-error "No current network") - (let ((quit-msg (if params (string-join params " ") murk-default-quit-msg))) - (murk-send-msg - (murk-context-network ctx) - (murk-msg nil nil "QUIT" quit-msg)))))) - -(defun murk-command-join (params) - (if params - (let ((network (murk-context-network (murk-current-context)))) - (dolist (channel params) - (murk-send-msg network (murk-msg nil nil "JOIN" channel)))) - (murk-display-notice nil "Usage: /join channel [channel2 ...]"))) - -(defun murk-command-part (params) - (let ((ctx (cond - ((not params) (murk-current-context)) - ((seq-contains (car params) "@") (murk-string->context (car params))) - (t (list (murk-context-network (murk-current-context)) (car params)))))) - (let ((network (murk-context-network ctx)) - (channel (murk-context-channel ctx))) - (if channel - (murk-send-msg network (murk-msg nil nil "PART" channel)) - (murk-display-error "Specify which channel to leave"))))) - -(defun murk-command-switch-context (params) - (if (not params) - (murk-display-notice nil "Usage: /switchcontext #channel@network") - (let ((ctx (murk-string->context (car params)))) - (murk-switch-to-context ctx) - (murk-highlight-current-context) - (murk-render-prompt) - (if murk-zoomed - (murk-zoom-in (murk-current-context)))))) - -(defun murk-command-nick (params) - (if params - (let ((new-nick (string-join params " ")) - (ctx (murk-current-context))) - (if ctx - (murk-send-msg (murk-context-network ctx) - (murk-msg nil nil "NICK" new-nick)) - (murk-display-error "No current connection"))) - (murk-display-notice nil "Usage: /nick "))) - -(defun murk-command-list (params) - (let ((ctx (murk-current-context))) - (if ctx - (if (not params) - (murk-display-notice nil "This command can generate lots of output." - " Use `/LIST -yes' if you really want this," - " or `/LIST ' to reduce the output.") - (let ((network (murk-context-network ctx))) - (if (equal (upcase (car params)) "-YES") - (murk-send-msg network (murk-msg nil nil "LIST")) - (murk-send-msg network (murk-msg nil nil "LIST" - (car params)))))) - (murk-display-error "No current connection")))) - -(defun murk-command-topic (params) - (let ((ctx (murk-current-context))) - (if (and ctx (not (murk-network-context-p ctx))) - (let ((network (murk-context-network ctx)) - (channel (murk-context-channel ctx))) - (if params - (murk-send-msg network - (murk-msg nil nil "TOPIC" channel - (string-join params " "))) - (murk-send-msg network - (murk-msg nil nil "TOPIC" channel)))) - (murk-display-notice nil "No current channel.")))) - -(defun murk-command-msg (params) - (let ((network (murk-context-network (murk-current-context)))) - (if (and params (>= (length params) 2)) - (let ((to (car params)) - (text (string-join (cdr params) " "))) - (murk-send-msg network (murk-msg nil nil "PRIVMSG" to text)) - (murk-display-message network - (murk-connection-nick network) - to text)) - (murk-display-notice nil "Usage: /msg ")))) - -(defun murk-command-me (params) - (let* ((ctx (murk-current-context)) - (network (murk-context-network ctx))) - (if (and ctx (not (murk-network-context-p ctx))) - (if params - (let* ((channel (murk-context-channel ctx)) - (my-nick (murk-connection-nick network)) - (action (string-join params " ")) - (ctcp-text (concat "\01ACTION " action "\01"))) - (murk-send-msg network - (murk-msg nil nil "PRIVMSG" - (list channel ctcp-text))) - (murk-display-action network my-nick channel action)) - (murk-display-notice nil "Usage: /me ")) - (murk-display-notice nil "No current channel.")))) - -(defun murk-command-version (params) - (let ((ctx (murk-current-context))) - (if ctx - (if params - (let ((network (murk-context-network ctx)) - (nick (car params))) - (murk-send-msg network - (murk-msg nil nil "PRIVMSG" - (list nick "\01VERSION\01"))) - (murk-display-notice ctx "CTCP version request sent to " - nick " on " network)) - (murk-display-notice ctx "Usage: /version ")) - (murk-display-notice nil "No current channel.")))) - -(defun murk-command-users (_params) - (let ((ctx (murk-current-context))) - (if (and ctx (not (murk-network-context-p ctx))) - (let ((channel (murk-context-channel ctx)) - (network (murk-context-network ctx)) - (users (murk-get-context-users ctx))) - (murk-display-notice ctx "Users in " channel " on " network ":") - (murk-display-notice ctx (string-join users " "))) - (murk-display-notice nil "No current channel.")))) - - -;;; Command entering -;; - -(defun murk-enter-string (string) - (if (string-prefix-p "/" string) - (pcase string - ((rx (: "/" (let cmd-str (+ (not whitespace))) - (opt (+ whitespace) - (let params-str (+ anychar)) - string-end))) - (let ((command-row (assoc (upcase cmd-str) murk-command-table #'equal)) - (params (if params-str - (split-string params-str nil t) - nil))) - (if (and command-row (elt command-row 2)) - (funcall (elt command-row 2) params) - (murk-send-msg - (murk-context-network (murk-current-context)) - (murk-msg nil nil (upcase cmd-str) params))))) - (_ - (murk-display-error "Badly formed command"))) - (unless (string-empty-p string) - (let ((ctx (murk-current-context))) - (if ctx - (if (not (murk-network-context-p ctx)) - (let ((network (murk-context-network ctx)) - (channel (murk-context-channel ctx))) - (murk-send-msg network - (murk-msg nil nil "PRIVMSG" channel string)) - (murk-display-message network - (murk-connection-nick network) - channel string)) - (murk-display-error "No current channel")) - (murk-display-error "No current context")))))) - - -;;; Command history -;; - -(defvar murk-history nil - "Commands and messages sent in current session.") - -(defvar murk-history-index nil) - -(defun murk-history-cycle (delta) - (when murk-history - (with-current-buffer "*murk*" - (if murk-history-index - (setq murk-history-index - (max 0 - (min (- (length murk-history) 1) - (+ delta murk-history-index)))) - (setq murk-history-index 0)) - (delete-region murk-input-marker (point-max)) - (insert (elt murk-history murk-history-index))))) - - -;;; Interactive commands -;; - -(defun murk-enter () - "Enter current contents of line after prompt." - (interactive) - (with-current-buffer "*murk*" - (let ((line (buffer-substring murk-input-marker (point-max)))) - (push line murk-history) - (setq murk-history-index nil) - (let ((inhibit-read-only t)) - (delete-region murk-input-marker (point-max))) - (murk-enter-string line)))) - -(defun murk-history-next () - (interactive) - (murk-history-cycle -1)) - -(defun murk-history-prev () - (interactive) - (murk-history-cycle +1)) - -(defun murk-cycle-contexts-forward () - (interactive) - (murk-cycle-contexts) - (murk-highlight-current-context) - (murk-render-prompt) - (if murk-zoomed - (murk-zoom-in (murk-current-context)))) - -(defun murk-cycle-contexts-reverse () - (interactive) - (murk-cycle-contexts t) - (murk-highlight-current-context) - (murk-render-prompt) - (if murk-zoomed - (murk-zoom-in (murk-current-context)))) - -(defvar murk-zoomed nil - "Keeps track of zoom status.") - -(defun murk-toggle-zoom () - (interactive) - (if murk-zoomed - (murk-zoom-out) - (murk-zoom-in (murk-current-context))) - (setq murk-zoomed (not murk-zoomed))) - - -(defun murk-complete-input () - (interactive) - (let ((completion-ignore-case t)) - (when (>= (point) murk-input-marker) - (pcase (buffer-substring murk-input-marker (point)) - ((rx (: "/" (let cmd-str (+ (not whitespace))) (+ " ") (* (not whitespace)) string-end)) - (let ((space-idx (save-excursion - (re-search-backward " " murk-input-marker t))) - (table-row (assoc (upcase cmd-str) murk-command-table #'equal))) - (if (and table-row (elt table-row 3)) - (let* ((completions-nospace (funcall (elt table-row 3))) - (completions (mapcar (lambda (el) (concat el " ")) completions-nospace))) - (completion-in-region (+ 1 space-idx) (point) completions))))) - ((rx (: "/" (* (not whitespace)) string-end)) - (message (buffer-substring murk-input-marker (point))) - (completion-in-region murk-input-marker (point) - (mapcar (lambda (row) (concat "/" (car row) " ")) - murk-command-table))) - (_ - (let* ((end (max murk-input-marker (point))) - (space-idx (save-excursion - (re-search-backward " " murk-input-marker t))) - (start (if space-idx (+ 1 space-idx) murk-input-marker))) - (unless (string-prefix-p "/" (buffer-substring start end)) - (let* ((users (murk-get-context-users (murk-current-context))) - (users-no@ (mapcar - (lambda (u) (car (split-string u "@" t))) - users))) - (completion-in-region start end users-no@))))))))) - -;;; Mode -;; - -(defvar murk-mode-map - (let ((map (make-sparse-keymap))) - (define-key map (kbd "RET") 'murk-enter) - (define-key map (kbd "TAB") 'murk-complete-input) - (define-key map (kbd "C-c C-z") 'murk-toggle-zoom) - (define-key map (kbd "") 'murk-history-prev) - (define-key map (kbd "") 'murk-history-next) - (define-key map (kbd "") 'murk-cycle-contexts-forward) - (define-key map (kbd "") 'murk-cycle-contexts-reverse) - (define-key map (kbd "") 'murk-cycle-contexts-reverse) - (when (fboundp 'evil-define-key*) - (evil-define-key* 'motion map - (kbd "TAB") 'murk-complete-input)) - map)) - -(define-derived-mode murk-mode text-mode "murk" - "Major mode for murk.") - -(when (fboundp 'evil-set-initial-state) - (evil-set-initial-state 'murk-mode 'insert)) - -;;; Main start procedure -;; - -;;;###autoload -(defun murk () - "Start murk or just switch to the murk buffer if one already exists." - (interactive) - (if (get-buffer "*murk*") - (switch-to-buffer "*murk*") - (switch-to-buffer "*murk*") - (murk-mode) - (murk-setup-buffer)) - "Started murk.") - -;;; murk.el ends here -- 2.20.1 From bb9db35e9dcbd5a1ab202aae7b70de524e9cce31 Mon Sep 17 00:00:00 2001 From: plugd Date: Sun, 26 May 2024 21:38:38 +0200 Subject: [PATCH 16/16] Added package definition. --- lurk-pkg.el | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 lurk-pkg.el diff --git a/lurk-pkg.el b/lurk-pkg.el new file mode 100644 index 0000000..00e9096 --- /dev/null +++ b/lurk-pkg.el @@ -0,0 +1,3 @@ +(define-package "lurk" "1.0.0" + "The Little Unibuffer IRC Klient" + ((emacs "26.1"))) -- 2.20.1