fix tests
All checks were successful
ci/woodpecker/push/docs Pipeline was successful
ci/woodpecker/pr/release Pipeline was successful
ci/woodpecker/pr/docs Pipeline was successful
ci/woodpecker/push/release Pipeline was successful
ci/woodpecker/push/test Pipeline was successful
ci/woodpecker/pr/test Pipeline was successful
All checks were successful
ci/woodpecker/push/docs Pipeline was successful
ci/woodpecker/pr/release Pipeline was successful
ci/woodpecker/pr/docs Pipeline was successful
ci/woodpecker/push/release Pipeline was successful
ci/woodpecker/push/test Pipeline was successful
ci/woodpecker/pr/test Pipeline was successful
This commit is contained in:
parent
d2b1b4d6c8
commit
a948a57162
2 changed files with 4 additions and 3 deletions
|
@ -129,10 +129,10 @@ def public(%{assigns: %{user: user}} = conn, params) do
|
|||
# GET /api/v1/timelines/bubble
|
||||
def bubble(%{assigns: %{user: user}} = conn, params) do
|
||||
bubble_instances =
|
||||
Enum.uniq([
|
||||
Enum.uniq(
|
||||
Config.get([:instance, :local_bubble], []) ++
|
||||
[Pleroma.Web.Endpoint.host()]
|
||||
])
|
||||
)
|
||||
|
||||
if is_nil(user) do
|
||||
fail_on_bad_auth(conn)
|
||||
|
|
|
@ -999,7 +999,8 @@ test "with `%{local: true, federated: false}`, forbids unauthenticated access to
|
|||
|
||||
test "filtering", %{conn: conn, user: user} do
|
||||
clear_config([:instance, :local_bubble], [])
|
||||
local_user = insert(:user)
|
||||
# our endpoint host has a port in it so let's set the AP ID
|
||||
local_user = insert(:user, %{ap_id: "https://localhost/users/user"})
|
||||
remote_user = insert(:user, %{ap_id: "https://example.com/users/remote_user"})
|
||||
{:ok, user, local_user} = User.follow(user, local_user)
|
||||
{:ok, _user, remote_user} = User.follow(user, remote_user)
|
||||
|
|
Loading…
Reference in a new issue