"Default full name.")
(defcustom lirc-user-name "plugd"
"Default user name.")
-(defcustom lirc-host "localhost"
+(defcustom lirc-host "irc.libera.chat"
"Default server.")
-(defcustom lirc-port 6667
+(defcustom lirc-port 6697
"Default port.")
(defcustom lirc-prompt-string "> "
;;; 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.")
'((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-version "Lirc v0.1")
+
+(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
;;
(lirc-eval-msg-string (string-trim line))
(setq lirc-response line))))
-(defun lirc-get-process ()
+(defun lirc-get-process (&optional connect)
(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*"))))
+ (if connect
+ (make-network-process :name "lirc"
+ :host lirc-host
+ :service lirc-port
+ :filter #'lirc-filter
+ :nowait nil
+ :tls-parameters (cons 'gnutls-x509pki
+ (gnutls-boot-parameters
+ :type 'gnutls-x509pki
+ :hostname lirc-host))
+ :buffer "*lirc*")
+ (lirc-display-error "No server connection established.")
+ (error "No server connection established")))))
;;; Messages
;;
(defun lirc-del-channel-users (channel-name &rest users)
(let ((current-users (lirc-get-channel-users channel-name)))
- (lirc-channel-set-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))))))
+ (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))))))
(defun lirc-connect ()
+ (lirc-get-process t)
(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-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)
(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.")
(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)
+ ;; (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)) " ")))
("353" ; NAMEREPLY
(let* ((params (lirc-msg-params msg))
(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-add-channel-users channel nick)
+ (lirc-display-notice nick " joined channel " channel)))
((and "PART"
(guard (equal lirc-nick (lirc-msg-src msg))))
+ (lirc-display-notice "Left channel " lirc-current-channel)
(setq lirc-current-channel nil)
- (lirc-del-channel (car (lirc-msg-params msg))))
+ (lirc-del-channel (car (lirc-msg-params msg)))
+ (lirc-render-prompt))
("PART"
(let ((channel (car (lirc-msg-params msg)))
(nick (lirc-msg-src msg)))
- (lirc-del-channel-users channel nick)))
+ (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-string (concat "*** Set nick to " lirc-nick)))
+ (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))))
- (lirc-display-string (concat channel " <" nick "> " text))))
+ (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))))))
(defun lirc-enter-string (string)
(if (string-prefix-p "/" string)
(pcase (substring string 1)
- ((rx (: (let cmd-str (+ (not space))))
- (opt
- (: (+ " ")
- (let params-str (+ anything)))))
- (lirc-send-msg (lirc-msg nil nil
- cmd-str
+ ((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")
+ (lirc-send-msg (lirc-msg nil nil "PART" lirc-current-channel)))
+
+ ((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)))))
- (lirc-send-msg (lirc-msg nil nil "PRIVMSG" lirc-current-channel string))))
+
+ (unless (string-empty-p string)
+ (lirc-send-msg (lirc-msg nil nil "PRIVMSG" lirc-current-channel string))
+ (lirc-display-message lirc-current-channel lirc-nick string))))
(defun lirc-enter ()
"Enter current contents of line after prompt."
The Lambda Lab / projects / lurk.git / blobdiff