From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.ciao.gmane.io!not-for-mail From: Philip K. Newsgroups: gmane.emacs.bugs Subject: bug#39965: [PATCH] Add support for multiple gravatar-like services Date: Tue, 10 Mar 2020 10:31:27 +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="33661"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 39965@debbugs.gnu.org To: rpluim@gmail.com Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Mar 10 10:35:43 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 1jBbId-0008cP-3m for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 10 Mar 2020 10:35:43 +0100 Original-Received: from localhost ([::1]:56270 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jBbIb-0000cQ-Tf for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 10 Mar 2020 05:35:42 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:59869) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jBbF6-0005WE-6H for bug-gnu-emacs@gnu.org; Tue, 10 Mar 2020 05:32:05 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jBbF4-00081N-MI for bug-gnu-emacs@gnu.org; Tue, 10 Mar 2020 05:32:04 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:45907) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jBbF4-000815-I3 for bug-gnu-emacs@gnu.org; Tue, 10 Mar 2020 05:32:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jBbF4-0003oM-E4 for bug-gnu-emacs@gnu.org; Tue, 10 Mar 2020 05:32:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Philip K. Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 10 Mar 2020 09:32: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 X-Debbugs-Original-Cc: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.158383271514627 (code B ref -1); Tue, 10 Mar 2020 09:32:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 10 Mar 2020 09:31:55 +0000 Original-Received: from localhost ([127.0.0.1]:51880 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jBbEr-0003nh-S9 for submit@debbugs.gnu.org; Tue, 10 Mar 2020 05:31:55 -0400 Original-Received: from lists.gnu.org ([209.51.188.17]:45524) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jBbEq-0003nT-2O for submit@debbugs.gnu.org; Tue, 10 Mar 2020 05:31:48 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:59104) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jBbEn-0004uM-4B for bug-gnu-emacs@gnu.org; Tue, 10 Mar 2020 05:31:46 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jBbEl-0006po-7a for bug-gnu-emacs@gnu.org; Tue, 10 Mar 2020 05:31:44 -0400 Original-Received: from mx-rz-2.rrze.uni-erlangen.de ([131.188.11.21]:41189) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jBbEk-0006Qj-Gw for bug-gnu-emacs@gnu.org; Tue, 10 Mar 2020 05:31:43 -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 48c8wy6BwlzPkVf; Tue, 10 Mar 2020 10:31:30 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fau.de; s=fau-2013; t=1583832690; bh=5C2gOBGMSihKPOiRoc/B9jQK79wpobRJaIv/x4c7x2o=; h=From:To:Cc:Subject:In-Reply-To:Date:From:To:CC:Subject; b=hGD7VHr6mVgyvalwSZbLnD2vK0JZXosvwHaavjo8O6LsFDy+uq426PTtASBjfrkor wHm3lGx0JRGV/32iSXyGYcvXBClDODpGbyq8RKSmdrWBnLBBY3Q+UL6tnbE4KOCV8S v+WQJWSEegGwq5rBaUxFZfyfc0CbWL2MAw/WbKBj9YvClOcEzxxV7HbRyTxh7gaMcB mVOXr5MdwbLaTKXLKrp6tu0LPNC/VPGrb1xKUE2fkx/tZ9oospNv2DGiN0x20WPsro fSMq2RKWiOn7XXMwaHMFhqs6oQuw38R+/dhq3fdLOwJOxgkIBbkddoKwOOSx3jHI/y j4PgYP7MkDGLQ== 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+Y29kNsiTtkjPEqfNlueT8BuZxar1+jlg=) by smtp-auth.uni-erlangen.de (Postfix) with ESMTPSA id 48c8ww001nzPjx8; Tue, 10 Mar 2020 10:31:27 +0100 (CET) In-Reply-To: m25zfdee26.fsf@gmail.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] 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:177126 Archived-At: --=-=-= Content-Type: text/plain Sorry for the delay, I hope the commit message is ok now. --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-Add-support-for-multiple-Gravatar-services.patch >From 45ef168f4c7b2c0195de040570fa613c89e41ae4 Mon Sep 17 00:00:00 2001 From: Philip K Date: Tue, 10 Mar 2020 10:21:08 +0100 Subject: [PATCH] Add support for multiple Gravatar services Now supports Libravatar and Unicornify, next to Gravatar. * lisp/image/gravatar.el (gravatar-base-url): Remove constant. (gravatar-service-alist): List supported services. (gravatar-service): Add user option to specify service, defaults to Libravatar. (gravatar--service-libravatar): Add libravatar image host resolver implementation. (gravatar-build-url): Use alist gravatar-service-alist instead of gravatar-base-url. * etc/NEWS: Add note. --- etc/NEWS | 6 ++++++ lisp/image/gravatar.el | 37 +++++++++++++++++++++++++++++++++---- 2 files changed, 39 insertions(+), 4 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index 7f70d149d6..7d9f858555 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -171,6 +171,12 @@ key binding / v package-menu-filter-by-version / / package-menu-filter-clear +** Gravatar + +=== +*** New user-option 'gravatar-service' for host to query for gravatars. +Defaults to Libravatar, with Unicornify and Gravatar as options. + * New Modes and Packages in Emacs 28.1 diff --git a/lisp/image/gravatar.el b/lisp/image/gravatar.el index b8542bc3c3..9b4e93275d 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 (alist-get gravatar-service gravatar-service-alist) + mail-address) (gravatar-hash mail-address) (gravatar--query-string))) -- 2.20.1 --=-=-=--