Commit 1dd2c816 authored by lain's avatar lain
Browse files

Order masto searches by date.

parent d7654f4b
Pipeline #1173 failed with stage
in 3 minutes and 14 seconds
......@@ -515,7 +515,8 @@ def search(%{assigns: %{user: user}} = conn, %{"q" => query} = params) do
a.data,
^query
),
limit: 20
limit: 20,
order_by: [desc: :inserted_at]
)
statuses = Repo.all(q) ++ fetched
......@@ -605,35 +606,37 @@ def index(%{assigns: %{user: user}} = conn, _params) do
"video\/mp4"
]
},
settings: Map.get(user.info, "settings") || %{
onboarded: true,
home: %{
shows: %{
reblog: true,
reply: true
}
},
notifications: %{
alerts: %{
follow: true,
favourite: true,
reblog: true,
mention: true
settings:
Map.get(user.info, "settings") ||
%{
onboarded: true,
home: %{
shows: %{
reblog: true,
reply: true
}
},
notifications: %{
alerts: %{
follow: true,
favourite: true,
reblog: true,
mention: true
},
shows: %{
follow: true,
favourite: true,
reblog: true,
mention: true
},
sounds: %{
follow: true,
favourite: true,
reblog: true,
mention: true
}
}
},
shows: %{
follow: true,
favourite: true,
reblog: true,
mention: true
},
sounds: %{
follow: true,
favourite: true,
reblog: true,
mention: true
}
}
},
push_subscription: nil,
accounts: accounts,
custom_emojis: mastodon_emoji,
......@@ -656,7 +659,8 @@ def put_settings(%{assigns: %{user: user}} = conn, %{"data" => settings} = _para
{:ok, _user} <- User.update_and_set_cache(change) do
conn
|> json(%{})
else e ->
else
e ->
conn
|> json(%{error: inspect(e)})
end
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment