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:
Debanjum Singh Solanky
2022-10-19 16:46:53 +05:30
2 changed files with 9 additions and 3 deletions

View File

@@ -11,6 +11,10 @@ on:
- Dockerfile
- docker-compose.yml
- .github/workflows/build.yml
workflow_dispatch:
env:
DOCKER_IMAGE_TAG: ${{ github.ref == 'refs/heads/master' && 'latest' || github.ref_name }}
jobs:
build:
@@ -36,6 +40,6 @@ jobs:
context: .
file: Dockerfile
push: true
tags: ghcr.io/${{ github.repository }}:latest
tags: ghcr.io/${{ github.repository }}:${{ env.DOCKER_IMAGE_TAG }}
build-args: |
PORT=8000

View File

@@ -226,7 +226,8 @@ Use `which-key` if available, else display simple message in echo area"
(defun khoj--get-enabled-content-types ()
"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
(erase-buffer)
(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."
;; get json response from api
(with-current-buffer buffer-name
(let ((inhibit-read-only t))
(let ((inhibit-read-only t)
(url-request-method "GET"))
(erase-buffer)
(url-insert-file-contents query-url)))
;; render json response into formatted entries