mirror-bot/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2026-02-15 17:16:57 +00:00
Code Packages 1 Activity

Fix tests, relationship should always define _expires_at

Browse source 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
This commit is contained in:
nicole mikołajczyk 2026-01-28 13:58:33 +01:00
parent c1e33bfadb
commit bc0c7fb310
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/web/mastodon_api/views/account_view.ex
View file

@ -143,6 +143,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
reading_user, reading_user,
&User.blocks_user?(&1, &2) &User.blocks_user?(&1, &2)
), ),
block_expires_at: nil,
muting: muting, muting: muting,
muting_notifications: muting_notifications:
UserRelationship.exists?( UserRelationship.exists?(
@ -152,6 +153,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
target, target,
&User.muted_notifications?(&1, &2) &User.muted_notifications?(&1, &2)
), ),
mute_expires_at: nil,
subscribing: subscribing, subscribing: subscribing,
notifying: subscribing, notifying: subscribing,
requested: requested, requested: requested,

6
test/pleroma/web/mastodon_api/views/account_view_test.exs
View file

@ -909,8 +909,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
relationship: %{ relationship: %{
mute_expires_at: mute_expires_at mute_expires_at: mute_expires_at
} }
}, }
mute_expires_at: mute_expires_at
} = AccountView.render("show.json", %{user: other_user, for: user, embed_relationships: true}) } = AccountView.render("show.json", %{user: other_user, for: user, embed_relationships: true})
assert DateTime.diff( assert DateTime.diff(
@ -931,8 +930,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
relationship: %{ relationship: %{
block_expires_at: block_expires_at block_expires_at: block_expires_at
} }
}, }
block_expires_at: block_expires_at
} = AccountView.render("show.json", %{user: other_user, for: user, embed_relationships: true}) } = AccountView.render("show.json", %{user: other_user, for: user, embed_relationships: true})
assert DateTime.diff( assert DateTime.diff(