X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?a=blobdiff_plain;f=murk.el;h=ffe10e6d0e2da03645e8c9104f61f84898532130;hb=af0002ab9d15c31a8286dcbd8335e0637eae5d9c;hp=fb790617ae3c9abb3011a93c8165f8c5e5789e0d;hpb=14e7306e9457469d704d364ccc753189244adff4;p=lurk.git diff --git a/murk.el b/murk.el index fb79061..ffe10e6 100644 --- a/murk.el +++ b/murk.el @@ -1,13 +1,13 @@ -;;; MURK --- Multiserver Unibuffer iRc Klient -*- lexical-binding:t -*- +;;; murk.el --- Multiserver Unibuffer iRc Klient -*- lexical-binding:t -*- ;; Copyright (C) 2024 plugd ;; Author: plugd ;; Created: 11 May 2024 ;; Version: 0.0 -;; Keywords: network ;; Homepage: http://thelambdalab.xyz/murk -;; Package-Requires: ((emacs "26")) +;; Keywords: comm +;; Package-Requires: ((emacs "26.1")) ;; This file is not part of GNU Emacs. @@ -26,10 +26,14 @@ ;;; Commentary: +;; A very simple IRC server which uses only a single buffer. + ;;; Code: (provide 'murk) +(require 'cl-lib) + ;;; Customizations @@ -38,19 +42,24 @@ :group 'network) (defcustom murk-default-nick "plugd" - "Default nick.") + "Default nick." + :type '(string)) (defcustom murk-default-quit-msg "Bye" - "Default quit message when none supplied.") + "Default quit message when none supplied." + :type '(string)) (defcustom murk-networks '(("debug" "localhost" 6667 :notls) ("libera" "irc.libera.chat" 6697) - ("tilde" "tilde.chat" 6697)) - "IRC networks.") + ("tilde" "tilde.chat" 6697) + ("freenode" "chat.freenode.net" 6697)) + "IRC networks." + :type '(alist :key-type string)) (defcustom murk-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)) ;;; Faces @@ -138,10 +147,12 @@ This includes the process and the response string.") (list server process nick ""))) (defun murk-connection-remove (server) - (setq murk-connection-table (assoc-delete-all server murk-connection-table))) + (setq murk-connection-table + (seq-remove (lambda (row) (equal (car row) server)) + murk-connection-table))) (defun murk-make-server-filter (server) - (lambda (proc string) + (lambda (_proc string) (dolist (line (split-string (concat (murk-connection-response server) string) "\n")) (if (string-suffix-p "\r" line) @@ -149,7 +160,7 @@ This includes the process and the response string.") (murk-set-connection-response server line))))) (defun murk-make-server-sentinel (server) - (lambda (proc string) + (lambda (_proc string) (unless (equal "open" (string-trim string)) (murk-display-error "Disconnected from server.") (murk-connection-remove server) @@ -182,7 +193,7 @@ This includes the process and the response string.") (defun murk-connect (server) (if (assoc server murk-connection-table) - (murk-display-error "Already connected to this network.") + (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))) @@ -198,7 +209,7 @@ This includes the process and the response string.") (let ((proc (murk-connection-process server))) (if (and proc (eq (process-status proc) 'open)) (process-send-string proc (concat (murk-msg->string msg) "\r\n")) - (murk-display-error "No server connection established.")))) + (murk-display-error "No server connection established")))) ;;; Server messages @@ -244,13 +255,13 @@ portion of the source component of the message, as mURK 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 #'murk-msg (append (list tags src cmd) params))) - (error "Failed to parse string " string))) + (error "Failed to parse string %s" string))) (defun murk-msg->string (msg) (let ((tags (murk-msg-tags msg)) @@ -269,14 +280,14 @@ portion of the source component of the message, as mURK doesn't use this.") nil)))) -;;; Contexts and Servers +;;; Contexts ;; -;; A context is a list (server name ...) where name is a string -;; representing either a channel name or nick, and server is a symbol -;; identifying the server. +;; A context is a list (server channel users) identifying the server +;; and channel. The tail of the list contains the nicks of users +;; present in the channel. ;; -;; Each server has a special context (server nil) used for messages +;; Each server has a special context (server) used for messages ;; to/from the server itself. (defvar murk-contexts nil @@ -284,7 +295,7 @@ portion of the source component of the message, as mURK doesn't use this.") The head of this list is always the current context.") (defun murk-current-context () - "Returns the current context." + "Return the current context." (if murk-contexts (car murk-contexts) nil)) @@ -299,8 +310,10 @@ The head of this list is always the current context.") (seq-take c2 2))))) (defun murk-context-server (ctx) (elt ctx 0)) -(defun murk-context-name (ctx) (elt ctx 1)) -(defun murk-context-users (ctx) (seq-drop ctx 2)) +(defun murk-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-add-context (ctx) @@ -315,18 +328,46 @@ The head of this list is always the current context.") (defun murk-remove-server-contexts (server) (setq murk-contexts - (assoc-delete-all server murk-contexts))) + (seq-remove (lambda (row) (equal (car row) server)) + murk-contexts))) (defun murk-context->string (ctx) (if (murk-server-context-p ctx) (concat "[" (murk-context-server ctx) "]") - (concat (murk-context-name ctx) "@" + (concat (murk-context-channel ctx) "@" (murk-context-server ctx)))) +(defun murk-get-context (server &optional name) + (if name + (let ((test-ctx (list server name))) + (seq-find (lambda (ctx) + (equal (seq-take ctx 2) test-ctx)) + murk-contexts)) + (assoc server 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-add-context-users (ctx users) + (murk-set-context-users + ctx + (cl-union users (murk-context-users ctx)))) ;;; 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))) @@ -360,12 +401,6 @@ The head of this list is always the current context.") (if (car v) (set-window-point (cadr v) murk-input-marker)))))) -(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-setup-header () (with-current-buffer "*murk*" (setq-local header-line-format @@ -379,7 +414,7 @@ The head of this list is always the current context.") "Server" (concat "Channel: " - (murk-context-name ctx) + (murk-context-channel ctx) " (" (number-to-string (length (murk-context-users ctx))) @@ -450,6 +485,17 @@ The head of this list is always the current context.") 'invisible context-atom))))))) (murk-scroll-windows-to-last-line)) +(defun murk-display-message (server from to text) + (let ((context (if (string-prefix-p "#" to) + (murk-get-context server to) + (murk-get-context server)))) + (murk-display-string + context + (if (murk-server-context-p context) + (concat "[" from " -> " to "]") + (concat (murk-context->string context) " <" from ">")) + text))) + (defun murk-display-notice (context &rest notices) (murk-display-string context @@ -475,8 +521,6 @@ The head of this list is always the current context.") (with-selected-window window (recenter -1)))))) - - (defconst murk-url-regex (rx (: (group (+ alpha)) @@ -567,6 +611,40 @@ The head of this list is always the current context.") (murk-set-connection-nick server nick) (murk-display-notice nil 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))) + (if ctx + (murk-add-context-users ctx names) + (murk-display-notice nil "Users in " channel + ": " (string-join names " "))))) + + ("366" ; ENDOFNAMES + (let* ((params (murk-msg-params msg)) + (channel (elt params 1)) + (ctx (murk-get-context server channel))) + (if ctx + (murk-display-notice + ctx + (murk--as-string (length (murk-context-users ctx))) + " users in " channel) + (murk-display-notice nil "End of " channel " names list.")))) + + ("331" + (let* ((params (murk-msg-params msg)) + (channel (elt params 1)) + (ctx (murk-get-context server channel))) + (murk-display-notice ctx "No topic set."))) + + ("332" + (let* ((params (murk-msg-params msg)) + (channel (elt params 1)) + (topic (elt params 2)) + (ctx (murk-get-context server channel))) + (murk-display-notice ctx "Topic: " topic))) + ((rx (= 3 (any digit))) (murk-display-notice nil (mapconcat 'identity (cdr (murk-msg-params msg)) " "))) @@ -574,7 +652,7 @@ The head of this list is always the current context.") (guard (equal (murk-connection-nick server) (murk-msg-src msg)))) (let ((channel (car (murk-msg-params msg)))) - (murk-add-context (list server channel)) + (murk-add-context (list server channel nil)) (murk-display-notice (murk-current-context) "Joining channel " channel " on " server) (murk-render-prompt))) @@ -594,6 +672,40 @@ The head of this list is always the current context.") (if murk-show-joins (murk-display-notice nil nick " quit: " reason)))) + ("PRIVMSG" + (let* ((from (murk-msg-src msg)) + (params (murk-msg-params msg)) + (to (car params)) + (text (cadr params))) + (pcase text + ("\01VERSION\01" + (let ((version-string (concat murk-version " - running on GNU Emacs " emacs-version))) + (murk-send-msg server + (murk-msg nil nil "NOTICE" + (list from (concat "\01VERSION " + version-string + "\01"))))) + (murk-display-notice nil "CTCP version request received from " + from " on " server)) + + ((rx (let ping (: "\01PING " (* (not "\01")) "\01"))) + (murk-send-msg server (murk-msg nil nil "NOTICE" (list from ping))) + (murk-display-notice nil "CTCP ping received from " from " on " server)) + + ("\01USERINFO\01" + (murk-display-notice nil "CTCP userinfo request from " from + " on " server " (no response sent)")) + + ("\01CLIENTINFO\01" + (murk-display-notice nil "CTCP clientinfo request from " from + " on " server " (no response sent)")) + + ((rx (: "\01ACTION " (let action-text (* (not "\01"))) "\01")) + (murk-display-action from to action-text)) + + (_ + (murk-display-message server from to text))))) + (_ (murk-display-notice nil (murk-msg->string msg)))))) @@ -667,10 +779,10 @@ The head of this list is always the current context.") (murk-connect network)) (murk-display-notice nil "Usage: /connect "))) -(defun murk-command-networks (params) +(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 server port &rest _others) row (murk-display-notice nil "\t" network " [" server " " (number-to-string port) "]"))) @@ -679,7 +791,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 context") (let ((quit-msg (if params (string-join params " ") murk-default-quit-msg))) (murk-send-msg (murk-context-server ctx) @@ -696,11 +808,21 @@ The head of this list is always the current context.") (let* ((server (murk-context-server (murk-current-context))) (channel (if params (car params) - (murk-context-name (murk-current-context))))) + (murk-context-channel (murk-current-context))))) (if channel (murk-send-msg server (murk-msg nil nil "PART" channel)) - (murk-display-error "No current channel to leave.")))) - + (murk-display-error "No current channel to leave")))) + +(defun murk-command-msg (params) + (let ((server (murk-context-server (murk-current-context)))) + (if (and params (>= (length params) 2)) + (let ((to (car params)) + (text (string-join (cdr params) " "))) + (murk-send-msg server (murk-msg nil nil "PRIVMSG" to text)) + (murk-display-message server + (murk-connection-nick server) + to text)) + (murk-display-notice nil "Usage: /msg ")))) ;;; Command entering ;; @@ -722,16 +844,20 @@ The head of this list is always the current context.") (murk-context-server (murk-current-context)) (murk-msg nil nil (upcase cmd-str) params))))) (_ - (murk-display-error "Badly formed command."))) + (murk-display-error "Badly formed command"))) (unless (string-empty-p string) - (if (murk-current-context) - (progn - (murk-send-msg server - (murk-msg nil nil "PRIVMSG" - (murk-context-name murk-current-context) - string)) - (murk-display-message murk-nick (murk-context->string (murk-current-context)) string)) - (murk-display-error "No current context."))))) + (let ((ctx (murk-current-context))) + (if ctx + (if (not (murk-server-context-p ctx)) + (let ((server (murk-context-server ctx)) + (channel (murk-context-channel ctx))) + (murk-send-msg server + (murk-msg nil nil "PRIVMSG" channel string)) + (murk-display-message server + (murk-connection-nick server) + channel string)) + (murk-display-error "No current channel")) + (murk-display-error "No current context")))))) ;;; Command history @@ -777,6 +903,16 @@ The head of this list is always the current context.") (interactive) (murk-history-cycle +1)) +(defun murk-cycle-contexts-forward () + (interactive) + (murk-cycle-contexts) + (murk-render-prompt)) + +(defun murk-cycle-contexts-reverse () + (interactive) + (murk-cycle-contexts t) + (murk-render-prompt)) + (defun murk-complete-input () (interactive) (let ((completion-ignore-case t)) @@ -801,7 +937,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-get-context-users murk-current-context)) + (let* ((users (murk-context-users (murk-current-context))) (users-no@ (mapcar (lambda (u) (car (split-string u "@" t))) users))) @@ -816,6 +952,9 @@ The head of this list is always the current context.") (define-key map (kbd "TAB") 'murk-complete-input) (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)) @@ -840,5 +979,4 @@ The head of this list is always the current context.") (murk-setup-buffer)) "Started murk.") - ;;; murk.el ends here