From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.ciao.gmane.io!not-for-mail From: Philip Kaludercic Newsgroups: gmane.emacs.bugs Subject: bug#39965: [PATCH] Add support for multiple gravatar-like services Date: Mon, 09 Mar 2020 16:10:48 +0100 Message-ID: References: <20200307001141.10771-1-philip@warpmail.net> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="ciao.gmane.io:159.69.161.202"; logging-data="32570"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: 39965@debbugs.gnu.org To: Robert Pluim Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Mar 09 17:19:48 2020 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jBL87-0008KM-5Q for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 09 Mar 2020 17:19:47 +0100 Original-Received: from localhost ([::1]:46462 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jBL85-0006EW-U6 for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 09 Mar 2020 12:19:46 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:46556) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jBL6S-0005MF-BH for bug-gnu-emacs@gnu.org; Mon, 09 Mar 2020 12:18:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jBL6Q-00038U-PV for bug-gnu-emacs@gnu.org; Mon, 09 Mar 2020 12:18:04 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:45392) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jBL6Q-000389-CR for bug-gnu-emacs@gnu.org; Mon, 09 Mar 2020 12:18:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jBL6Q-0007nz-8G for bug-gnu-emacs@gnu.org; Mon, 09 Mar 2020 12:18:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Philip Kaludercic Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 09 Mar 2020 16:18:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39965 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 39965-submit@debbugs.gnu.org id=B39965.158377063229938 (code B ref 39965); Mon, 09 Mar 2020 16:18:02 +0000 Original-Received: (at 39965) by debbugs.gnu.org; 9 Mar 2020 16:17:12 +0000 Original-Received: from localhost ([127.0.0.1]:51365 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jBL5b-0007mn-Fo for submit@debbugs.gnu.org; Mon, 09 Mar 2020 12:17:12 -0400 Original-Received: from mx-rz-2.rrze.uni-erlangen.de ([131.188.11.21]:43741) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jBK3R-00068W-BG for 39965@debbugs.gnu.org; Mon, 09 Mar 2020 11:10:54 -0400 Original-Received: from mx-rz-smart.rrze.uni-erlangen.de (mx-rz-smart.rrze.uni-erlangen.de [IPv6:2001:638:a000:1025::1e]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by mx-rz-2.rrze.uni-erlangen.de (Postfix) with ESMTPS id 48bhVz4VHFzPjw4; Mon, 9 Mar 2020 16:10:51 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fau.de; s=fau-2013; t=1583766651; bh=Znzyo8McE+qyI3SKYR3tBC0emyd/SU6llTKiMRPVJ8k=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From:To:CC: Subject; b=E/2DT4E/qpE5IHnvzxG+0u6FsIfkJev5JgE/SD1Rs1cDpooUaARblP5a3DRU37jZK pxoIFytYSAqWTK3h8MsXc0u3FtIA8TzBsRUfs0N/9ucok8ldnwYXL4RNseIzocUPYG /M9pU1iqtAtcCopNbjDQrEDrpJJipsmHosR+pz5+SkGkVHmZ82oupzVXBLct4LCd1f XOA6KENaMOg89Wr8JLl5upfldihLamEATqpVaBFd7P3e6e2O+77ieea7XNAbiVLNWB vpqLR7BShioQ/8Kv0D8WHu6b6laOl38oXGjHasusdy0e2vwxNcv0W64ExI6Mq4t8/q xUEotevwDj6EA== X-Virus-Scanned: amavisd-new at boeck2.rrze.uni-erlangen.de (RRZE) X-RRZE-Flag: Not-Spam X-RRZE-Submit-IP: 2001:638:a000:4160:131:188:60:167 Original-Received: from cip6b5 (cip6b5.cip.cs.fau.de [IPv6:2001:638:a000:4160:131:188:60:167]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: U2FsdGVkX1/UQKWwlvHT64pE62JLAx40C2CSuKwp+ic=) by smtp-auth.uni-erlangen.de (Postfix) with ESMTPSA id 48bhVw54W1zPjxH; Mon, 9 Mar 2020 16:10:48 +0100 (CET) In-Reply-To: (Robert Pluim's message of "Mon, 09 Mar 2020 16:04:08 +0100") X-Mailman-Approved-At: Mon, 09 Mar 2020 12:17:11 -0400 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: 209.51.188.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-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:177097 Archived-At: --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Robert Pluim writes: > (please keep 39965@debbugs.gnu.org in the CC list) Sorry for that! >>>>>> On Mon, 09 Mar 2020 15:48:59 +0100, Philip Kaludercic said: > > >>=20 > >> If you make this an alist then your cond below becomes just > >> 'alist-get', and you have the URLS in just one place. > > Philip> That's right, I had already "fixed" that in the next version = of the > Philip> patch, but primarily because libravatar requires a bit more t= o work > Philip> correctly than just alist-get. > > OK > > Philip> Sadly I cannot send the patch right now, because git-send-ema= il doesn't > Philip> work from where I am writing. > > git format-patch HEAD~ + attaching the result will work as > well, assuming your MUA doesn=CA=BCt mangle patches :-) In that case I'm attaching the patch to this mail, I hope Gnus handels it corretly.=20 --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-Add-support-for-multiple-gravatar-like-services.patch >From 5c967bc9e2c3bc72e3803d84b23b8b121328c49c Mon Sep 17 00:00:00 2001 From: Philip K Date: Fri, 6 Mar 2020 12:40:28 +0100 Subject: [PATCH] Add support for multiple gravatar-like services Specifically, the non-proprietary services libravatar (now default) and unicornify have been added. The behaviour is customised via the new variable `gravatar-service'. --- etc/NEWS | 7 ++++++ lisp/image/gravatar.el | 37 +++++++++++++++++++++++++++---- test/lisp/image/gravatar-tests.el | 1 + 3 files changed, 41 insertions(+), 4 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index 7f70d149d6..24edf2de6a 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -171,6 +171,13 @@ key binding / v package-menu-filter-by-version / / package-menu-filter-clear +** gravatar.el + +--- +*** New variable `gravatar-service' changes avatar service. +Now supports Libravatar (as default) and Unicornify, next to the +already implemented Gravatar. + * New Modes and Packages in Emacs 28.1 diff --git a/lisp/image/gravatar.el b/lisp/image/gravatar.el index b8542bc3c3..4ac545730a 100644 --- a/lisp/image/gravatar.el +++ b/lisp/image/gravatar.el @@ -118,9 +118,37 @@ gravatar-force-default :version "27.1" :group 'gravatar) -(defconst gravatar-base-url - "https://www.gravatar.com/avatar" - "Base URL for getting gravatars.") +(defconst gravatar-service-alist + `((gravatar . ,(lambda (_addr) "https://www.gravatar.com/avatar")) + (unicornify . ,(lambda (_addr) "https://unicornify.pictures/avatar/")) + (libravatar . ,#'gravatar--service-libravatar)) + "Alist of supported gravatar services.") + +(defcustom gravatar-service 'libravatar + "Symbol denoting gravatar-like service to use. +Note that certain services might ignore other options, such as +`gravatar-default-image' or certain values as with +`gravatar-rating'." + :type `(choice ,@(mapcar (lambda (s) `(const ,(car s))) + gravatar-service-alist)) + :version "28.1" + :link '(url-link "https://www.libravatar.org/") + :link '(url-link "https://unicornify.pictures/") + :link '(url-link "https://gravatar.com/") + :group 'gravatar) + +(defun gravatar--service-libravatar (addr) + "Find domain that hosts avatars for email address ADDR." + ;; implements https://wiki.libravatar.org/api/ + (require 'dns) + (let* ((domain (save-match-data + (unless (string-match ".+@\\(.+\\)" addr) + (error "%s is not an email address" addr)) + (match-string 1 addr))) + (result (dns-query (concat "_avatars._tcp." domain) 'SRV))) + (if result + (concat "http://" result "/address") + "https://seccdn.libravatar.org/avatar"))) (defun gravatar-hash (mail-address) "Return the Gravatar hash for MAIL-ADDRESS." @@ -142,7 +170,8 @@ gravatar-build-url "Return the URL of a gravatar for MAIL-ADDRESS." ;; https://gravatar.com/site/implement/images/ (format "%s/%s?%s" - gravatar-base-url + (funcall (cdr (assq gravatar-service gravatar-service-alist)) + mail-address) (gravatar-hash mail-address) (gravatar--query-string))) diff --git a/test/lisp/image/gravatar-tests.el b/test/lisp/image/gravatar-tests.el index e66b5c6803..31a28293fa 100644 --- a/test/lisp/image/gravatar-tests.el +++ b/test/lisp/image/gravatar-tests.el @@ -65,6 +65,7 @@ gravatar-build-url "Test `gravatar-build-url'." (let ((gravatar-default-image nil) (gravatar-force-default nil) + (gravatar-service 'gravatar) (gravatar-size nil)) (should (equal (gravatar-build-url "foo") "\ https://www.gravatar.com/avatar/acbd18db4cc2f85cedef654fccc4a4d8?r=g")))) -- 2.20.1 --=-=-=--