projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Order masto searches by date.
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
mastodon_api_controller.ex
diff --git
a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
index b00f1e15c1a58506e02f597fb4b821f7c9040410..21b99f919e4bb70178f491a019bea9156c2fb0a4 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
+++ b/
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
@@
-515,7
+515,8
@@
defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
a.data,
^query
),
a.data,
^query
),
- limit: 20
+ limit: 20,
+ order_by: [desc: :inserted_at]
)
statuses = Repo.all(q) ++ fetched
)
statuses = Repo.all(q) ++ fetched
@@
-605,35
+606,37
@@
defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
"video\/mp4"
]
},
"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,
push_subscription: nil,
accounts: accounts,
custom_emojis: mastodon_emoji,
@@
-656,7
+659,8
@@
defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
{:ok, _user} <- User.update_and_set_cache(change) do
conn
|> json(%{})
{:ok, _user} <- User.update_and_set_cache(change) do
conn
|> json(%{})
- else e ->
+ else
+ e ->
conn
|> json(%{error: inspect(e)})
end
conn
|> json(%{error: inspect(e)})
end