projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'get-cached-everywhere' into 'develop'
[akkoma]
/
test
/
web
/
mastodon_api
/
status_view_test.exs
diff --git
a/test/web/mastodon_api/status_view_test.exs
b/test/web/mastodon_api/status_view_test.exs
index 3eec2cb5beea469e3508d874dee749f26397857c..fde931b4315ff498d1ba45db90d73322619f8c92 100644
(file)
--- a/
test/web/mastodon_api/status_view_test.exs
+++ b/
test/web/mastodon_api/status_view_test.exs
@@
-6,9
+6,11
@@
defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
use Pleroma.DataCase
alias Pleroma.Activity
use Pleroma.DataCase
alias Pleroma.Activity
+ alias Pleroma.Object
+ alias Pleroma.Repo
alias Pleroma.User
alias Pleroma.User
- alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.Web.CommonAPI
alias Pleroma.Web.CommonAPI
+ alias Pleroma.Web.CommonAPI.Utils
alias Pleroma.Web.MastodonAPI.AccountView
alias Pleroma.Web.MastodonAPI.StatusView
alias Pleroma.Web.OStatus
alias Pleroma.Web.MastodonAPI.AccountView
alias Pleroma.Web.MastodonAPI.StatusView
alias Pleroma.Web.OStatus
@@
-52,14
+54,14
@@
defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
test "a note with null content" do
note = insert(:note_activity)
test "a note with null content" do
note = insert(:note_activity)
+ note_object = Object.normalize(note.data["object"])
data =
data =
- note.data
- |>
put_in(["object", "content"]
, nil)
+ note
_object
.data
+ |>
Map.put("content"
, nil)
- note =
- note
- |> Map.put(:data, data)
+ Object.change(note_object, %{data: data})
+ |> Object.update_and_set_cache()
User.get_cached_by_ap_id(note.data["actor"])
User.get_cached_by_ap_id(note.data["actor"])
@@
-72,6
+74,8
@@
defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
note = insert(:note_activity)
user = User.get_cached_by_ap_id(note.data["actor"])
note = insert(:note_activity)
user = User.get_cached_by_ap_id(note.data["actor"])
+ convo_id = Utils.context_to_conversation_id(note.data["object"]["context"])
+
status = StatusView.render("status.json", %{activity: note})
created_at =
status = StatusView.render("status.json", %{activity: note})
created_at =
@@
-98,7
+102,7
@@
defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
muted: false,
pinned: false,
sensitive: false,
muted: false,
pinned: false,
sensitive: false,
- spoiler_text:
note.data["object"]["summary"]
,
+ spoiler_text:
HtmlSanitizeEx.basic_html(note.data["object"]["summary"])
,
visibility: "public",
media_attachments: [],
mentions: [],
visibility: "public",
media_attachments: [],
mentions: [],
@@
-122,7
+126,10
@@
defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
}
],
pleroma: %{
}
],
pleroma: %{
- local: true
+ local: true,
+ conversation_id: convo_id,
+ content: %{"text/plain" => HtmlSanitizeEx.strip_tags(note.data["object"]["content"])},
+ spoiler_text: %{"text/plain" => HtmlSanitizeEx.strip_tags(note.data["object"]["summary"])}
}
}
}
}
@@
-171,7
+178,7
@@
defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
status = StatusView.render("status.json", %{activity: activity})
status = StatusView.render("status.json", %{activity: activity})
- actor =
Repo.get_by(User, ap_id:
activity.actor)
+ actor =
User.get_cached_by_ap_id(
activity.actor)
assert status.mentions ==
Enum.map([user, actor], fn u -> AccountView.render("mention.json", %{user: u}) end)
assert status.mentions ==
Enum.map([user, actor], fn u -> AccountView.render("mention.json", %{user: u}) end)
@@
-196,7
+203,8
@@
defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
remote_url: "someurl",
preview_url: "someurl",
text_url: "someurl",
remote_url: "someurl",
preview_url: "someurl",
text_url: "someurl",
- description: nil
+ description: nil,
+ pleroma: %{mime_type: "image/png"}
}
assert expected == StatusView.render("attachment.json", %{attachment: object})
}
assert expected == StatusView.render("attachment.json", %{attachment: object})
@@
-223,7
+231,7
@@
defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
user = insert(:user)
{:ok, object} =
user = insert(:user)
{:ok, object} =
-
ActivityPub
.fetch_object_from_id(
+
Pleroma.Object.Fetcher
.fetch_object_from_id(
"https://peertube.moe/videos/watch/df5f464b-be8d-46fb-ad81-2d4c2d1630e3"
)
"https://peertube.moe/videos/watch/df5f464b-be8d-46fb-ad81-2d4c2d1630e3"
)