mirror of https://codeberg.org/cage/tinmop/
Compare commits
3 Commits
32cfb4f055
...
883d2c0105
| Author | SHA1 | Date |
|---|---|---|
cage
|
883d2c0105 | |
|
cage
|
1f58010447 | |
|
cage
|
c636fd8edb |
|
|
@ -522,6 +522,10 @@ open-message-link-window.input.selected.foreground = #FF00FF
|
|||
|
||||
# gemini browser
|
||||
|
||||
# absolute address for a search engine used in tinmop (both TUI and GUI)
|
||||
|
||||
gemini.search-engine.uri = "gemini://kennedy.gemi.dev/search"
|
||||
|
||||
gemini.downloading.animation = "⠇ ⠋ ⠙ ⠸ ⠴ ⠦"
|
||||
|
||||
gemini.favicon = "🌍"
|
||||
|
|
|
|||
|
|
@ -139,7 +139,7 @@
|
|||
(defun gemini-search ()
|
||||
"Search the geminispace using keyword (note: will contact
|
||||
\"gemini://kennedy.gemi.dev/search\""
|
||||
(gemini-viewer:load-gemini-url +gemini-search-engine+))
|
||||
(gemini-viewer:load-gemini-url (swconf:config-gemini-search-engine-iri)))
|
||||
|
||||
(defun open-gemini-links-and-ask-tour ()
|
||||
"Open the link window and ask for tour link indices"
|
||||
|
|
|
|||
|
|
@ -447,46 +447,52 @@
|
|||
(client-certificate nil)
|
||||
(certificate-key nil)
|
||||
(certificate-key-password nil))
|
||||
(let* ((iri (make-gemini-iri (idn:host-unicode->ascii host)
|
||||
(percent-encode-path path)
|
||||
:query (percent-encode-query query)
|
||||
:port port
|
||||
:fragment (percent-encode-fragment fragment)))
|
||||
(ctx (cl+ssl:make-context :verify-mode cl+ssl:+ssl-verify-none+)))
|
||||
(cl+ssl:with-global-context (ctx :auto-free-p t)
|
||||
(handler-case
|
||||
(let ((socket (open-tls-socket host port)))
|
||||
(hooks:run-hooks 'hooks:*after-gemini-socket*)
|
||||
(let* ((stream (usocket:socket-stream socket))
|
||||
(ssl-hostname (if (or (iri:ipv4-address-p host)
|
||||
(iri:ipv6-address-p host))
|
||||
nil
|
||||
host))
|
||||
(ssl-stream (cl+ssl:make-ssl-client-stream stream
|
||||
:certificate client-certificate
|
||||
:key certificate-key
|
||||
:password
|
||||
certificate-key-password
|
||||
:external-format nil ; unsigned byte 8
|
||||
:unwrap-stream-p t
|
||||
:verify nil
|
||||
:hostname ssl-hostname))
|
||||
(request (format nil "~a~a~a" iri #\return #\newline))
|
||||
(cert-hash (crypto-shortcuts:sha512 (x509:dump-certificate ssl-stream))))
|
||||
(debug-gemini "sending request ~a" request)
|
||||
(if (not (db:tofu-passes-p host cert-hash))
|
||||
(error 'gemini-tofu-error :host host)
|
||||
(progn
|
||||
(write-sequence (string->octets request) ssl-stream)
|
||||
(force-output ssl-stream)
|
||||
(hooks:run-hooks 'hooks:*after-gemini-request-sent*)
|
||||
(multiple-value-bind (status description meta response)
|
||||
#+sbcl (sb-sys:with-deadline (:seconds +read-response-deadline+)
|
||||
(parse-response ssl-stream))
|
||||
#-sbcl (parse-response ssl-stream)
|
||||
(values status description meta response socket))))))
|
||||
(error (e)
|
||||
(error e))))))
|
||||
(multiple-value-bind (proxy-host proxy-port)
|
||||
(swconf:config-gemini-proxy)
|
||||
(let* ((iri (make-gemini-iri (idn:host-unicode->ascii host)
|
||||
(percent-encode-path path)
|
||||
:query (percent-encode-query query)
|
||||
:port port
|
||||
:fragment (percent-encode-fragment fragment)))
|
||||
(ctx (cl+ssl:make-context :verify-mode cl+ssl:+ssl-verify-none+)))
|
||||
(cl+ssl:with-global-context (ctx :auto-free-p t)
|
||||
(handler-case
|
||||
(let* ((actual-host (or proxy-host
|
||||
host))
|
||||
(actual-port (or proxy-port
|
||||
port))
|
||||
(socket (open-tls-socket actual-host actual-port)))
|
||||
(hooks:run-hooks 'hooks:*after-gemini-socket*)
|
||||
(let* ((stream (usocket:socket-stream socket))
|
||||
(ssl-hostname (if (or (iri:ipv4-address-p actual-host)
|
||||
(iri:ipv6-address-p actual-host))
|
||||
nil
|
||||
actual-host))
|
||||
(ssl-stream (cl+ssl:make-ssl-client-stream stream
|
||||
:certificate client-certificate
|
||||
:key certificate-key
|
||||
:password
|
||||
certificate-key-password
|
||||
:external-format nil ; unsigned byte 8
|
||||
:unwrap-stream-p t
|
||||
:verify nil
|
||||
:hostname ssl-hostname))
|
||||
(request (format nil "~a~a~a" iri #\return #\newline))
|
||||
(cert-hash (crypto-shortcuts:sha512 (x509:dump-certificate ssl-stream))))
|
||||
(debug-gemini "sending request ~a" request)
|
||||
(if (not (db:tofu-passes-p actual-host cert-hash))
|
||||
(error 'gemini-tofu-error :host actual-host)
|
||||
(progn
|
||||
(write-sequence (string->octets request) ssl-stream)
|
||||
(force-output ssl-stream)
|
||||
(hooks:run-hooks 'hooks:*after-gemini-request-sent*)
|
||||
(multiple-value-bind (status description meta response)
|
||||
#+sbcl (sb-sys:with-deadline (:seconds +read-response-deadline+)
|
||||
(parse-response ssl-stream))
|
||||
#-sbcl (parse-response ssl-stream)
|
||||
(values status description meta response socket))))))
|
||||
(error (e)
|
||||
(error e)))))))
|
||||
|
||||
(defun missing-dispath-function (status code-description meta response socket iri parsed-iri)
|
||||
(declare (ignore response socket parsed-iri))
|
||||
|
|
|
|||
|
|
@ -1074,7 +1074,7 @@ local file paths."
|
|||
(render-line rendered-line))))))))))))
|
||||
|
||||
(defun open-search-iri (criteria main-window)
|
||||
(let ((parsed-iri-search-capsule (iri:iri-parse constants:+gemini-search-engine+)))
|
||||
(let ((parsed-iri-search-capsule (iri:iri-parse (swconf:config-gemini-search-engine-iri))))
|
||||
(setf (uri:query parsed-iri-search-capsule)
|
||||
(text-utils:maybe-percent-encode criteria))
|
||||
(let ((search-iri (with-output-to-string (stream)
|
||||
|
|
|
|||
|
|
@ -1481,6 +1481,8 @@
|
|||
:config-default-post-language
|
||||
:config-announcements-separator
|
||||
:config-announcements-icon
|
||||
:config-gemini-proxy
|
||||
:config-gemini-search-engine-iri
|
||||
:link-regex->program-to-use
|
||||
:link-regex->program-to-use-buffer-size
|
||||
:use-tinmop-as-external-program-p
|
||||
|
|
|
|||
|
|
@ -2038,30 +2038,31 @@
|
|||
|
||||
(defmethod process-event ((object fediverse-local-query-event))
|
||||
(with-accessors ((payload payload)) object
|
||||
(multiple-value-bind (statuses destination-folder)
|
||||
(fediverse-post-local-search:parse-search-statuses payload)
|
||||
(let ((folder (or destination-folder
|
||||
(query-results-folder-name))))
|
||||
(loop for status in statuses do
|
||||
(let* ((status-id (db:row-message-status-id status))
|
||||
(status-row (db:find-status-id status-id)))
|
||||
(when (not (db::find-status-id-folder-timeline status-id
|
||||
folder
|
||||
db:+home-timeline+))
|
||||
(setf (getf status-row :folder)
|
||||
folder)
|
||||
(setf (getf status-row :timeline)
|
||||
db:+home-timeline+)
|
||||
(multiple-value-bind (query column-values)
|
||||
(db-utils:insert-query db:+table-status+ status-row)
|
||||
(db-utils:query-low-level query column-values)))))
|
||||
(db:renumber-timeline-message-index db:+home-timeline+
|
||||
folder
|
||||
:account-id nil)
|
||||
(let ((refresh-event (make-instance 'refresh-thread-windows-event
|
||||
:new-folder folder
|
||||
:new-timeline db:+home-timeline+)))
|
||||
(push-event refresh-event))))))
|
||||
(tui-utils:with-notify-errors
|
||||
(multiple-value-bind (statuses destination-folder)
|
||||
(fediverse-post-local-search:parse-search-statuses payload)
|
||||
(let ((folder (or destination-folder
|
||||
(query-results-folder-name))))
|
||||
(loop for status in statuses do
|
||||
(let* ((status-id (db:row-message-status-id status))
|
||||
(status-row (db:find-status-id status-id)))
|
||||
(when (not (db::find-status-id-folder-timeline status-id
|
||||
folder
|
||||
db:+home-timeline+))
|
||||
(setf (getf status-row :folder)
|
||||
folder)
|
||||
(setf (getf status-row :timeline)
|
||||
db:+home-timeline+)
|
||||
(multiple-value-bind (query column-values)
|
||||
(db-utils:insert-query db:+table-status+ status-row)
|
||||
(db-utils:query-low-level query column-values)))))
|
||||
(db:renumber-timeline-message-index db:+home-timeline+
|
||||
folder
|
||||
:account-id nil)
|
||||
(let ((refresh-event (make-instance 'refresh-thread-windows-event
|
||||
:new-folder folder
|
||||
:new-timeline db:+home-timeline+)))
|
||||
(push-event refresh-event)))))))
|
||||
|
||||
;;;; end events
|
||||
|
||||
|
|
|
|||
|
|
@ -597,6 +597,7 @@
|
|||
gemini
|
||||
gemlog
|
||||
gempub
|
||||
proxy
|
||||
library
|
||||
sync
|
||||
favicon
|
||||
|
|
@ -646,7 +647,8 @@
|
|||
purge-history-days-offset
|
||||
purge-cache-days-offset
|
||||
mentions
|
||||
montage)
|
||||
montage
|
||||
search-engine)
|
||||
|
||||
(defun perform-trivial-configuration-checks (file)
|
||||
(handler-case
|
||||
|
|
@ -1683,39 +1685,56 @@
|
|||
+key-announcements+
|
||||
+key-icon+)
|
||||
|
||||
(defun config-gemini-proxy ()
|
||||
(when-let* ((iri (access:accesses *software-configuration*
|
||||
+key-gemini+
|
||||
+key-proxy+
|
||||
+key-uri+))
|
||||
(parsed-iri (iri:iri-parse iri :null-on-error t)))
|
||||
(values (uri:host parsed-iri)
|
||||
(uri:port parsed-iri))))
|
||||
|
||||
(defun config-gemini-search-engine-iri ()
|
||||
(let ((iri (access:accesses *software-configuration*
|
||||
+key-gemini+
|
||||
+key-search-engine+
|
||||
+key-uri+)))
|
||||
(or iri
|
||||
+gemini-search-engine+)))
|
||||
|
||||
;;;;;; tests
|
||||
|
||||
(defun trivial-configuration-missing-value-check ()
|
||||
(loop for fn in (list
|
||||
#'gemini-downloading-animation
|
||||
#'gemini-default-favicon
|
||||
#'gemini-link-prefix-to-gemini
|
||||
#'gemini-link-prefix-to-other
|
||||
#'gemini-quote-prefix
|
||||
#'gemini-h1-prefix
|
||||
#'gemini-h2-prefix
|
||||
#'gemini-h3-prefix
|
||||
#'gemini-bullet-prefix
|
||||
#'gemini-subscription-url-fg
|
||||
#'gemini-subscription-count-fg
|
||||
#'signature-file-path
|
||||
#'window-titles-ends
|
||||
#'tags-new-message-mark
|
||||
#'config-server-name
|
||||
#'config-username
|
||||
#'config-password-echo-character
|
||||
#'config-win-focus-mark
|
||||
#'command-separator-config-values
|
||||
#'message-window-locked-account-mark
|
||||
#'message-window-unlocked-account-mark
|
||||
#'message-window-line-mark-values
|
||||
#'message-window-attachments-header
|
||||
#'config-post-allowed-language
|
||||
#'config-default-post-language
|
||||
#'config-announcements-separator)
|
||||
(loop for fn in (list #'gemini-downloading-animation
|
||||
#'gemini-default-favicon
|
||||
#'gemini-link-prefix-to-gemini
|
||||
#'gemini-link-prefix-to-other
|
||||
#'gemini-quote-prefix
|
||||
#'gemini-h1-prefix
|
||||
#'gemini-h2-prefix
|
||||
#'gemini-h3-prefix
|
||||
#'gemini-bullet-prefix
|
||||
#'gemini-subscription-url-fg
|
||||
#'gemini-subscription-count-fg
|
||||
#'signature-file-path
|
||||
#'window-titles-ends
|
||||
#'tags-new-message-mark
|
||||
#'config-server-name
|
||||
#'config-username
|
||||
#'config-password-echo-character
|
||||
#'config-win-focus-mark
|
||||
#'command-separator-config-values
|
||||
#'message-window-locked-account-mark
|
||||
#'message-window-unlocked-account-mark
|
||||
#'message-window-line-mark-values
|
||||
#'message-window-attachments-header
|
||||
#'config-post-allowed-language
|
||||
#'config-default-post-language
|
||||
#'config-announcements-separator)
|
||||
do
|
||||
(funcall fn)))
|
||||
|
||||
(defun trivial-configuration-checks ()
|
||||
(assert (length= (config-username)
|
||||
(config-server-name))))
|
||||
(config-server-name)))
|
||||
(config-gemini-proxy))
|
||||
|
|
|
|||
Loading…
Reference in New Issue