projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
views
/
filter_view.ex
diff --git
a/lib/pleroma/web/mastodon_api/views/filter_view.ex
b/lib/pleroma/web/mastodon_api/views/filter_view.ex
index 1052a449d291bd851b56e4ca20775489c9ddfb32..8e8798c1e312035dc57ad22b29537e4004714b70 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/views/filter_view.ex
+++ b/
lib/pleroma/web/mastodon_api/views/filter_view.ex
@@
-1,17
+1,17
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
21
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.FilterView do
use Pleroma.Web, :view
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.FilterView do
use Pleroma.Web, :view
- alias Pleroma.Web.MastodonAPI.FilterView
alias Pleroma.Web.CommonAPI.Utils
alias Pleroma.Web.CommonAPI.Utils
+ alias Pleroma.Web.MastodonAPI.FilterView
- def render("
filters.json", %{filters: filters} = opts
) do
- render_many(filters, FilterView, "
filter.json", opts
)
+ def render("
index.json", %{filters: filters}
) do
+ render_many(filters, FilterView, "
show.json"
)
end
end
- def render("
filter
.json", %{filter: filter}) do
+ def render("
show
.json", %{filter: filter}) do
expires_at =
if filter.expires_at do
Utils.to_masto_date(filter.expires_at)
expires_at =
if filter.expires_at do
Utils.to_masto_date(filter.expires_at)
@@
-25,7
+25,7
@@
defmodule Pleroma.Web.MastodonAPI.FilterView do
context: filter.context,
expires_at: expires_at,
irreversible: filter.hide,
context: filter.context,
expires_at: expires_at,
irreversible: filter.hide,
- whole_word: f
alse
+ whole_word: f
ilter.whole_word
}
end
end
}
end
end