X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?a=blobdiff_plain;f=lirc.el;h=a5a0500e578cafb21a10ffd34d8eb413b31ad23c;hb=6cee2fa822e2861b99872372a0c1cc234ca21383;hp=131b7ccb42e44cd9c818c03ae643a7375287c1af;hpb=bdfc5855121daf26be78530df1dbb605aad428f9;p=lurk.git

diff --git a/lirc.el b/lirc.el
index 131b7cc..a5a0500 100644
--- a/lirc.el
+++ b/lirc.el
@@ -43,10 +43,12 @@
   "Default full name.")
 (defcustom lirc-user-name "plugd"
   "Default user name.")
-(defcustom lirc-host "localhost"
-  "Default server.")
-(defcustom lirc-port 6667
-  "Default port.")
+
+(defcustom lirc-networks
+  '(("libera" "irc.libera.chat" 6697)
+    ("freenode" "chat.freenode.net" 6697)
+    ("local" "localhost" 6697))
+  "IRC networks.")
 
 (defcustom lirc-prompt-string "> "
   "Prompt.")
@@ -54,6 +56,14 @@
 ;;; Faces
 ;;
 
+(defface lirc-text
+  '((t :inherit font-lock-preprocessor-face))
+  "Face used for Lirc text.")
+
+(defface lirc-your-nick
+  '((t :inherit font-lock-constant-face))
+  "Face used for highlighting your nick.")
+
 (defface lirc-prompt
   '((t :inherit org-level-2))
   "Face used for the prompt.")
@@ -62,34 +72,78 @@
   '((t :inherit org-list-dt))
   "Face used for the channel name in the prompt.")
 
+(defface lirc-faded
+  '((t :inherit font-lock-preprocessor-face))
+  "Face used for faded Lirc text.")
+
+(defface lirc-bold
+  '((t :inherit font-lock-function-name-face))
+  "Face used for bold Lirc text.")
+
+(defface lirc-error
+  '((t :inherit font-lock-regexp-grouping-construct))
+  "Face used for Lirc error text.")
+
 ;;; Global variables
 ;;
 
-(defvar lirc-current-channel nil)
-(defvar lirc-channel-list nil)
+(defvar lirc-version "Lirc v0.1")
 
-(defvar lirc-response "")
+(defvar lirc-notice-prompt
+  (concat
+   (propertize
+    "-" 'face 'lirc-faded)
+   (propertize
+    "!" 'face 'lirc-bold)
+   (propertize
+    "-" 'face 'lirc-faded)))
 
+(defvar lirc-error-prompt
+  (propertize "!!!" 'face 'lirc-error))
 
 ;;; Network process
 ;;
 
+(defvar lirc-response "")
+
 (defun lirc-filter (proc string)
   (dolist (line (split-string (concat lirc-response string) "\n"))
     (if (string-suffix-p "\r" line)
         (lirc-eval-msg-string (string-trim line))
       (setq lirc-response line))))
 
-(defun lirc-get-process ()
+(defun lirc-sentinel (proc string)
+  (message string))
+
+(defun lirc-start-process (network)
+  (let* ((row (assoc network lirc-networks))
+         (host (elt row 1))
+         (port (elt row 2)))
+    (make-network-process :name "lirc"
+                          :host host
+                          :service port
+                          :filter #'lirc-filter
+                          :nowait nil
+                          :tls-parameters (cons 'gnutls-x509pki
+                                                (gnutls-boot-parameters
+                                                 :type 'gnutls-x509pki
+                                                 :hostname host))
+                          :buffer "*lirc*")))
+
+
+(defun lirc-connect (network)
+  (setq lirc-channel-list nil)
+  (setq lirc-current-channel nil)
+  (lirc-start-process network)
+  (lirc-send-msg (lirc-msg nil nil "USER" lirc-user-name 0 "*" lirc-full-name))
+  (lirc-send-msg (lirc-msg nil nil "NICK" lirc-nick)))
+
+(defun lirc-send-msg (msg)
   (let ((proc (get-process "lirc")))
     (if (and proc (eq (process-status proc) 'open))
-        proc
-      (make-network-process :name "lirc"
-                            :host lirc-host
-                            :service lirc-port
-                            :filter #'lirc-filter
-                            :nowait t
-                            :buffer "*lirc*"))))
+        (process-send-string proc (concat (lirc-msg->string msg) "\r\n"))
+      (lirc-display-error "No server connection established.")
+      (error "No server connection established"))))
 
 ;;; Messages
 ;;
