More Elisp linting
This should cover most of the remaining linting errors. After this, I expect fewer than ten linting errors.
This commit is contained in:
William Carroll
parent
a638e15c0d
commit
fb5ec068dd
47 changed files with 1049 additions and 989 deletions
|
|
@ -1,5 +1,9 @@
|
|||
;;; irc.el --- Configuration for IRC chat -*- lexical-binding: t -*-
|
||||
|
||||
;; Author: William Carroll <wpcarro@gmail.com>
|
||||
;; Version: 0.0.1
|
||||
;; URL: https://git.wpcarro.dev/wpcarro/briefcase
|
||||
;; Package-Requires: ((emacs "24"))
|
||||
|
||||
;;; Commentary:
|
||||
;; Need to decide which client I will use for IRC.
|
||||
|
|
@ -24,47 +28,47 @@
|
|||
;; Configuration
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
|
||||
(defconst irc/enable-tests? t
|
||||
(defconst irc-enable-tests? t
|
||||
"When t, run the tests defined herein.")
|
||||
|
||||
(setq erc-rename-buffers t)
|
||||
|
||||
;; TODO: Find a way to avoid putting "freenode" and "#freenode" as channels
|
||||
;; here. I'm doing it because when erc first connects, it's `(buffer-name)' is
|
||||
;; "freenode", so when `irc/next-channel' is called, it 404s on the
|
||||
;; `cycle/contains?' call in `irc/channel->cycle" unless "freenode" is there. To
|
||||
;; "freenode", so when `irc-next-channel' is called, it 404s on the
|
||||
;; `cycle-contains?' call in `irc-channel->cycle" unless "freenode" is there. To
|
||||
;; make matters even uglier, when `erc-join-channel' is called with "freenode"
|
||||
;; as the value, it connects to the "#freenode" channel, so unless "#freenode"
|
||||
;; exists in this cycle also, `irc/next-channel' breaks again. This doesn't
|
||||
;; exists in this cycle also, `irc-next-channel' breaks again. This doesn't
|
||||
;; pass my smell test.
|
||||
(defconst irc/server->channels
|
||||
`(("irc.freenode.net" . ,(cycle/new "freenode" "#freenode" "#nixos" "#emacs" "#pass"))
|
||||
("irc.corp.google.com" . ,(cycle/new "#omg" "#london" "#panic" "#prod-team")))
|
||||
(defconst irc-server->channels
|
||||
`(("irc.freenode.net" . ,(cycle-new "freenode" "#freenode" "#nixos" "#emacs" "#pass"))
|
||||
("irc.corp.google.com" . ,(cycle-new "#omg" "#london" "#panic" "#prod-team")))
|
||||
"Mapping of IRC servers to a cycle of my preferred channels.")
|
||||
|
||||
;; TODO: Assert that no two servers have a channel with the same name. We need
|
||||
;; this because that's the assumption that underpins the `irc/channel->server'
|
||||
;; this because that's the assumption that underpins the `irc-channel->server'
|
||||
;; function. This will probably be an O(n^2) operation.
|
||||
(prelude-assert
|
||||
(set/distinct? (set/from-list
|
||||
(cycle/to-list
|
||||
(alist/get "irc.freenode.net"
|
||||
irc/server->channels)))
|
||||
(set/from-list
|
||||
(cycle/to-list
|
||||
(alist/get "irc.corp.google.com"
|
||||
irc/server->channels)))))
|
||||
(set-distinct? (set-from-list
|
||||
(cycle-to-list
|
||||
(alist-get "irc.freenode.net"
|
||||
irc-server->channels)))
|
||||
(set-from-list
|
||||
(cycle-to-list
|
||||
(alist-get "irc.corp.google.com"
|
||||
irc-server->channels)))))
|
||||
|
||||
(defun irc/channel->server (server->channels channel)
|
||||
(defun irc-channel->server (server->channels channel)
|
||||
"Resolve an IRC server from a given CHANNEL."
|
||||
(let ((result (alist/find (lambda (k v) (cycle/contains? channel v))
|
||||
(let ((result (alist-find (lambda (k v) (cycle-contains? channel v))
|
||||
server->channels)))
|
||||
(prelude-assert (maybe-some? result))
|
||||
result))
|
||||
|
||||
(defun irc/channel->cycle (server->channels channel)
|
||||
(defun irc-channel->cycle (server->channels channel)
|
||||
"Resolve an IRC's channels cycle from a given CHANNEL."
|
||||
(alist/get (irc/channel->server server->channels channel)
|
||||
(alist-get (irc-channel->server server->channels channel)
|
||||
server->channels))
|
||||
|
||||
;; Setting `erc-join-buffer' to 'bury prevents erc from stealing focus of the
|
||||
|
|
@ -73,19 +77,19 @@
|
|||
|
||||
;; TODO: Here is another horrible hack that should be revisted.
|
||||
(setq erc-autojoin-channels-alist
|
||||
(->> irc/server->channels
|
||||
(alist/map-values #'cycle/to-list)
|
||||
(alist/map-keys (>> (s-chop-prefix "irc.")
|
||||
(->> irc-server->channels
|
||||
(alist-map-values #'cycle-to-list)
|
||||
(alist-map-keys (>> (s-chop-prefix "irc.")
|
||||
(s-chop-suffix ".net")))))
|
||||
|
||||
(defcustom irc/install-kbds? t
|
||||
(defcustom irc-install-kbds? t
|
||||
"When t, install the keybindings defined herein.")
|
||||
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
;; Library
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
|
||||
(defun irc/message (x)
|
||||
(defun irc-message (x)
|
||||
"Print message X in a structured way."
|
||||
(message (string-format "[irc.el] %s" x)))
|
||||
|
||||
|
|
@ -93,31 +97,31 @@
|
|||
|
||||
;; TODO: Support function or KBD for switching to an ERC buffer.
|
||||
|
||||
(defun irc/kill-all-erc-processes ()
|
||||
(defun irc-kill-all-erc-processes ()
|
||||
"Kills all ERC buffers and processes."
|
||||
(interactive)
|
||||
(->> (erc-buffer-list)
|
||||
(-map #'kill-buffer)))
|
||||
|
||||
(defun irc/switch-to-erc-buffer ()
|
||||
(defun irc-switch-to-erc-buffer ()
|
||||
"Switch to an ERC buffer."
|
||||
(interactive)
|
||||
(let ((buffers (erc-buffer-list)))
|
||||
(if (list/empty? buffers)
|
||||
(if (list-empty? buffers)
|
||||
(error "[irc.el] No ERC buffers available")
|
||||
(switch-to-buffer (list/head (erc-buffer-list))))))
|
||||
(switch-to-buffer (list-head (erc-buffer-list))))))
|
||||
|
||||
(defun irc/connect-to-freenode ()
|
||||
(defun irc-connect-to-freenode ()
|
||||
"Connect to Freenode IRC."
|
||||
(interactive)
|
||||
(erc-ssl :server "irc.freenode.net"
|
||||
:port 6697
|
||||
:nick "wpcarro"
|
||||
:password (password-store-get "programming/irc/freenode")
|
||||
:password (password-store-get "programming/irc-freenode")
|
||||
:full-name "William Carroll"))
|
||||
|
||||
;; TODO: Handle failed connections.
|
||||
(defun irc/connect-to-google ()
|
||||
(defun irc-connect-to-google ()
|
||||
"Connect to Google's Corp IRC using ERC."
|
||||
(interactive)
|
||||
(erc-ssl :server "irc.corp.google.com"
|
||||
|
|
@ -127,26 +131,26 @@
|
|||
|
||||
;; TODO: Prefer defining these with a less homespun solution. There is a
|
||||
;; function call `erc-buffer-filter' that would be more appropriate for the
|
||||
;; implementation of `irc/next-channel' and `irc/prev-channel'.
|
||||
(defun irc/next-channel ()
|
||||
;; implementation of `irc-next-channel' and `irc-prev-channel'.
|
||||
(defun irc-next-channel ()
|
||||
"Join the next channel for the active server."
|
||||
(interactive)
|
||||
(with-current-buffer (current-buffer)
|
||||
(let ((cycle (irc/channel->cycle irc/server->channels (buffer-name))))
|
||||
(let ((cycle (irc-channel->cycle irc-server->channels (buffer-name))))
|
||||
(erc-join-channel
|
||||
(cycle/next cycle))
|
||||
(irc/message
|
||||
(string-format "Current IRC channel: %s" (cycle/current cycle))))))
|
||||
(cycle-next cycle))
|
||||
(irc-message
|
||||
(string-format "Current IRC channel: %s" (cycle-current cycle))))))
|
||||
|
||||
(defun irc/prev-channel ()
|
||||
(defun irc-prev-channel ()
|
||||
"Join the previous channel for the active server."
|
||||
(interactive)
|
||||
(with-current-buffer (current-buffer)
|
||||
(let ((cycle (irc/channel->cycle irc/server->channels (buffer-name))))
|
||||
(let ((cycle (irc-channel->cycle irc-server->channels (buffer-name))))
|
||||
(erc-join-channel
|
||||
(cycle/prev cycle))
|
||||
(irc/message
|
||||
(string-format "Current IRC channel: %s" (cycle/current cycle))))))
|
||||
(cycle-prev cycle))
|
||||
(irc-message
|
||||
(string-format "Current IRC channel: %s" (cycle-current cycle))))))
|
||||
|
||||
(add-hook 'erc-mode-hook (macros-disable auto-fill-mode))
|
||||
(add-hook 'erc-mode-hook (macros-disable company-mode))
|
||||
|
|
@ -155,21 +159,21 @@
|
|||
;; Keybindings
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
|
||||
(when irc/install-kbds?
|
||||
(when irc-install-kbds?
|
||||
(general-define-key
|
||||
:keymaps 'erc-mode-map
|
||||
"<C-tab>" #'irc/next-channel
|
||||
"<C-S-iso-lefttab>" #'irc/prev-channel))
|
||||
"<C-tab>" #'irc-next-channel
|
||||
"<C-S-iso-lefttab>" #'irc-prev-channel))
|
||||
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
;; Tests
|
||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
|
||||
(when irc/enable-tests?
|
||||
(when irc-enable-tests?
|
||||
(prelude-assert
|
||||
(equal
|
||||
(irc/channel->server `(("irc.dairy.com" . ,(cycle/new "#cheese" "#milk"))
|
||||
("irc.color.com" . ,(cycle/new "#red" "#blue")))
|
||||
(irc-channel->server `(("irc.dairy.com" . ,(cycle-new "#cheese" "#milk"))
|
||||
("irc.color.com" . ,(cycle-new "#red" "#blue")))
|
||||
"#cheese")
|
||||
"irc.dairy.com")))
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue