mirror of
https://github.com/khoaliber/khoj.git
synced 2026-03-08 05:39:13 +00:00
Merge branch 'master' of github.com:debanjum/khoj into modularize-api-and-increase-typing
- Conflicts:
- src/interface/emacs/khoj.el
Use our update to `config-url', use their `url-request-method'
This commit is contained in:
6
.github/workflows/build.yml
vendored
6
.github/workflows/build.yml
vendored
@@ -11,6 +11,10 @@ on:
|
|||||||
- Dockerfile
|
- Dockerfile
|
||||||
- docker-compose.yml
|
- docker-compose.yml
|
||||||
- .github/workflows/build.yml
|
- .github/workflows/build.yml
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
env:
|
||||||
|
DOCKER_IMAGE_TAG: ${{ github.ref == 'refs/heads/master' && 'latest' || github.ref_name }}
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
@@ -36,6 +40,6 @@ jobs:
|
|||||||
context: .
|
context: .
|
||||||
file: Dockerfile
|
file: Dockerfile
|
||||||
push: true
|
push: true
|
||||||
tags: ghcr.io/${{ github.repository }}:latest
|
tags: ghcr.io/${{ github.repository }}:${{ env.DOCKER_IMAGE_TAG }}
|
||||||
build-args: |
|
build-args: |
|
||||||
PORT=8000
|
PORT=8000
|
||||||
@@ -226,7 +226,8 @@ Use `which-key` if available, else display simple message in echo area"
|
|||||||
|
|
||||||
(defun khoj--get-enabled-content-types ()
|
(defun khoj--get-enabled-content-types ()
|
||||||
"Get content types enabled for search from API."
|
"Get content types enabled for search from API."
|
||||||
(let ((config-url (format "%s/api/config/data" khoj-server-url)))
|
(let ((config-url (format "%s/api/config/data" khoj-server-url))
|
||||||
|
(url-request-method "GET"))
|
||||||
(with-temp-buffer
|
(with-temp-buffer
|
||||||
(erase-buffer)
|
(erase-buffer)
|
||||||
(url-insert-file-contents config-url)
|
(url-insert-file-contents config-url)
|
||||||
@@ -250,7 +251,8 @@ Use `which-key` if available, else display simple message in echo area"
|
|||||||
Render results in BUFFER-NAME."
|
Render results in BUFFER-NAME."
|
||||||
;; get json response from api
|
;; get json response from api
|
||||||
(with-current-buffer buffer-name
|
(with-current-buffer buffer-name
|
||||||
(let ((inhibit-read-only t))
|
(let ((inhibit-read-only t)
|
||||||
|
(url-request-method "GET"))
|
||||||
(erase-buffer)
|
(erase-buffer)
|
||||||
(url-insert-file-contents query-url)))
|
(url-insert-file-contents query-url)))
|
||||||
;; render json response into formatted entries
|
;; render json response into formatted entries
|
||||||
|
|||||||
Reference in New Issue
Block a user