(require 'shr)
(require 'url-util)
(require 'subr-x)
+(require 'dns)
;;; Global constants
(condition-case the-error
(let* ((kill-buffer-query-functions nil)
(port (elpher-address-port address))
+ (host (elpher-address-host address))
(proc (open-network-stream "elpher-process"
nil
- (elpher-address-host address)
+ host
(if (> port 0) port 70)
- :type (if elpher-use-tls 'tls 'plain))))
+ :type (if elpher-use-tls 'tls 'plain)
+ :nowait t)))
(set-process-coding-system proc 'binary)
(set-process-filter proc
(lambda (_proc string)
(insert "LOADING... (use 'u' to cancel)"))
(elpher-get-selector address
(lambda (_proc event)
- (unless (string-prefix-p "deleted" event)
+ (unless (or (string-prefix-p "deleted" event)
+ (string-prefix-p "open" event))
(funcall renderer elpher-selector-string)
(elpher-restore-pos)))))))
;; Raw server response rendering
-(defun elpher-render-raw (data &optional _mime-type-string)
- "Display raw DATA in buffer. MIME-TYPE-STRING is unused."
+(defun elpher-render-raw (data &optional mime-type-string)
+ "Display raw DATA in buffer. MIME-TYPE-STRING is also displayed if provided."
(if (not data)
nil
(elpher-with-clean-buffer
+ (when mime-type-string
+ (insert "MIME type specified by server: '" mime-type-string "'\n"))
(insert data)
(goto-char (point-min)))
(message "Displaying raw server response. Reload or redraw to return to standard view.")))
(let* ((kill-buffer-query-functions nil)
(network-security-level 'medium)
(port (elpher-address-port address))
+ (host (elpher-address-host address))
(proc (open-network-stream "elpher-process"
nil
- (elpher-address-host address)
+ host
(if (> port 0) port 1965)
- :type 'tls)))
+ :type 'tls
+ :nowait t)))
(set-process-coding-system proc 'binary)
(set-process-filter proc
(lambda (_proc string)
(query-address (elpher-address-from-url (concat url "?" query-string))))
(elpher-get-gemini-response query-address
(lambda (_proc event)
- (unless (string-prefix-p "deleted" event)
+ (unless (or (string-prefix-p "deleted" event)
+ (string-prefix-p "open" event))
(funcall #'elpher-process-gemini-response
renderer)
(elpher-restore-pos))))))
(add-to-list 'elpher-gemini-redirect-chain redirect-address)
(elpher-get-gemini-response redirect-address
(lambda (_proc event)
- (unless (string-prefix-p "deleted" event)
+ (unless (or (string-prefix-p "deleted" event)
+ (string-prefix-p "open" event))
(funcall #'elpher-process-gemini-response
renderer)
(elpher-restore-pos))))))
(setq elpher-gemini-redirect-chain nil)
(elpher-get-gemini-response address
(lambda (_proc event)
- (unless (string-prefix-p "deleted" event)
+ (unless (or (string-prefix-p "deleted" event)
+ (string-prefix-p "open" event))
(funcall #'elpher-process-gemini-response
renderer)
(elpher-restore-pos)))))
(pcase mime-type
((or "text/gemini" "")
(elpher-render-gemini-map body parameters))
+ ("text/html"
+ (elpher-render-html body))
((pred (string-prefix-p "text/"))
(elpher-render-gemini-plain-text body parameters))
((pred (string-prefix-p "image/"))