From: Tim Vaughan <plugd@thelambdalab.xyz>
Date: Thu, 17 Jun 2021 23:14:13 +0000 (+0200)
Subject: Added channel registration and user list tracking.
X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?a=commitdiff_plain;h=6b835f7f296aa17aad24fc8c60cf4267ae586a56;p=lurk.git

Added channel registration and user list tracking.
---

diff --git a/lirc.el b/lirc.el
index 131b7cc..77a2d60 100644
--- a/lirc.el
+++ b/lirc.el
@@ -65,15 +65,12 @@
 ;;; Global variables
 ;;
 
-(defvar lirc-current-channel nil)
-(defvar lirc-channel-list nil)
-
-(defvar lirc-response "")
-
 
 ;;; 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)
@@ -121,11 +118,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,6 +164,36 @@
        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-channel-get-users channel-name)))
+    (lirc-channel-set-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-channel-set-users channel-name
+                            (cl-set-difference current-users users :test #'equal))))
+
+
 ;;; Buffer
 ;;
 
@@ -223,31 +254,66 @@
 ;;
 
 (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))))
+      ;; ((rx (= 3 digit))
+      ;;  (lirc-display-string (string-join (cdr (lirc-msg-params msg)) " ")))
+
+      ("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))))
+
+      ((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-render-prompt)))
+
+      ("JOIN"
+       (let ((channel (car (lirc-msg-params msg)))
+             (nick (lirc-msg-src msg)))
+        (lirc-add-channel-users channel nick)))
+
+      ((and "PART"
+            (guard (equal lirc-nick (lirc-msg-src msg))))
+       (setq lirc-current-channel nil)
+       (lirc-del-channel (car (lirc-msg-params msg))))
+
+      ("PART"
+       (let ((channel (car (lirc-msg-params msg)))
+             (nick (lirc-msg-src msg)))
+         (lirc-del-channel-users channel nick)))
+
+      ((and "NICK"
+            (guard (equal lirc-nick (lirc-msg-src msg))))
+       (setq lirc-nick (car (lirc-msg-params msg)))
+       (lirc-display-string (concat "*** Set nick to " lirc-nick)))
+
+      ("PRIVMSG"
+       (let ((nick (lirc-msg-src msg))
+             (channel (car (lirc-msg-params msg)))
+             (text (cadr (lirc-msg-params msg))))
+         (lirc-display-string (concat 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)
+       (cmd-str
+        (lirc-send-msg (lirc-msg nil nil cmd-str))))
+    (error "Not implemented.")))
 
 (defun lirc-enter ()
   "Enter current contents of line after prompt."