branch: externals/ement
commit 4d28436af023becd8b7b244d8f2853118a937821
Author: Adam Porter <a...@alphapapa.net>
Commit: Adam Porter <a...@alphapapa.net>
Fix: (ement--hostname-uri) Don't assume JSON has needed value
See
<https://github.com/alphapapa/ement.el/issues/24#issuecomment-1569518713>.
Thanks to Phil Sainty (@phil-s).
---
ement.el | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/ement.el b/ement.el
index 10b958021b..33340258d5 100644
--- a/ement.el
+++ b/ement.el
@@ -439,9 +439,12 @@ If no URI is found, prompt the user for the hostname."
("" hostname)
(_ input))))
(parse (string)
- (if-let ((object (ignore-errors (json-read-from-string
string))))
- ;; Return extracted value.
- (map-nested-elt object '(m.homeserver base_url))
+ (if-let* ((object (ignore-errors (json-read-from-string
string)))
+ (url (map-nested-elt object '(m.homeserver
base_url)))
+ ((string-match-p
+ (rx bos "http" (optional "s") "://" (1+ nonl))
+ url)))
+ url
;; Parsing error: FAIL_PROMPT.
(fail-prompt))))
(condition-case err
