[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master e906cd0: Fix gravatar tests
From: |
Robert Pluim |
Subject: |
master e906cd0: Fix gravatar tests |
Date: |
Tue, 24 Mar 2020 17:22:01 -0400 (EDT) |
branch: master
commit e906cd0d58f3197edf15ccb843bc2577b879af61
Author: Robert Pluim <address@hidden>
Commit: Robert Pluim <address@hidden>
Fix gravatar tests
* lisp/image/gravatar.el (gravatar--service-libravatar): Don't error
when failing to parse email address, just return the default URL.
* test/lisp/image/gravatar-tests.el (gravatar-build-url): Adjust
for new default gravatar url.
---
lisp/image/gravatar.el | 26 +++++++++++++-------------
test/lisp/image/gravatar-tests.el | 2 +-
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/lisp/image/gravatar.el b/lisp/image/gravatar.el
index e13f0075..ff59a72 100644
--- a/lisp/image/gravatar.el
+++ b/lisp/image/gravatar.el
@@ -142,19 +142,19 @@ Note that certain services might ignore other options,
such as
"Find domain that hosts avatars for email address ADDR."
;; implements https://wiki.libravatar.org/api/
(save-match-data
- (unless (string-match ".+@\\(.+\\)" addr)
- (error "%s is not an email address" addr))
- (let ((domain (match-string 1 addr)))
- (catch 'found
- (dolist (record '(("_avatars-sec" . "https")
- ("_avatars" . "http")))
- (let* ((query (concat (car record) "._tcp." domain))
- (result (dns-query query 'SRV)))
- (when result
- (throw 'found (format "%s://%s/avatar"
- (cdr record)
- result)))))
- "https://seccdn.libravatar.org/avatar"))))
+ (if (not (string-match ".+@\\(.+\\)" addr))
+ "https://seccdn.libravatar.org/avatar"
+ (let ((domain (match-string 1 addr)))
+ (catch 'found
+ (dolist (record '(("_avatars-sec" . "https")
+ ("_avatars" . "http")))
+ (let* ((query (concat (car record) "._tcp." domain))
+ (result (dns-query query 'SRV)))
+ (when result
+ (throw 'found (format "%s://%s/avatar"
+ (cdr record)
+ result)))))
+ "https://seccdn.libravatar.org/avatar")))))
(defun gravatar-hash (mail-address)
"Return the Gravatar hash for MAIL-ADDRESS."
diff --git a/test/lisp/image/gravatar-tests.el
b/test/lisp/image/gravatar-tests.el
index e66b5c6..66098fa 100644
--- a/test/lisp/image/gravatar-tests.el
+++ b/test/lisp/image/gravatar-tests.el
@@ -67,6 +67,6 @@
(gravatar-force-default nil)
(gravatar-size nil))
(should (equal (gravatar-build-url "foo") "\
-https://www.gravatar.com/avatar/acbd18db4cc2f85cedef654fccc4a4d8?r=g"))))
+https://seccdn.libravatar.org/avatar/acbd18db4cc2f85cedef654fccc4a4d8?r=g"))))
;;; gravatar-tests.el ends here
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master e906cd0: Fix gravatar tests,
Robert Pluim <=