X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?a=blobdiff_plain;f=lurk.el;h=68fff0d07821fa1482324039c5b3d4931628f3fb;hb=26875ae30c72b8471716530e9c5bfcf5da02e71a;hp=7b46aae44923166e9bf1e6d939d77444e7f1cd1d;hpb=13de999a3a8667a9c5dafbdb70a591f0660e2ee2;p=lurk.git diff --git a/lurk.el b/lurk.el index 7b46aae..68fff0d 100644 --- a/lurk.el +++ b/lurk.el @@ -580,7 +580,8 @@ portion of the source component of the message, as LURK doesn't use this.") (underline nil) (strikethrough nil) (prev-point (point))) - (while (re-search-forward (rx (any "\x02\x1D\x1F\x1E")) nil t) + (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))) @@ -594,7 +595,13 @@ portion of the source component of the message, as LURK doesn't use this.") ("\x02" (setq bold (not bold))) ("\x1D" (setq italics (not italics))) ("\x1F" (setq underline (not underline))) - ("\x1E" (setq strikethrough (not strikethrough)))) + ("\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))) @@ -809,87 +816,56 @@ in which case they match anything.") (lurk-process-autoreply msg autoreply)) lurk-autoreply-table)) + +;;; Commands +;; + +(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) + ("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) + ("PART" "Leave channel." lurk-command-part lurk-context-completions) + ("QUIT" "Disconnect from current network." lurk-command-quit) + ("NICK" "Change nick." lurk-command-nick) + ("LIST" "Display details of one or more channels." lurk-command-list) + ("MSG" "Send private message to user." lurk-command-msg lurk-nick-completions)) + "Table of commands explicitly supported by Lurk.") + +(defun lurk-boolean-completions () + '("on" "off")) + +(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)) + + ;;; Command entering ;; (defun lurk-enter-string (string) (if (string-prefix-p "/" string) - (pcase (substring string 1) - ((rx (: "DEBUG" (opt (: " " (let setting (or "ON" "OFF")))))) - (setq lurk-debug - (if setting - (if (equal (upcase setting) "ON") - t - nil) - (not lurk-debug))) - (lurk-display-notice nil "Debug mode now " (if lurk-debug "on" "off") ".")) - - ((rx "HEADER") - (if header-line-format - (progn - (setq-local header-line-format nil) - (lurk-display-notice nil "Header disabled.")) - (lurk-setup-header) - (lurk-display-notice nil "Header enabled."))) - - ((rx (: "CONNECT " (let network (* not-newline)))) - (lurk-display-notice nil "Attempting to connect to " network "...") - (lurk-connect network)) - - ((rx (: "TOPIC " (let new-topic (* not-newline)))) - (lurk-send-msg (lurk-msg nil nil "TOPIC" lurk-current-context new-topic))) - - ((rx (: "ME " (let action (* not-newline)))) - (let ((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))) - - ((rx (: "VERSION" " " (let nick (+ (not whitespace))))) - (lurk-send-msg (lurk-msg nil nil "PRIVMSG" - (list nick "\01VERSION\01"))) - (lurk-display-notice nil "CTCP version request sent to " nick)) - - ((rx "PART" (opt (: " " (let channel (* not-newline))))) - (if (or lurk-current-context channel) - (lurk-send-msg (lurk-msg nil nil "PART" (if channel - channel - lurk-current-context))) - (lurk-display-error "No current channel to leave."))) - - ((rx "QUIT" (opt (: " " (let quit-msg (* not-newline))))) - (lurk-send-msg (lurk-msg nil nil "QUIT" - (or quit-msg lurk-default-quit-msg)))) - - ((rx (: "NICK" (* whitespace) string-end)) - (lurk-display-notice nil "Current nick: " lurk-nick)) - - ((rx (: "NICK" (+ whitespace) (let nick (+ (not whitespace))))) - (if (lurk-connected-p) - (lurk-send-msg (lurk-msg nil nil "NICK" nick)) - (setq lurk-nick nick) - (lurk-display-notice nil "Set default nick to '" nick "'"))) - - ((rx (: "LIST" (* whitespace) string-end)) - (lurk-display-notice nil "This command can generate lots of output. Use `LIST -yes' if you're sure.")) - - ((rx (: "LIST" (+ whitespace) "-YES" (* whitespace) string-end)) - (lurk-send-msg (lurk-msg nil nil "LIST"))) - - ((rx "MSG " - (let to (* (not whitespace))) - " " - (let text (* not-newline))) - (lurk-send-msg (lurk-msg nil nil "PRIVMSG" to text)) - (lurk-display-message lurk-nick to text)) - - ((rx (: (let cmd-str (+ (not whitespace))) - (opt (: " " (let params-str (* not-newline)))))) - (lurk-send-msg (lurk-msg nil nil (upcase cmd-str) - (if params-str - (split-string params-str) - nil))))) - + (pcase string + ((rx (: "/" (let cmd-str (+ (not whitespace))) + (opt (+ whitespace) + (let params-str (+ anychar)) + string-end))) + (let ((command-row (assoc (upcase cmd-str) lurk-command-table #'equal)) + (params (if params-str + (split-string params-str nil t) + nil))) + (if command-row + (funcall (elt command-row 2) params) + (lurk-send-msg (lurk-msg nil nil (upcase cmd-str) params))))) + (_ + (lurk-display-error "Badly formed command."))) (unless (string-empty-p string) (if lurk-current-context (progn @@ -899,6 +875,101 @@ in which case they match anything.") (lurk-display-message lurk-nick lurk-current-context string)) (lurk-display-error "No current context."))))) +(defun lurk-command-debug (params) + (setq lurk-debug + (if params + (if (equal (upcase (car params)) "ON") + t + nil) + (not lurk-debug))) + (lurk-display-notice nil "Debug mode now " (if lurk-debug "on" "off") ".")) + +(defun lurk-command-header (params) + (if + (if params + (equal (upcase (car params)) "ON") + (not header-line-format)) + (progn + (lurk-setup-header) + (lurk-display-notice nil "Header enabled.")) + (setq-local header-line-format nil) + (lurk-display-notice nil "Header disabled."))) + +(defun lurk-command-connect (params) + (if params + (let ((network (car params))) + (lurk-display-notice nil "Attempting to connect to " network "...") + (lurk-connect network)) + (lurk-display-notice nil "Usage: /connect "))) + +(defun lurk-command-quit (params) + (let ((quit-msg (if params (string-join params " ") nil))) + (lurk-send-msg (lurk-msg nil nil "QUIT" quit-msg)))) + +(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 parms " ") lurk-default-quit-msg))) + (lurk-send-msg (lurk-msg nil nil "QUIT" quit-msg)))) + +(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 nick) + (lurk-display-notice nil "Set default nick to '" 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."))) + +(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)))))) + +(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."))) + +(defun lurk-command-msg (params) + (if (and params (>= 2 (length params))) + (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 "))) + + +;;; Command history +;; + (defvar lurk-history nil "Commands and messages sent in current session.") @@ -936,6 +1007,7 @@ in which case they match anything.") (interactive) (lurk-history-cycle +1)) + ;;; Interactive functions ;; @@ -959,24 +1031,28 @@ in which case they match anything.") (defun lurk-complete-input () (interactive) - (when (and (>= (point) lurk-input-marker)) - (pcase (buffer-substring lurk-input-marker (point)) - ((rx (: "/connect" (+ " ") - (opt (let network (* (not whitespace)))) - string-end)) - (let ((space-idx (save-excursion - (re-search-backward " " lurk-input-marker t)))) - (completion-in-region (+ 1 space-idx) - (point) - (mapcar (lambda (row) (car row)) lurk-networks)))) - (_ - (let* ((end (max lurk-input-marker (point))) - (space-idx (save-excursion - (re-search-backward " " lurk-input-marker t))) - (start (if space-idx (+ 1 space-idx) lurk-input-marker)) - (completion-ignore-case t)) - (unless (string-prefix-p "/" (buffer-substring start end)) - (completion-in-region start end (lurk-get-context-users lurk-current-context)))))))) + (let ((completion-ignore-case t)) + (when (and (>= (point) lurk-input-marker)) + (pcase (buffer-substring lurk-input-marker (point)) + ((rx (: "/" (let cmd-str (+ (not whitespace))) (+ " ") (* (not whitespace)) string-end)) + (let ((space-idx (save-excursion + (re-search-backward " " lurk-input-marker t))) + (table-row (assoc (upcase cmd-str) lurk-command-table #'equal))) + (if (and table-row (elt table-row 3)) + (let ((completions (funcall (elt table-row 3)))) + (completion-in-region (+ 1 space-idx) (point) completions))))) + ((rx (: "/" (* (not whitespace)) string-end)) + (message (buffer-substring lurk-input-marker (point))) + (completion-in-region lurk-input-marker (point) + (mapcar (lambda (row) (string-join (list "/" (car row)))) + lurk-command-table))) + (_ + (let* ((end (max lurk-input-marker (point))) + (space-idx (save-excursion + (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)) + (completion-in-region start end (lurk-get-context-users lurk-current-context))))))))) ;;; Mode @@ -991,10 +1067,6 @@ in which case they match anything.") (define-key map (kbd "") 'lurk-cycle-contexts-reverse) (define-key map (kbd "") 'lurk-history-prev) (define-key map (kbd "") 'lurk-history-next) - ;; (when (fboundp 'evil-define-key*) - ;; (evil-define-key* 'insert map - ;; (kbd "") 'lurk-history-prev - ;; (kbd "") 'lurk-history-next)) map)) (defvar lurk-mode-map)