
* doc/misc/erc.texi: Add new section under "Integrations" chapter describing `display-buffer' Custom function choice for ERC's many buffer-display options. * etc/ERC-NEWS: Mention new function variant for all buffer-display options. * lisp/erc/erc-backend.el: Add forward declaration for `erc--called-as-input-p' and `erc--display-context'. (erc--server-reconnect-display-timer, erc--server-last-reconnect-display-reset): Use new name for option `erc-reconnect-display', now `erc-auto-reconnect-display'. (erc--server-determine-join-display-context): New generic function to determine value of `erc--display-context' during JOINs. (erc-server-JOIN, erc-server-PRIVMSG): Set `erc--display-context' to a symbol for the handler's IRC command, like `JOIN', for the benefit of custom `display-buffer'-like functions running in `erc-setup-buffer'. (erc-server-471, erc-server-471-functions, erc-server-473, erc-server-473-functions): New handlers for JOIN rejections. Also remove 471 and 473 from comment at bottom of file. (erc-server-475): Bind `erc--called-as-input-p' so that `erc-cmd-JOIN' sets `erc-interactive-display' context. * lisp/erc/erc-join.el (erc-autojoin-mode, erc-autojoin-enable, erc-autojoin-disable): Kill local variable `erc-join--requested-channels'. Add and remove `erc-join--remove-requested-channels' to/from various server-handler hooks for JOIN rejection numerics. (erc-join--requested-channels): New local variable to remember channels we've attempted to JOIN this session that haven't yet been confirmed by the server. (erc-join--remove-requested-channel): New JOIN rejection handler to stop tracking channel in `erc-join--requested-channels'. (erc--server-determine-join-display-context): module-specific implementation of generic function for `erc-autojoin-mode'. (erc-autojoin--join): Remember channels slated for JOIN'ing. * lisp/erc/erc.el (erc--buffer-display-choices): New helper constant for defining common `:type' for all buffer-display options. (erc-buffer-display, erc-interactive-display, erc-auto-reconnect-display, erc-receive-query-display): Use helper `erc--buffer-display-choices' for defining `:type', which includes a new choice for a `display-buffer'-like function. (erc-reconnect-display, erc-auto-reconnect-display): Alias former to latter, now the preferred name. (erc-reconnect-timeout, erc-auto-reconnect-timeout): Change name from former to latter. This option is new in ERC 5.6. (erc-reconnect-display-server-buffers): New option. (erc-buffer-do): Revise doc string. (erc--display-context): New variable, an alist of "context tokens" to be forwarded as the "action alist" to `erc-buffer-display' functions. (erc-skip-displaying-selected-window-buffer): New variable, deprecated at birth, to act as an escape hatch for folks who don't want to skip the displaying of buffers already showing in the selected window. (erc--display-buffer-overriding-action): Local variable allowing modules to influence the displaying of new ERC buffers independently of user options. (erc-setup-buffer): Do nothing when the selected window already shows current buffer unless user has provided a custom display function. Accommodate new Custom choice function values, like `display-buffer' and `pop-to-buffer'. (erc-open): Run `erc-setup-buffer' when option `erc-reconnect-display-server-buffers' is non-nil, even for existing server buffers. Bind `display-buffer-overriding-action' to the value of `erc--display-buffer-overriding-action' around calls to `erc-setup-buffer'. (erc-select-read-args): Add `erc--display-context' to environment. (erc, erc-tls): Bind `erc--display-context' around calls to `erc-select-read-args' and main body. (erc-cmd-JOIN, erc-cmd-QUERY, erc--cmd-reconnect, erc-handle-irc-url): Add item for `erc-interactive-display' to `erc--display-context'. (erc-connection-established): Update name of `erc-reconnect-display-timeout' to `erc-auto-reconnect-display-timeout'. (erc-message-english-s471, erc-message-english-s473): New variables, format templates for JOIN rejection messages. * test/lisp/erc/erc-scenarios-base-buffer-display.el (erc-scenarios-base-buffer-display--defwin-recbury-intbuf, erc-scenarios-base-buffer-display--defwino-recbury-intbuf, erc-scenarios-base-buffer-display--count-reset-timeout): Use preferred name `erc-auto-reconnect-display' for `erc-reconnect-display'. * test/lisp/erc/erc-scenarios-join-display-context.el: New file. * test/lisp/erc/erc-tests.el (erc--initialize-markers): Fix unrealistic call to `erc-open'. (erc-setup-buffer--custom-action): New test. (erc-select-read-args, erc-tls, erc--interactive, erc-server-select): Expect new environment binding for `erc--display-context'. * test/lisp/erc/resources/join/buffer-display/mode-context.eld: New file. (Bug#62833)
256 lines
11 KiB
EmacsLisp
256 lines
11 KiB
EmacsLisp
;;; erc-join.el --- autojoin channels on connect and reconnects -*- lexical-binding: t; -*-
|
|
|
|
;; Copyright (C) 2002-2004, 2006-2023 Free Software Foundation, Inc.
|
|
|
|
;; Author: Alex Schroeder <alex@gnu.org>
|
|
;; Maintainer: Amin Bandali <bandali@gnu.org>, F. Jason Park <jp@neverwas.me>
|
|
;; Keywords: comm, irc
|
|
;; URL: https://www.emacswiki.org/emacs/ErcAutoJoin
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
|
;; it under the terms of the GNU General Public License as published by
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
;; (at your option) any later version.
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
;; GNU General Public License for more details.
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
;;; Commentary:
|
|
|
|
;; This allows us to customize an `erc-autojoin-channels-alist'. As
|
|
;; we /JOIN and /PART channels, this alist is updated to reflect our
|
|
;; current setup, so that when we reconnect, we rejoin the same
|
|
;; channels. The alist can be customized, so that the customized
|
|
;; value will be used when we reconnect in our next Emacs session.
|
|
|
|
;;; Code:
|
|
|
|
(require 'erc)
|
|
|
|
(defgroup erc-autojoin nil
|
|
"Enable autojoining."
|
|
:group 'erc)
|
|
|
|
;;;###autoload(autoload 'erc-autojoin-mode "erc-join" nil t)
|
|
(define-erc-module autojoin nil
|
|
"Makes ERC autojoin on connects and reconnects."
|
|
((add-hook 'erc-after-connect #'erc-autojoin-channels)
|
|
(add-hook 'erc-nickserv-identified-hook #'erc-autojoin-after-ident)
|
|
(add-hook 'erc-server-JOIN-functions #'erc-autojoin-add)
|
|
(add-hook 'erc-server-PART-functions #'erc-autojoin-remove)
|
|
(add-hook 'erc-server-405-functions #'erc-join--remove-requested-channel)
|
|
(add-hook 'erc-server-471-functions #'erc-join--remove-requested-channel)
|
|
(add-hook 'erc-server-473-functions #'erc-join--remove-requested-channel)
|
|
(add-hook 'erc-server-474-functions #'erc-join--remove-requested-channel)
|
|
(add-hook 'erc-server-475-functions #'erc-join--remove-requested-channel))
|
|
((remove-hook 'erc-after-connect #'erc-autojoin-channels)
|
|
(remove-hook 'erc-nickserv-identified-hook #'erc-autojoin-after-ident)
|
|
(remove-hook 'erc-server-JOIN-functions #'erc-autojoin-add)
|
|
(remove-hook 'erc-server-PART-functions #'erc-autojoin-remove)
|
|
(remove-hook 'erc-server-405-functions #'erc-join--remove-requested-channel)
|
|
(remove-hook 'erc-server-471-functions #'erc-join--remove-requested-channel)
|
|
(remove-hook 'erc-server-473-functions #'erc-join--remove-requested-channel)
|
|
(remove-hook 'erc-server-474-functions #'erc-join--remove-requested-channel)
|
|
(remove-hook 'erc-server-475-functions #'erc-join--remove-requested-channel)
|
|
(erc-buffer-do (lambda ()
|
|
(kill-local-variable 'erc-join--requested-channels)))))
|
|
|
|
(defcustom erc-autojoin-channels-alist nil
|
|
"Alist of channels to autojoin on IRC networks.
|
|
Every element in the alist has the form (SERVER . CHANNELS).
|
|
SERVER is a regexp matching the server, and channels is the list
|
|
of channels to join. SERVER can also be a symbol, in which case
|
|
it's matched against a non-nil `:id' passed to `erc' or `erc-tls'
|
|
when connecting or the value of the current `erc-network' instead of
|
|
`erc-server-announced-name' or `erc-session-server' (this can be
|
|
useful when connecting to an IRC proxy that relays several
|
|
networks under the same server).
|
|
|
|
Note that for historical reasons, this option is mutated at runtime,
|
|
which is regrettable but here to stay. Please double check the value
|
|
before saving it to a `custom-file'.
|
|
|
|
If the channel(s) require channel keys for joining, the passwords
|
|
are found via auth-source. For instance, if you use ~/.authinfo
|
|
as your auth-source backend, then put something like the
|
|
following in that file:
|
|
|
|
machine irc.example.net login \"#fsf\" password sEcReT
|
|
|
|
Customize this variable to set the value for your first connect.
|
|
Once you are connected and join and part channels, this alist
|
|
keeps track of what channels you are on, and will join them
|
|
again when you get disconnected. When you restart Emacs, however,
|
|
those changes are lost, and the customization you saved the last
|
|
time is used again."
|
|
:type '(alist :options (Libera.Chat)
|
|
:key-type (choice :tag "Server"
|
|
(symbol :tag "Network")
|
|
(regexp :tag "Host or domain"))
|
|
:value-type (repeat :tag "Channels" (string :tag "Name"))))
|
|
|
|
(defcustom erc-autojoin-timing 'connect
|
|
"When ERC should attempt to autojoin a channel.
|
|
If the value is `connect', autojoin immediately on connecting.
|
|
If the value is `ident', autojoin after successful NickServ
|
|
identification, or after `erc-autojoin-delay' seconds.
|
|
Any other value means the same as `connect'."
|
|
:version "24.1"
|
|
:type '(choice (const :tag "On Connection" connect)
|
|
(const :tag "When Identified" ident)))
|
|
|
|
(defcustom erc-autojoin-delay 30
|
|
"Number of seconds to wait before attempting to autojoin channels.
|
|
This only takes effect if `erc-autojoin-timing' is `ident'.
|
|
If NickServ identification occurs before this delay expires, ERC
|
|
autojoins immediately at that time."
|
|
:version "24.1"
|
|
:type 'integer)
|
|
|
|
(defcustom erc-autojoin-domain-only t
|
|
"Truncate host name to the domain name when joining a server.
|
|
If non-nil, and a channel on the server a.b.c is joined, then
|
|
only b.c is used as the server for `erc-autojoin-channels-alist'.
|
|
This is important for networks that redirect you to other
|
|
servers, presumably in the same domain."
|
|
:type 'boolean)
|
|
|
|
(defvar-local erc--autojoin-timer nil)
|
|
|
|
(defun erc-autojoin-channels-delayed (server nick buffer)
|
|
"Attempt to autojoin channels.
|
|
This is called from a timer set up by `erc-autojoin-channels'."
|
|
(if erc--autojoin-timer
|
|
(setq erc--autojoin-timer
|
|
(cancel-timer erc--autojoin-timer)))
|
|
(with-current-buffer buffer
|
|
;; Don't kick of another delayed autojoin or try to wait for
|
|
;; another ident response:
|
|
(let ((erc-autojoin-delay -1)
|
|
(erc-autojoin-timing 'connect))
|
|
(erc-log "Delayed autojoin started (no ident success detected yet)")
|
|
(erc-autojoin-channels server nick))))
|
|
|
|
(defun erc-autojoin-server-match (candidate)
|
|
"Match the current network ID or server against CANDIDATE.
|
|
CANDIDATE is a key from `erc-autojoin-channels-alist'. Return the
|
|
matching entity, either a string or a non-nil symbol (in the case of a
|
|
network or a network ID). Return nil on failure."
|
|
(if (symbolp candidate)
|
|
(eq (or (erc-networks--id-given erc-networks--id) (erc-network))
|
|
candidate)
|
|
(when (stringp candidate)
|
|
(string-match-p candidate (or erc-server-announced-name
|
|
erc-session-server)))))
|
|
|
|
(defvar-local erc-join--requested-channels nil
|
|
"List of channels for which an outgoing JOIN was sent.")
|
|
|
|
;; Assume users will update their `erc-autojoin-channels-alist' when
|
|
;; encountering errors, like a 475 ERR_BADCHANNELKEY.
|
|
(defun erc-join--remove-requested-channel (_ parsed)
|
|
"Remove channel from `erc-join--requested-channels'."
|
|
(when-let ((channel (cadr (erc-response.command-args parsed)))
|
|
((member channel erc-join--requested-channels)))
|
|
(setq erc-join--requested-channels
|
|
(delete channel erc-join--requested-channels)))
|
|
nil)
|
|
|
|
(cl-defmethod erc--server-determine-join-display-context
|
|
(channel alist &context (erc-autojoin-mode (eql t)))
|
|
"Add item to `erc-display-context' ALIST if CHANNEL was autojoined."
|
|
(when (member channel erc-join--requested-channels)
|
|
(setq erc-join--requested-channels
|
|
(delete channel erc-join--requested-channels))
|
|
(push (cons 'erc-autojoin-mode channel) alist))
|
|
(cl-call-next-method channel alist))
|
|
|
|
(defun erc-autojoin--join ()
|
|
;; This is called in the server buffer
|
|
(pcase-dolist (`(,name . ,channels) erc-autojoin-channels-alist)
|
|
(when-let ((match (erc-autojoin-server-match name)))
|
|
(dolist (chan channels)
|
|
(let ((buf (erc-get-buffer chan erc-server-process)))
|
|
(unless (and buf (with-current-buffer buf
|
|
(erc--current-buffer-joined-p)))
|
|
(push chan erc-join--requested-channels)
|
|
(erc-server-join-channel nil chan)))))))
|
|
|
|
(defun erc-autojoin-after-ident (_network _nick)
|
|
"Autojoin channels in `erc-autojoin-channels-alist'.
|
|
This function is run from `erc-nickserv-identified-hook'."
|
|
(when (eq erc-autojoin-timing 'ident)
|
|
(erc-autojoin--join)))
|
|
|
|
(defun erc-autojoin-channels (server nick)
|
|
"Autojoin channels in `erc-autojoin-channels-alist'."
|
|
(if (eq erc-autojoin-timing 'ident)
|
|
;; Prepare the delayed autojoin timer, in case ident doesn't
|
|
;; happen within the allotted time limit:
|
|
(when (> erc-autojoin-delay 0)
|
|
(setq erc--autojoin-timer
|
|
(run-with-timer erc-autojoin-delay nil
|
|
#'erc-autojoin-channels-delayed
|
|
server nick (current-buffer))))
|
|
;; `erc-autojoin-timing' is `connect':
|
|
(erc-autojoin--join)))
|
|
|
|
(defun erc-autojoin-current-server ()
|
|
"Compute the current server for lookup in `erc-autojoin-channels-alist'.
|
|
Respects `erc-autojoin-domain-only'."
|
|
(let ((server (or erc-server-announced-name erc-session-server)))
|
|
(if (and erc-autojoin-domain-only
|
|
(string-match "[^.\n]+\\.\\([^.\n]+\\.[^.\n]+\\)$" server))
|
|
(match-string 1 server)
|
|
server)))
|
|
|
|
(defun erc-autojoin--mutate (proc parsed remove)
|
|
(when-let* ((nick (car (erc-parse-user (erc-response.sender parsed))))
|
|
((erc-current-nick-p nick))
|
|
(chnl (car (erc-response.command-args parsed)))
|
|
(elem (or (and (erc--valid-local-channel-p chnl)
|
|
(regexp-quote erc-server-announced-name))
|
|
(erc-networks--id-given erc-networks--id)
|
|
(erc-network)
|
|
(with-current-buffer (process-buffer proc)
|
|
(erc-autojoin-current-server))))
|
|
(test (if (symbolp elem) #'eq #'equal)))
|
|
(if remove
|
|
(let ((cs (delete chnl (assoc-default elem erc-autojoin-channels-alist
|
|
test))))
|
|
(setf (alist-get elem erc-autojoin-channels-alist nil (null cs) test)
|
|
cs))
|
|
(cl-pushnew chnl
|
|
(alist-get elem erc-autojoin-channels-alist nil nil test)
|
|
:test #'equal))))
|
|
|
|
(defun erc-autojoin-add (proc parsed)
|
|
"Add the channel being joined to `erc-autojoin-channels-alist'."
|
|
(erc-autojoin--mutate proc parsed nil)
|
|
;; We must return nil to tell ERC to continue running the other
|
|
;; functions.
|
|
nil)
|
|
|
|
;; (erc-parse-user "kensanata!~user@dclient217-162-233-228.hispeed.ch")
|
|
|
|
(defun erc-autojoin-remove (proc parsed)
|
|
"Remove the channel being left from `erc-autojoin-channels-alist'."
|
|
(erc-autojoin--mutate proc parsed 'remove)
|
|
;; We must return nil to tell ERC to continue running the other
|
|
;; functions.
|
|
nil)
|
|
|
|
(provide 'erc-join)
|
|
|
|
;;; erc-join.el ends here
|
|
;;
|
|
;; Local Variables:
|
|
;; generated-autoload-file: "erc-loaddefs.el"
|
|
;; End:
|