
* etc/ERC-NEWS: Mention convenience macro being preferred means of defining message templates. Mention renaming of `notify' formatting templates. * lisp/erc/erc-common.el (erc--define-catalog, erc-define-message-format-catalog): New macro and internal variant to replace `erc-define-catalog-entry'. The internal variant allows us to defer reindenting existing definitions until meaningfully edited. * lisp/erc/erc-dcc.el (erc-message-english-dcc-chat-discarded, erc-message-english-dcc-chat-ended, erc-message-english-dcc-chat-no-request, erc-message-english-dcc-chat-offered, erc-message-english-dcc-chat-offer, erc-message-english-dcc-chat-accept, erc-message-english-dcc-chat-privmsg, erc-message-english-dcc-closed, erc-message-english-dcc-command-undefined, erc-message-english-dcc-ctcp-errmsg, erc-message-english-dcc-ctcp-unknown, erc-message-english-dcc-get-bytes-received, erc-message-english-dcc-get-complete, erc-message-english-dcc-get-failed, erc-message-english-dcc-get-cmd-aborted, erc-message-english-dcc-get-file-too-long, erc-message-english-dcc-get-notfound, erc-message-english-dcc-list-head, erc-message-english-dcc-list-line, erc-message-english-dcc-list-item, erc-message-english-dcc-list-end, erc-message-english-dcc-malformed, erc-message-english-dcc-privileged-port, erc-message-english-dcc-request-bogus, erc-message-english-dcc-send-finished, erc-message-english-dcc-send-offered, erc-message-english-dcc-send-offer): Define at top level using `defvar'. * lisp/erc/erc-netsplit.el (erc-netsplit-mode, erc-netsplit-enable): Don't call `erc-netsplit-install-message-catalogs'. (erc-netsplit-install-message-catalogs): Deprecate function. (erc-message-english-netsplit, erc-message-english-netjoin, erc-message-english-netjoin-done, erc-message-english-netsplit-none, erc-message-english-netsplit-wholeft): Define at top level using `defvar'. * lisp/erc/erc-notify.el (erc-notify-install-message-catalogs): Deprecate, and rename all format templates with hyphens instead of underscores. (erc-notify-timer, erc-notify-JOIN, erc-notify-NICK, erc-notify-QUIT): Use hyphenated template names. (erc-cmd-NOTIFY): Use hyphenated template names. Load the module when necessary and emit a warning. Otherwise, people who discover this autoloaded command without being aware of the module's existence may think it's "broken". (pcomplete/erc-mode/NOTIFY): Replace top-level autoload with `require' in function body. Include `erc-notify-list' in list of completions, which makes removal easier if you don't share any channels with a person, and they're not in `erc-server-users'. A better long-term solution might be to WHOIS folks we're unsure about when they're listed in a 303. (erc-message-english-notify_current, erc-message-english-notify_list, erc-message-english-notify_on, erc-message-english-notify_off): Define at top level using `defvar'. Replace nonstandard underscores with hyphens. Alias obsolete names. * lisp/erc/erc-page.el (erc-message-english-CTCP-PAGE): Define at top level using `defvar'. * lisp/erc/erc-sasl.el (erc-message-english-s902, erc-message-english-s904, erc-message-english-s905, erc-message-english-s906, erc-message-english-s907, erc-message-english-s908): Define at top level using `defvar'. * lisp/erc/erc-sound.el (erc-message-english-CTCP-SOUND): Define using `defvar'. * lisp/erc/erc.el (erc--make-message-variable-name): New function to replace `erc-make-message-variable-name' internally, where most uses previously checked whether the returned variable was bound. This helper now does that conditionally, when asked. (erc-make-message-variable-name): Defer to internal variant, `erc--make-message-variable-name'. (erc-define-catalog-entry, erc-define-catalog): Deprecate. (erc-retrieve-catalog-entry): Refactor to favor `default-toplevel-value' of `erc-current-message-catalog' before falling back to `english'. Not doing this was arguably a bug. (erc-message-english-bad-ping-response, erc-message-english-bad-syntax, erc-message-english-incorrect-args, erc-message-english-cannot-find-file, erc-message-english-cannot-read-file, erc-message-english-connect, erc-message-english-country, erc-message-english-country-unknown, erc-message-english-ctcp-empty, erc-message-english-ctcp-request, erc-message-english-ctcp-request-to, erc-message-english-ctcp-too-many, erc-message-english-flood-ctcp-off, erc-message-english-flood-strict-mode, erc-message-english-disconnected, erc-message-english-disconnected-noreconnect, erc-message-english-reconnecting, erc-message-english-reconnect-canceled, erc-message-english-finished, erc-message-english-terminated, erc-message-english-login, erc-message-english-nick-in-use, erc-message-english-nick-too-long, erc-message-english-no-default-channel, erc-message-english-no-invitation, erc-message-english-no-target, erc-message-english-ops, erc-message-english-ops-none, erc-message-english-undefined-ctcp, erc-message-english-user-mode-redundant-add, erc-message-english-user-mode-redundant-drop, erc-message-english-variable-not-bound, erc-message-english-ACTION, erc-message-english-CTCP-CLIENTINFO, erc-message-english-CTCP-ECHO, erc-message-english-CTCP-FINGER, erc-message-english-CTCP-PING, erc-message-english-CTCP-TIME, erc-message-english-CTCP-UNKNOWN, erc-message-english-CTCP-VERSION, erc-message-english-ERROR, erc-message-english-INVITE, erc-message-english-JOIN, erc-message-english-JOIN-you, erc-message-english-KICK, erc-message-english-KICK-you, erc-message-english-KICK-by-you, erc-message-english-MODE, erc-message-english-MODE-nick, erc-message-english-NICK, erc-message-english-NICK-you, erc-message-english-PART, erc-message-english-PING, erc-message-english-PONG, erc-message-english-QUIT, erc-message-english-TOPIC, erc-message-english-WALLOPS, erc-message-english-s004, erc-message-english-s221, erc-message-english-s252, erc-message-english-s253, erc-message-english-s254, erc-message-english-s275, erc-message-english-s301, erc-message-english-s303, erc-message-english-s305, erc-message-english-s306, erc-message-english-s307, erc-message-english-s311, erc-message-english-s312, erc-message-english-s313, erc-message-english-s314, erc-message-english-s317, erc-message-english-s317-on-since, erc-message-english-s319, erc-message-english-s320, erc-message-english-s321, erc-message-english-s322, erc-message-english-s324, erc-message-english-s328, erc-message-english-s329, erc-message-english-s330, erc-message-english-s331, erc-message-english-s332, erc-message-english-s333, erc-message-english-s341, erc-message-english-s352, erc-message-english-s353, erc-message-english-s367, erc-message-english-s367-set-by, erc-message-english-s368, erc-message-english-s379, erc-message-english-s391, erc-message-english-s396, erc-message-english-s401, erc-message-english-s402, erc-message-english-s403, erc-message-english-s404, erc-message-english-s405, erc-message-english-s406, erc-message-english-s412, erc-message-english-s421, erc-message-english-s431, erc-message-english-s432, erc-message-english-s442, erc-message-english-s445, erc-message-english-s446, erc-message-english-s451, erc-message-english-s461, erc-message-english-s462, erc-message-english-s463, erc-message-english-s464, erc-message-english-s465, erc-message-english-s471, erc-message-english-s473, erc-message-english-s474, erc-message-english-s475, erc-message-english-s481, erc-message-english-s482, erc-message-english-s483, erc-message-english-s484, erc-message-english-s485, erc-message-english-s491, erc-message-english-s501, erc-message-english-s502, erc-message-english-s671): Define at top level using `defvar'. * test/lisp/erc/erc-tests.el (erc-tests--string-to-propertized-parts, erc-tests-pp-propertized-parts, erc--make-message-variable-name, erc-retrieve-catalog-entry): New tests along with utility functions and a convenience command for manipulating catalogs. (Bug#67677)
214 lines
7.4 KiB
EmacsLisp
214 lines
7.4 KiB
EmacsLisp
;;; erc-netsplit.el --- Reduce JOIN/QUIT messages on netsplits -*- lexical-binding: t; -*-
|
|
|
|
;; Copyright (C) 2002-2004, 2006-2023 Free Software Foundation, Inc.
|
|
|
|
;; Author: Mario Lang <mlang@delysid.org>
|
|
;; Maintainer: Amin Bandali <bandali@gnu.org>, F. Jason Park <jp@neverwas.me>
|
|
;; Keywords: comm
|
|
|
|
;; 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 module hides quit/join messages if a netsplit occurs.
|
|
;; To enable, add the following to your init file:
|
|
;; (require 'erc-netsplit)
|
|
;; (erc-netsplit-mode 1)
|
|
|
|
;;; Code:
|
|
|
|
(require 'erc)
|
|
|
|
(defgroup erc-netsplit nil
|
|
"Netsplit detection tries to automatically figure when a netsplit
|
|
happens, and filters the QUIT messages. It also keeps track of
|
|
netsplits, so that it can filter the JOIN messages on a netjoin too."
|
|
:group 'erc)
|
|
|
|
;;;###autoload(autoload 'erc-netsplit-mode "erc-netsplit")
|
|
(define-erc-module netsplit nil
|
|
"This mode hides quit/join messages if a netsplit occurs."
|
|
( ; FIXME delete newline on next edit
|
|
(add-hook 'erc-server-JOIN-functions #'erc-netsplit-JOIN)
|
|
(add-hook 'erc-server-MODE-functions #'erc-netsplit-MODE)
|
|
(add-hook 'erc-server-QUIT-functions #'erc-netsplit-QUIT)
|
|
(add-hook 'erc-timer-hook #'erc-netsplit-timer))
|
|
((remove-hook 'erc-server-JOIN-functions #'erc-netsplit-JOIN)
|
|
(remove-hook 'erc-server-MODE-functions #'erc-netsplit-MODE)
|
|
(remove-hook 'erc-server-QUIT-functions #'erc-netsplit-QUIT)
|
|
(remove-hook 'erc-timer-hook #'erc-netsplit-timer)))
|
|
|
|
(defcustom erc-netsplit-show-server-mode-changes-flag nil
|
|
"Non-nil means to enable display of server mode changes."
|
|
:type 'boolean)
|
|
|
|
(defcustom erc-netsplit-debug nil
|
|
"If non-nil, debug messages will be shown in the sever buffer."
|
|
:type 'boolean)
|
|
|
|
(defcustom erc-netsplit-regexp
|
|
"^[^ @!\"\n]+\\.[^ @!\n]+ [^ @!\n]+\\.[^ @!\"\n]+$"
|
|
"This regular expression should match quit reasons produced by netsplits."
|
|
:type 'regexp)
|
|
|
|
(defcustom erc-netsplit-hook nil
|
|
"Run whenever a netsplit is detected the first time.
|
|
Args: PROC is the process the netsplit originated from and
|
|
SPLIT is the netsplit (e.g. \"server.name.1 server.name.2\")."
|
|
:group 'erc-hooks
|
|
:type 'hook)
|
|
|
|
(defcustom erc-netjoin-hook nil
|
|
"Run whenever a netjoin is detected the first time.
|
|
Args: PROC is the process the netjoin originated from and
|
|
SPLIT is the netsplit (e.g. \"server.name.1 server.name.2\")."
|
|
:group 'erc-hooks
|
|
:type 'hook)
|
|
|
|
(defvar-local erc-netsplit-list nil
|
|
"This is a list of the form
|
|
\((\"a.b.c.d e.f.g\" TIMESTAMP FIRST-JOIN \"nick1\" ... \"nickn\") ...)
|
|
where FIRST-JOIN is t or nil, depending on whether or not the first
|
|
join from that split has been detected or not.")
|
|
|
|
(defun erc-netsplit-install-message-catalogs ()
|
|
(declare (obsolete "defined at top level in erc-netsplit.el" "30.1"))
|
|
(with-suppressed-warnings ((obsolete erc-define-catalog)) ; indentation
|
|
(erc-define-catalog
|
|
'english
|
|
'((netsplit . "netsplit: %s")
|
|
(netjoin . "netjoin: %s, %N were split")
|
|
(netjoin-done . "netjoin: All lost souls are back!")
|
|
(netsplit-none . "No netsplits in progress")
|
|
(netsplit-wholeft . "split: %s missing: %n %t"))))) ; indentation
|
|
|
|
(erc-define-message-format-catalog english
|
|
(netsplit . "netsplit: %s")
|
|
(netjoin . "netjoin: %s, %N were split")
|
|
(netjoin-done . "netjoin: All lost souls are back!")
|
|
(netsplit-none . "No netsplits in progress")
|
|
(netsplit-wholeft . "split: %s missing: %n %t"))
|
|
|
|
(defun erc-netsplit-JOIN (proc parsed)
|
|
"Show/don't show rejoins."
|
|
(let ((nick (erc-response.sender parsed))
|
|
(no-next-hook nil))
|
|
(dolist (elt erc-netsplit-list)
|
|
(if (member nick (nthcdr 3 elt))
|
|
(progn
|
|
(if (not (nth 2 elt))
|
|
(progn
|
|
(erc-display-message
|
|
parsed 'notice (process-buffer proc)
|
|
'netjoin ?s (car elt) ?N (length (nthcdr 3 elt)))
|
|
(setcar (nthcdr 2 elt) t)
|
|
(run-hook-with-args 'erc-netjoin-hook proc (car elt))))
|
|
;; need to remove this nick, perhaps the whole entry here.
|
|
;; Note that by removing the nick now, we can't tell if further
|
|
;; join messages (for other channels) should also be
|
|
;; suppressed.
|
|
(if (null (nthcdr 4 elt))
|
|
(progn
|
|
(erc-display-message
|
|
parsed 'notice (process-buffer proc)
|
|
'netjoin-done ?s (car elt))
|
|
(setq erc-netsplit-list (delq elt erc-netsplit-list)))
|
|
;; Avoid `ignored-return-value' warning for `delete'.
|
|
(let ((tail (nthcdr 2 elt))) ; (t n1 ... nN)
|
|
(setcdr tail (delete nick (cdr tail)))))
|
|
(setq no-next-hook t))))
|
|
no-next-hook))
|
|
|
|
(defun erc-netsplit-MODE (proc parsed)
|
|
"Hide mode changes from servers."
|
|
;; regexp matches things with a . in them, and no ! or @ in them.
|
|
(when (string-match "^[^@!\n]+\\.[^@!\n]+$" (erc-response.sender parsed))
|
|
(and erc-netsplit-debug
|
|
(erc-display-message
|
|
parsed 'notice (process-buffer proc)
|
|
"[debug] server mode change."))
|
|
(not erc-netsplit-show-server-mode-changes-flag)))
|
|
|
|
(defun erc-netsplit-QUIT (proc parsed)
|
|
"Detect netsplits."
|
|
(let ((split (erc-response.contents parsed))
|
|
(nick (erc-response.sender parsed))
|
|
ass)
|
|
(when (string-match erc-netsplit-regexp split)
|
|
(setq ass (assoc split erc-netsplit-list))
|
|
(if ass
|
|
;; element for this netsplit exists already
|
|
(progn
|
|
(setcdr (nthcdr 2 ass) (cons nick (nthcdr 3 ass)))
|
|
(when (nth 2 ass)
|
|
;; There was already a netjoin for this netsplit, it
|
|
;; seems like the old one didn't get finished...
|
|
(erc-display-message
|
|
parsed 'notice (process-buffer proc)
|
|
'netsplit ?s split)
|
|
(setcar (nthcdr 2 ass) t)
|
|
(run-hook-with-args 'erc-netsplit-hook proc split)))
|
|
;; element for this netsplit does not yet exist
|
|
(setq erc-netsplit-list
|
|
(cons (list split
|
|
(erc-current-time)
|
|
nil
|
|
nick)
|
|
erc-netsplit-list))
|
|
(erc-display-message
|
|
parsed 'notice (process-buffer proc)
|
|
'netsplit ?s split)
|
|
(run-hook-with-args 'erc-netsplit-hook proc split))
|
|
t)))
|
|
|
|
(defun erc-netsplit-timer (now)
|
|
"Clean cruft from `erc-netsplit-list' older than 10 minutes."
|
|
(when erc-server-connected
|
|
(dolist (elt erc-netsplit-list)
|
|
(when (> (erc-time-diff (cadr elt) now) 600)
|
|
(when erc-netsplit-debug
|
|
(erc-display-message
|
|
nil 'notice (current-buffer)
|
|
(concat "Netsplit: Removing " (car elt))))
|
|
(setq erc-netsplit-list (delq elt erc-netsplit-list))))))
|
|
|
|
;;;###autoload
|
|
(defun erc-cmd-WHOLEFT ()
|
|
"Show who's gone."
|
|
(erc-with-server-buffer
|
|
(if (null erc-netsplit-list)
|
|
(erc-display-message
|
|
nil 'notice 'active
|
|
'netsplit-none)
|
|
(dolist (elt erc-netsplit-list)
|
|
(erc-display-message
|
|
nil 'notice 'active
|
|
'netsplit-wholeft ?s (car elt)
|
|
?n (mapconcat #'erc-extract-nick (nthcdr 3 elt) " ")
|
|
?t (if (nth 2 elt)
|
|
"(joining)"
|
|
"")))))
|
|
t)
|
|
|
|
(defalias 'erc-cmd-WL #'erc-cmd-WHOLEFT)
|
|
|
|
(provide 'erc-netsplit)
|
|
|
|
;;; erc-netsplit.el ends here
|
|
;;
|
|
;; Local Variables:
|
|
;; generated-autoload-file: "erc-loaddefs.el"
|
|
;; End:
|