X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?a=blobdiff_plain;f=murk.el;h=1014c1e01b9560079fef6d06aaf5d6f345285a57;hb=8f9509d726d0d86aae9ab72a7d49f5b9a29d18c4;hp=1903a33d171e1d7aeed639efee25a8720e636a04;hpb=050c1fe2eeffe1d815c5c84db4e783711b3298ee;p=lurk.git diff --git a/murk.el b/murk.el index 1903a33..1014c1e 100644 --- a/murk.el +++ b/murk.el @@ -53,7 +53,9 @@ '(("debug" "localhost" 6697) ("libera" "irc.libera.chat" 6697) ("tilde" "tilde.chat" 6697) - ("freenode" "chat.freenode.net" 6697)) + ("sdf" "irc.sdf.org" 6697) + ("freenode" "chat.freenode.net" 6697) + ("mbr" "mbrserver.com" 6667 :notls)) "IRC networks." :type '(alist :key-type string)) @@ -312,12 +314,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,13 +350,21 @@ 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)) - (assoc server murk-contexts))) + (car (member (list server) murk-contexts)))) (defun murk-cycle-contexts (&optional reverse) (setq murk-contexts @@ -357,6 +375,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 @@ -516,6 +541,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 @@ -733,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)) @@ -762,7 +809,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 +834,8 @@ 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) + ("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.") @@ -928,6 +977,36 @@ 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-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)))