From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Tom Tromey Newsgroups: gmane.emacs.bugs Subject: bug#25349: 25.1.90; erc join -vs- passwords Date: Fri, 06 Jan 2017 08:14:07 -0700 Message-ID: <878tqodxvk.fsf@tromey.com> References: <87d1g3u63z.fsf@tromey.com> <02a0b060-c061-4bf6-849b-5c05c5d4b670@gmail.com> <878tqrt76s.fsf@tromey.com> <87wpeasvpd.fsf@tromey.com> <87tw9ddtid.fsf@tromey.com> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1483715786 20923 195.159.176.226 (6 Jan 2017 15:16:26 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Fri, 6 Jan 2017 15:16:26 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1.91 (gnu/linux) Cc: 25349@debbugs.gnu.org, Nikolay Kudryavtsev To: Tom Tromey Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Jan 06 16:16:18 2017 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cPWFe-0004bj-2l for geb-bug-gnu-emacs@m.gmane.org; Fri, 06 Jan 2017 16:16:18 +0100 Original-Received: from localhost ([::1]:53296 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cPWFi-0004X8-6E for geb-bug-gnu-emacs@m.gmane.org; Fri, 06 Jan 2017 10:16:22 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:38181) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cPWET-0003kk-QR for bug-gnu-emacs@gnu.org; Fri, 06 Jan 2017 10:15:06 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cPWEQ-0001MA-GY for bug-gnu-emacs@gnu.org; Fri, 06 Jan 2017 10:15:05 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:58108) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cPWEQ-0001M4-Bj for bug-gnu-emacs@gnu.org; Fri, 06 Jan 2017 10:15:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1cPWEP-0005G2-W9 for bug-gnu-emacs@gnu.org; Fri, 06 Jan 2017 10:15:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Tom Tromey Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 06 Jan 2017 15:15:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 25349 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 25349-submit@debbugs.gnu.org id=B25349.148371567020154 (code B ref 25349); Fri, 06 Jan 2017 15:15:01 +0000 Original-Received: (at 25349) by debbugs.gnu.org; 6 Jan 2017 15:14:30 +0000 Original-Received: from localhost ([127.0.0.1]:45274 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cPWDt-0005F0-Lf for submit@debbugs.gnu.org; Fri, 06 Jan 2017 10:14:29 -0500 Original-Received: from gproxy3-pub.mail.unifiedlayer.com ([69.89.30.42]:33486) by debbugs.gnu.org with smtp (Exim 4.84_2) (envelope-from ) id 1cPWDr-0005El-HI for 25349@debbugs.gnu.org; Fri, 06 Jan 2017 10:14:28 -0500 Original-Received: (qmail 14025 invoked by uid 0); 6 Jan 2017 15:14:15 -0000 Original-Received: from unknown (HELO cmgw4) (10.0.90.85) by gproxy3.mail.unifiedlayer.com with SMTP; 6 Jan 2017 15:14:15 -0000 Original-Received: from box522.bluehost.com ([74.220.219.122]) by cmgw4 with id V3EB1u0282f2jeq013EEbE; Fri, 06 Jan 2017 08:14:15 -0700 X-Authority-Analysis: v=2.1 cv=SY5kKJhu c=1 sm=1 tr=0 a=GsOEXm/OWkKvwdLVJsfwcA==:117 a=GsOEXm/OWkKvwdLVJsfwcA==:17 a=L9H7d07YOLsA:10 a=9cW_t1CCXrUA:10 a=s5jvgZ67dGcA:10 a=IgFoBzBjUZAA:10 a=FGYh4_cPxCD1kSpL9woA:9 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date: References:Subject:Cc:To:From; bh=ZAFgsE4KfT6EA5hd4FkdCwZVQP7F5dhC/JC4CmPkDk8=; b=w2gCHef9B9M/sA+C7wqUnZz471 DGOMQwOczIsWv6z1ROrdeBKECtW/zz9DOZHw+gZz9SgPdJsFTloc3CtqaFqW25uTtZaN34JbyKSwZ SQxKSXqYVryOS4RnmKYp36fvF; Original-Received: from 174-16-146-181.hlrn.qwest.net ([174.16.146.181]:38440 helo=pokyo) by box522.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.86_1) (envelope-from ) id 1cPWDb-0003Ly-Kv; Fri, 06 Jan 2017 08:14:11 -0700 X-Attribution: Tom In-Reply-To: <87tw9ddtid.fsf@tromey.com> (Tom Tromey's message of "Thu, 05 Jan 2017 15:36:10 -0700") X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box522.bluehost.com X-AntiAbuse: Original Domain - debbugs.gnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 174.16.146.181 X-Exim-ID: 1cPWDb-0003Ly-Kv X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 174-16-146-181.hlrn.qwest.net (pokyo) [174.16.146.181]:38440 X-Source-Auth: tom+tromey.com X-Email-Count: 2 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTIyLmJsdWVob3N0LmNvbQ== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:127844 Archived-At: Tom> Well, it worked for an explicit /join, but didn't correctly autojoin. Tom> I'll try to debug it some more. erc-autojoin-channels was just using the server that was passed in, but it should have been checking erc-session-server instead, like the other code. The appended works for me for both autojoin and explicit join. I want to check it in, but it would probably be good if someone more familiar with ERC took a look at it. Tom diff --git a/lisp/erc/erc-join.el b/lisp/erc/erc-join.el index 151ea15..aa83ffe 100644 --- a/lisp/erc/erc-join.el +++ b/lisp/erc/erc-join.el @@ -129,7 +129,7 @@ erc-autojoin-after-ident (setq erc--autojoin-timer (erc-cancel-timer erc--autojoin-timer))) (when (eq erc-autojoin-timing 'ident) - (let ((server (or erc-server-announced-name erc-session-server)) + (let ((server (or erc-session-server erc-server-announced-name)) (joined (mapcar (lambda (buf) (with-current-buffer buf (erc-default-target))) (erc-channel-list erc-server-process)))) @@ -155,38 +155,24 @@ erc-autojoin-channels ;; `erc-autojoin-timing' is `connect': (dolist (l erc-autojoin-channels-alist) (when (string-match (car l) server) - (dolist (chan (cdr l)) - (let ((buffer (erc-get-buffer chan))) - ;; Only auto-join the channels that we aren't already in - ;; using a different nick. - (when (or (not buffer) - (not (with-current-buffer buffer - (erc-server-process-alive)))) - (erc-server-join-channel server chan))))))) + (let ((server (or erc-session-server erc-server-announced-name))) + (dolist (chan (cdr l)) + (let ((buffer (erc-get-buffer chan))) + ;; Only auto-join the channels that we aren't already in + ;; using a different nick. + (when (or (not buffer) + (not (with-current-buffer buffer + (erc-server-process-alive)))) + (erc-server-join-channel server chan)))))))) ;; Return nil to avoid stomping on any other hook funcs. nil) -(defun erc-server-join-channel (server channel) - (let* ((secret (plist-get (nth 0 (auth-source-search - :max 1 - :host server - :port "irc" - :user channel)) - :secret)) - (password (if (functionp secret) - (funcall secret) - secret))) - (erc-server-send (concat "JOIN " channel - (if password - (concat " " password) - ""))))) - (defun erc-autojoin-add (proc parsed) "Add the channel being joined to `erc-autojoin-channels-alist'." (let* ((chnl (erc-response.contents parsed)) (nick (car (erc-parse-user (erc-response.sender parsed)))) (server (with-current-buffer (process-buffer proc) - (or erc-server-announced-name erc-session-server)))) + (or erc-session-server erc-server-announced-name)))) (when (erc-current-nick-p nick) (when (and erc-autojoin-domain-only (string-match "[^.\n]+\\.\\([^.\n]+\\.[^.\n]+\\)$" server)) @@ -209,7 +195,7 @@ erc-autojoin-remove (let* ((chnl (car (erc-response.command-args parsed))) (nick (car (erc-parse-user (erc-response.sender parsed)))) (server (with-current-buffer (process-buffer proc) - (or erc-server-announced-name erc-session-server)))) + (or erc-session-server erc-server-announced-name)))) (when (erc-current-nick-p nick) (when (and erc-autojoin-domain-only (string-match "[^.\n]+\\.\\([^.\n]+\\.[^.\n]+\\)$" server)) diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index 3dcb7ef..3cc9f52 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -3022,6 +3022,23 @@ erc-cmd-HELP (defalias 'erc-cmd-H 'erc-cmd-HELP) (put 'erc-cmd-HELP 'process-not-needed t) +(defun erc-server-join-channel (server channel &optional secret) + (let* ((secret (or secret + (plist-get (nth 0 (auth-source-search + :max 1 + :host server + :port "irc" + :user channel)) + :secret))) + (password (if (functionp secret) + (funcall secret) + secret))) + (erc-log (format "cmd: JOIN: %s" channel)) + (erc-server-send (concat "JOIN " channel + (if password + (concat " " password) + ""))))) + (defun erc-cmd-JOIN (channel &optional key) "Join the channel given in CHANNEL, optionally with KEY. If CHANNEL is specified as \"-invite\", join the channel to which you @@ -3041,10 +3058,9 @@ erc-cmd-JOIN (if (erc-member-ignore-case chnl joined-channels) (switch-to-buffer (car (erc-member-ignore-case chnl joined-channels))) - (erc-log (format "cmd: JOIN: %s" chnl)) - (erc-server-send (if (and chnl key) - (format "JOIN %s %s" chnl key) - (format "JOIN %s" chnl))))))) + (let ((server (with-current-buffer (process-buffer erc-server-process) + (or erc-session-server erc-server-announced-name)))) + (erc-server-join-channel server chnl key)))))) t) (defalias 'erc-cmd-CHANNEL 'erc-cmd-JOIN)