AkkomaGang/akkoma
AkkomaGang/akkoma
16
67
Fork 93
Code Issues 176 Pull requests 16 Projects 2 Releases 16 Packages Wiki Activity

include local instance in bubble timeline #117

Merged
floatingghost merged 2 commits from bubble-include-local into develop 2022-07-26 12:22:50 +00:00
Conversation 0 Commits 2 Files changed 2 +4 -3
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit a948a57162 - Show all commits

4
lib/pleroma/web/mastodon_api/controllers/timeline_controller.ex
View file

@ -129,10 +129,10 @@ def public(%{assigns: %{user: user}} = conn, params) do
# GET /api/v1/timelines/bubble # GET /api/v1/timelines/bubble
def bubble(%{assigns: %{user: user}} = conn, params) do def bubble(%{assigns: %{user: user}} = conn, params) do
bubble_instances = bubble_instances =
Enum.uniq([ Enum.uniq(
Config.get([:instance, :local_bubble], []) ++ Config.get([:instance, :local_bubble], []) ++
[Pleroma.Web.Endpoint.host()] [Pleroma.Web.Endpoint.host()]
]) )
if is_nil(user) do if is_nil(user) do
fail_on_bad_auth(conn) fail_on_bad_auth(conn)

3
test/pleroma/web/mastodon_api/controllers/timeline_controller_test.exs
View file

@ -999,7 +999,8 @@ test "with `%{local: true, federated: false}`, forbids unauthenticated access to
test "filtering", %{conn: conn, user: user} do test "filtering", %{conn: conn, user: user} do
clear_config([:instance, :local_bubble], []) 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"}) remote_user = insert(:user, %{ap_id: "https://example.com/users/remote_user"})
{:ok, user, local_user} = User.follow(user, local_user) {:ok, user, local_user} = User.follow(user, local_user)
{:ok, _user, remote_user} = User.follow(user, remote_user) {:ok, _user, remote_user} = User.follow(user, remote_user)