@@ -121,11 +175,15 @@
   (rx
    (opt (: "@" (group (* (not (or "\n" "\r" ";" " ")))))
         (* whitespace))
-   (opt (: ":" (group (* (not (or "\n" "\r" " ")))))
+   (opt (: ":" (: (group (* (not (any space "!" "@"))))
+                  (* (not (any space)))))
         (* whitespace))
    (group (: (* (not whitespace))))
    (* whitespace)
-   (opt (group (+ not-newline)))))
+   (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 LIRC doesn't use this.")
 
 (defun lirc-string->msg (string)
   (if (string-match lirc-msg-regex string)
@@ -163,29 +221,71 @@
        nil))))
 
 
+;;; Channels
+;;
+
+(defvar lirc-current-channel nil)
+(defvar lirc-channel-list nil)
+
+(defun lirc-add-channel (channel-name)
+  (add-to-list 'lirc-channel-list
+               (list channel-name)))
+
+(defun lirc-del-channel (channel-name)
+  (setq lirc-channel-list
+        (assoc-delete-all channel-name lirc-channel-list)))
+
+(defun lirc-get-channel-users (channel-name)
+  (cdr (assoc channel-name lirc-channel-list)))
+
+(defun lirc-set-channel-users (channel-name users)
+  (setcdr (assoc channel-name lirc-channel-list) users))
+
+(defun lirc-add-channel-users (channel-name &rest users)
+  (let ((current-users (lirc-get-channel-users channel-name)))
+    (lirc-set-channel-users channel-name (append users current-users))))
+
+(defun lirc-del-channel-users (channel-name &rest users)
+  (let ((current-users (lirc-get-channel-users channel-name)))
+    (lirc-set-channel-users channel-name
+                            (cl-set-difference current-users users :test #'equal))))
+
+(defun lirc-del-users (&rest users)
+  (dolist (channel lirc-channel-list)
+    (apply #'lirc-del-channel-users (cons (car channel) users))))
+
+(defun lirc-rename-user (old-nick new-nick)
+  (dolist (channel lirc-channel-list)
+    (let ((channel-name (car channel))
+          (channel-users (cdr channel)))
+      (when (memq old-nick channel-users)
+        (lirc-del-channel-users old-nick)
+        (lirc-add-channel-users new-nick)))))
+
+
 ;;; Buffer
 ;;
 
-(defun lirc-display-string (string)
+(defun lirc-display-string (&rest strings)
   (with-current-buffer (get-buffer-create "*lirc*")
     (save-excursion
       (goto-char lirc-prompt-marker)
-      (let ((inhibit-read-only t))
-        (insert-before-markers (propertize (concat string "\n") 'read-only t))))))
-
-(defun lirc-connect ()
-  (lirc-send-msg (lirc-msg nil nil "USER" lirc-user-name 0 "*" lirc-full-name))
-  (lirc-send-msg (lirc-msg nil nil "NICK" lirc-nick)))
-
-(defun lirc-send-msg (msg)
-  (let ((proc (lirc-get-process)))
-    (process-send-string proc (concat (lirc-msg->string msg) "\r\n"))))
+      (let ((inhibit-read-only t)
+            (old-pos (marker-position lirc-prompt-marker))
+            (adaptive-fill-regexp (rx (= 6 anychar))))
+        (insert-before-markers
+         (propertize (concat (format-time-string "%H:%M") " ")
+                     'face 'lirc-text
+                     'read-only t)
+         (propertize (concat (apply #'concat strings) "\n")
+                     'read-only t))
+        (fill-region old-pos lirc-prompt-marker)))))
 
 (defun lirc-render-prompt ()
   (with-current-buffer "*lirc*"
-    (set-marker-insertion-type lirc-prompt-marker nil)
-    (set-marker-insertion-type lirc-input-marker t)
     (save-excursion
+      (set-marker-insertion-type lirc-prompt-marker nil)
+      (set-marker-insertion-type lirc-input-marker t)
       (let ((inhibit-read-only t))
         (delete-region lirc-prompt-marker lirc-input-marker)
         (goto-char lirc-prompt-marker)
@@ -198,8 +298,8 @@
          (propertize lirc-prompt-string
                      'face 'lirc-prompt
                      'read-only t
-                     'rear-nonsticky t)))))
-  (set-marker-insertion-type lirc-input-marker nil))
+                     'rear-nonsticky t)))
+      (set-marker-insertion-type lirc-input-marker nil))))
   
 (defvar lirc-prompt-marker nil
   "Marker for prompt position in LIRC buffer.")
@@ -219,35 +319,201 @@
     (goto-char (point-max))
     (recenter -1)))
 
+
+;;; Output formatting
+;;
+
+(defun lirc-display-action (channel nick action)
+  (lirc-display-string (concat " * "
+                               (propertize (concat nick " " action)
+                                           'face 'lirc-text))))
+
+(defun lirc-display-message (channel nick message)
+  (lirc-display-string
+   (concat
+    (propertize (concat channel " ")
+                'face 'lirc-text)
+    (propertize (concat "<" nick "> ")
+                'face
+                (if (equal nick lirc-nick)
+                    'lirc-your-nick
+                  'lirc-text))
+    (propertize message 'face 'lirc-text))))
+
+(defun lirc-display-notice (&rest notices)
+  (lirc-display-string lirc-notice-prompt " " (apply #'concat notices)))
+
+(defun lirc-display-error (&rest messages)
+  (lirc-display-string lirc-error-prompt " "
+                       (propertize (apply #'concat messages)
+                                   'face 'lirc-error)))
+
 ;;; Message evaluation
 ;;
 
 (defun lirc-eval-msg-string (string)
+  ;; (lirc-display-string string)
   (let* ((msg (lirc-string->msg string)))
     (pcase (lirc-msg-cmd msg)
-     ("PING"
-      (lirc-send-msg
-       (lirc-msg nil nil "PONG" (lirc-msg-params msg))))
-     ;; ((rx (= 3 digit))
-     ;;  (lirc-display-string (string-join (cdr (lirc-msg-params msg)) " ")))
-     ((and "JOIN" (let (rx (: (literal lirc-nick) "!" (* anychar))) (lirc-msg-src msg)))
-      (let ((channel (car (lirc-msg-params msg))))
-        (setq lirc-current-channel channel)
-        (add-to-list 'lirc-channel-list channel)
-        (lirc-render-prompt)))
-     (_
-      (lirc-display-string (lirc-msg->string msg))))))
+      ("PING"
+       (lirc-send-msg
+        (lirc-msg nil nil "PONG" (lirc-msg-params msg)))
+       (lirc-display-notice "ping-pong"))
+
+      ("353" ; NAMEREPLY
+       (let* ((params (lirc-msg-params msg))
+              (channel (elt params 2))
+              (names (split-string (elt params 3))))
+         (apply #'lirc-add-channel-users (cons channel names))))
+
+      ("366" ; ENDOFNAMES
+       (lirc-display-notice
+        (lirc-as-string (length (lirc-get-channel-users lirc-current-channel)))
+        " users in " lirc-current-channel))
+
+      ((rx (= 3 (any digit)))
+       (lirc-display-notice (mapconcat 'identity (cdr (lirc-msg-params msg)) " ")))
+
+      ((and "JOIN"
+            (guard (equal lirc-nick (lirc-msg-src msg))))
+       (let ((channel (car (lirc-msg-params msg))))
+         (setq lirc-current-channel channel)
+         (lirc-add-channel channel)
+         (lirc-display-notice "Joining channel " channel)
+         (lirc-render-prompt)))
+
+      ("JOIN"
+       (let ((channel (car (lirc-msg-params msg)))
+             (nick (lirc-msg-src msg)))
+         (lirc-add-channel-users channel nick)
+         (lirc-display-notice nick " joined channel " channel)))
+
+      ((and "PART"
+            (guard (equal lirc-nick (lirc-msg-src msg))))
+       (let ((channel (car (lirc-msg-params msg))))
+         (lirc-display-notice "Left channel " channel)
+         (lirc-del-channel (car (lirc-msg-params msg)))
+         (when (equal lirc-current-channel channel)
+           (setq lirc-current-channel nil)
+           (lirc-render-prompt))))
+
+      ("PART"
+       (let ((channel (car (lirc-msg-params msg)))
+             (nick (lirc-msg-src msg)))
+         (lirc-del-channel-users channel nick)
+         (lirc-display-notice nick " left channel " channel)))
+
+      ("QUIT"
+       (let ((nick (lirc-msg-src msg))
+             (reason (mapconcat 'identity (lirc-msg-params msg) " ")))
+         (lirc-del-users nick)
+         (lirc-display-notice nick " quit: " reason)))
+
+      ((and "NICK"
+            (guard (equal lirc-nick (lirc-msg-src msg))))
+       (setq lirc-nick (car (lirc-msg-params msg)))
+       (lirc-display-notice "Set nick to " lirc-nick))
+
+      ("NICK"
+       (let ((old-nick (lirc-msg-src msg))
+             (new-nick (car (lirc-msg-params msg))))
+         (lirc-display-notice nick " is now known as " new-nick)
+         (lirc-rename-user nick new-nick)))
+
+      ("NOTICE"
+       (let ((nick (lirc-msg-src msg))
+             (channel (car (lirc-msg-params msg)))
+             (text (cadr (lirc-msg-params msg))))
+         (pcase text
+           ((rx (: "\01VERSION "
+                   (let version (* (not "\01")))
+                   "\01"))
+            (lirc-display-notice "CTCP version reply from " nick ": " version))
+           (_
+            (lirc-display-notice text)))))
+
+      ("PRIVMSG"
+       (let ((nick (lirc-msg-src msg))
+             (channel (car (lirc-msg-params msg)))
+             (text (cadr (lirc-msg-params msg))))
+         (pcase text
+           ((rx (: "\01ACTION "
+                   (let action (* (not "\01")))
+                   "\01"))
+            (lirc-display-action nick action))
+
+           ("\01VERSION\01"
+            (let ((version-string (concat lirc-version " - running on GNU Emacs " emacs-version)))
+              (lirc-send-msg (lirc-msg nil nil "NOTICE"
+                                       (list nick (concat "\01VERSION "
+                                                          version-string
+                                                          "\01")))))
+            (lirc-display-notice "CTCP version request received from " nick))
+
+           ((rx (let ping (: "\01PING " (* (not "\01")) "\01")))
+            (lirc-send-msg (lirc-msg nil nil "NOTICE" (list nick ping)))
+            (lirc-display-notice "CTCP ping received from " nick))
+
+           ("\01USERINFO\01"
+            (lirc-display-notice "CTCP userinfo request from " nick " (no response sent)"))
+
+           (_
+            (lirc-display-message channel nick text)))))
+      (_
+       (lirc-display-string (lirc-msg->string msg))))))
 
 
 ;;; Command entering
 ;;
 
 (defun lirc-enter-string (string)
-  (cond ((string-prefix-p "/" string)
-         (let ((cmd-str (substring string 1)))
-           (lirc-send-msg (lirc-msg nil nil cmd-str))))
-        (t
-         (error "Unknown command" string))))
+  (if (string-prefix-p "/" string)
+      (pcase (substring string 1)
+        ((rx (: "CONNECT " (let network (* not-newline))))
+         (lirc-display-notice "Connecting to " network "...")
+         (lirc-connect network))
+
+        ((rx (: "TOPIC " (let new-topic (* not-newline))))
+         (lirc-send-msg (lirc-msg nil nil "TOPIC" lirc-current-channel new-topic)))
+
+        ((rx (: "ME " (let action (* not-newline))))
+         (lirc-send-msg (lirc-msg nil nil "PRIVMSG"
+                                  (list lirc-current-channel
+                                        (concat "\01ACTION " action "\01"))))
+         (lirc-display-action lirc-nick action))
+
+        ((rx (: "VERSION" " " (let nick (* (not whitespace)))))
+         (lirc-send-msg (lirc-msg nil nil "PRIVMSG"
+                                  (list nick "\01VERSION\01")))
+         (lirc-display-notice "CTCP version request sent to " nick))
+
+        ((rx "PART" (opt (: " " (let channel (* not-newline)))))
+         (if (or lirc-current-channel channel)
+             (lirc-send-msg (lirc-msg nil nil "PART" (if channel
+                                                         channel
+                                                       lirc-current-channel)))
+           (lirc-display-error "No current channel to leave.")))
+
+        ((rx "MSG "
+             (let target (* (not whitespace)))
+             " "
+             (let text (* not-newline)))
+         (lirc-send-msg (lirc-msg nil nil "PRIVMSG" target text))
+         (lirc-display-message target lirc-nick text))
+
+        ((rx (: (let cmd-str (+ (not whitespace)))
+                (opt (: " " (let params-str (* not-newline))))))
+         (lirc-send-msg (lirc-msg nil nil (upcase cmd-str)
+                                  (if params-str
+                                      (split-string params-str)
+                                    nil)))))
+
+    (unless (string-empty-p string)
+      (if lirc-current-channel
+          (progn
+            (lirc-send-msg (lirc-msg nil nil "PRIVMSG" lirc-current-channel string))
+            (lirc-display-message lirc-current-channel lirc-nick string))
+        (lirc-display-error "No current channel.")))))
 
 (defun lirc-enter ()
   "Enter current contents of line after prompt."
@@ -285,7 +551,6 @@
     (switch-to-buffer "*lirc*"))
   (lirc-mode)
   (lirc-setup-buffer)
-  (lirc-connect)
   "Started LIRC.")