projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request 'docs: fedora install errata' (#398) from acuteaura/akkoma:acuteau...
[akkoma]
/
lib
/
mix
/
tasks
/
pleroma
/
search
/
meilisearch.ex
diff --git
a/lib/mix/tasks/pleroma/search/meilisearch.ex
b/lib/mix/tasks/pleroma/search/meilisearch.ex
index 5098668ad77d2ed0f0c963620a964bd6d4dbb1f3..27a31afcf4a684f8d87dfb8daac2abe6a3c7a7e3 100644
(file)
--- a/
lib/mix/tasks/pleroma/search/meilisearch.ex
+++ b/
lib/mix/tasks/pleroma/search/meilisearch.ex
@@
-9,7
+9,7
@@
defmodule Mix.Tasks.Pleroma.Search.Meilisearch do
import Ecto.Query
import Pleroma.Search.Meilisearch,
import Ecto.Query
import Pleroma.Search.Meilisearch,
- only: [meili_p
ost: 2, meili_p
ut: 2, meili_get: 1, meili_delete!: 1]
+ only: [meili_put: 2, meili_get: 1, meili_delete!: 1]
def run(["index"]) do
start_pleroma()
def run(["index"]) do
start_pleroma()
@@
-22,12
+22,12
@@
defmodule Mix.Tasks.Pleroma.Search.Meilisearch do
)
# The ranking rule syntax was changed but nothing about that is mentioned in the changelog
)
# The ranking rule syntax was changed but nothing about that is mentioned in the changelog
- if not Version.match?(meili_version, ">= 0.2
4
.0") do
+ if not Version.match?(meili_version, ">= 0.2
5
.0") do
raise "Meilisearch <0.24.0 not supported"
end
{:ok, _} =
raise "Meilisearch <0.24.0 not supported"
end
{:ok, _} =
- meili_p
os
t(
+ meili_p
u
t(
"/indexes/objects/settings/ranking-rules",
[
"published:desc",
"/indexes/objects/settings/ranking-rules",
[
"published:desc",
@@
-41,7
+41,7
@@
defmodule Mix.Tasks.Pleroma.Search.Meilisearch do
)
{:ok, _} =
)
{:ok, _} =
- meili_p
os
t(
+ meili_p
u
t(
"/indexes/objects/settings/searchable-attributes",
[
"content"
"/indexes/objects/settings/searchable-attributes",
[
"content"
@@
-91,7
+91,7
@@
defmodule Mix.Tasks.Pleroma.Search.Meilisearch do
)
with {:ok, res} <- result do
)
with {:ok, res} <- result do
- if not Map.has_key?(res, "
updateI
d") do
+ if not Map.has_key?(res, "
indexUi
d") do
IO.puts("\nFailed to index: #{inspect(result)}")
end
else
IO.puts("\nFailed to index: #{inspect(result)}")
end
else
@@
-112,7
+112,7
@@
defmodule Mix.Tasks.Pleroma.Search.Meilisearch do
meili_delete!("/indexes/objects/documents")
end
meili_delete!("/indexes/objects/documents")
end
- def run(["show-
private-key
", master_key]) do
+ def run(["show-
keys
", master_key]) do
start_pleroma()
endpoint = Pleroma.Config.get([Pleroma.Search.Meilisearch, :url])
start_pleroma()
endpoint = Pleroma.Config.get([Pleroma.Search.Meilisearch, :url])
@@
-120,15
+120,17
@@
defmodule Mix.Tasks.Pleroma.Search.Meilisearch do
{:ok, result} =
Pleroma.HTTP.get(
Path.join(endpoint, "/keys"),
{:ok, result} =
Pleroma.HTTP.get(
Path.join(endpoint, "/keys"),
- [{"
X-Meili-API-Key", master_key
}]
+ [{"
Authorization", "Bearer #{master_key}"
}]
)
decoded = Jason.decode!(result.body)
)
decoded = Jason.decode!(result.body)
- if decoded["private"] do
- IO.puts(decoded["private"])
+ if decoded["results"] do
+ Enum.each(decoded["results"], fn %{"description" => desc, "key" => key} ->
+ IO.puts("#{desc}: #{key}")
+ end)
else
else
- IO.puts("Error fetching the key, check the master key is correct: #{inspect(decoded)}")
+ IO.puts("Error fetching the key
s
, check the master key is correct: #{inspect(decoded)}")
end
end
end
end