959fbcf34b
* lisp/erc/erc-join.el (erc-autojoin-server-match): Favor network identities, falling back on old definition. (erc-autojoin--join): Add new helper containing common code from hookees `erc-autojoin-after-ident' and `erc-autojoin-channels'. (erc-autojoin-after-ident, erc-autojoin-channels): No longer make a point of returning nil because the hooks they're registered on, `erc-nickserv-identified-hook' and `erc-after-connect', don't stop on success. (erc-autojoin--mutate): Add helper for `erc-autojoin-add' and `erc-autojoin-remove'. (erc-autojoin-add, erc-autojoin-remove): Favor given network identities, over networks, when matching keys for `erc-autojoin-channels-alist'. * test/lisp/erc/erc-scenarios-base-reconnect.el: New file. * test/lisp/erc/erc-scenarios-join-netid-newcmd-id.el: New file. * test/lisp/erc/erc-scenarios-join-netid-newcmd.el: New file. * test/lisp/erc/erc-scenarios-join-netid-recon-id.el: New file. * test/lisp/erc/erc-scenarios-join-netid-recon.el: New file. * test/lisp/erc/resources/erc-scenarios-common.el: New file. * test/lisp/erc/resources/join/legacy/foonet.eld: New file. * test/lisp/erc/resources/join/network-id/barnet.eld: New file. * test/lisp/erc/resources/join/network-id/foonet-again.eld: New file. * test/lisp/erc/resources/join/network-id/foonet.eld: New file. * test/lisp/erc/resources/join/reconnect/foonet-again.eld: New file. * test/lisp/erc/resources/join/reconnect/foonet.eld: New file.
46 lines
2.6 KiB
Plaintext
46 lines
2.6 KiB
Plaintext
;; -*- mode: lisp-data; -*-
|
|
((pass 1 "PASS :changeme"))
|
|
((nick 1 "NICK tester"))
|
|
((user 1 "USER user 0 * :tester")
|
|
(0 ":irc.foonet.org 001 tester :Welcome to the foonet IRC Network tester")
|
|
(0 ":irc.foonet.org 002 tester :Your host is irc.foonet.org, running version oragono-2.6.0-7481bf0385b95b16")
|
|
(0 ":irc.foonet.org 003 tester :This server was created Tue, 04 May 2021 05:06:18 UTC")
|
|
(0 ":irc.foonet.org 004 tester irc.foonet.org oragono-2.6.0-7481bf0385b95b16 BERTZios CEIMRUabefhiklmnoqstuv Iabefhkloqv")
|
|
(0 ":irc.foonet.org 005 tester AWAYLEN=390 BOT=B CASEMAPPING=ascii CHANLIMIT=#:100 CHANMODES=Ibe,k,fl,CEMRUimnstu CHANNELLEN=64 CHANTYPES=# ELIST=U EXCEPTS EXTBAN=,m FORWARD=f INVEX KICKLEN=390 :are supported by this server")
|
|
(0 ":irc.foonet.org 005 tester MAXLIST=beI:60 MAXTARGETS=4 MODES MONITOR=100 NETWORK=FooNet NICKLEN=32 PREFIX=(qaohv)~&@%+ STATUSMSG=~&@%+ TARGMAX=NAMES:1,LIST:1,KICK:1,WHOIS:1,USERHOST:10,PRIVMSG:4,TAGMSG:4,NOTICE:4,MONITOR:100 TOPICLEN=390 UTF8MAPPING=rfc8265 UTF8ONLY WHOX :are supported by this server")
|
|
(0 ":irc.foonet.org 005 tester draft/CHATHISTORY=100 :are supported by this server")
|
|
(0 ":irc.foonet.org 251 tester :There are 0 users and 3 invisible on 1 server(s)")
|
|
(0 ":irc.foonet.org 252 tester 0 :IRC Operators online")
|
|
(0 ":irc.foonet.org 253 tester 0 :unregistered connections")
|
|
(0 ":irc.foonet.org 254 tester 1 :channels formed")
|
|
(0 ":irc.foonet.org 255 tester :I have 3 clients and 0 servers")
|
|
(0 ":irc.foonet.org 265 tester 3 3 :Current local users 3, max 3")
|
|
(0 ":irc.foonet.org 266 tester 3 3 :Current global users 3, max 3")
|
|
(0 ":irc.foonet.org 422 tester :MOTD File is missing"))
|
|
|
|
((mode-user 3.2 "MODE tester +i")
|
|
(0 ":irc.foonet.org 221 tester +i")
|
|
(0 ":irc.foonet.org NOTICE tester :This server is in debug mode.")
|
|
|
|
(0 ":tester!~u@9g6b728983yd2.irc JOIN #chan")
|
|
(0 ":irc.foonet.org 353 tester = #chan :alice tester @bob")
|
|
(0 ":irc.foonet.org 366 tester #chan :End of NAMES list")
|
|
|
|
(0 ":tester!~u@9g6b728983yd2.irc JOIN #spam")
|
|
(0 ":irc.foonet.org 353 tester = #spam :alice tester @bob")
|
|
(0 ":irc.foonet.org 366 tester #spam :End of NAMES list"))
|
|
|
|
((mode-chan 4 "MODE #chan")
|
|
(0 ":irc.foonet.org 324 tester #chan +nt")
|
|
(0 ":irc.foonet.org 329 tester #chan 1620104779")
|
|
(0.1 ":bob!~u@rz2v467q4rwhy.irc PRIVMSG #chan :tester, welcome!")
|
|
(0.1 ":alice!~u@rz2v467q4rwhy.irc PRIVMSG #chan :tester, welcome!"))
|
|
|
|
((mode-spam 4 "MODE #spam")
|
|
(0 ":irc.foonet.org 324 tester #spam +nt")
|
|
(0 ":irc.foonet.org 329 tester #spam 1620104779")
|
|
(0.1 ":bob!~u@rz2v467q4rwhy.irc PRIVMSG #spam :tester, welcome!")
|
|
(0.1 ":alice!~u@rz2v467q4rwhy.irc PRIVMSG #spam :tester, welcome!"))
|
|
|
|
((drop 0 DROP))
|