hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixes

Browse source 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
This commit is contained in:
nicole mikołajczyk 2026-03-03 00:29:46 +01:00
commit 19025563e2
4 changed files with 6 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/pleroma/web/api_spec/operations/remote_interaction_operation.ex
View file

@ -96,14 +96,4 @@ defmodule Pleroma.Web.ApiSpec.RemoteInteractionOperation do
responses: %{200 => Operation.response("Web Page", "text/html", %Schema{type: :string})} responses: %{200 => Operation.response("Web Page", "text/html", %Schema{type: :string})}
} }
end end
def show_subscribe_form_operation do
%Operation{
tags: ["Remote interaction"],
summary: "Show remote subscribe form",
operationId: "RemoteInteractionController.show_subscribe_form",
parameters: [],
responses: %{200 => Operation.response("Web Page", "text/html", %Schema{type: :string})}
}
end
end end

3
lib/pleroma/web/router.ex
View file

@ -234,10 +234,11 @@ defmodule Pleroma.Web.Router do
end end
scope "/api/v1/pleroma", Pleroma.Web.PleromaAPI do scope "/api/v1/pleroma", Pleroma.Web.PleromaAPI do
pipe_through(:pleroma_api)
get("/emoji", UtilController, :emoji) get("/emoji", UtilController, :emoji)
get("/captcha", UtilController, :captcha) get("/captcha", UtilController, :captcha)
get("/healthcheck", UtilController, :healthcheck) get("/healthcheck", UtilController, :healthcheck)
get("/federation_status", InstancesController, :show) get("/federation_status", InstancesController, :show)
end end

2
lib/pleroma/web/templates/static_fe/static_fe/profile.html.eex
View file

@ -2,7 +2,7 @@
<h1><%= link instance_name(), to: "/" %></h1> <h1><%= link instance_name(), to: "/" %></h1>
<h3> <h3>
<form class="pull-right collapse" method="POST" action="<%= Helpers.util_path(@conn, :remote_subscribe) %>"> <form class="pull-right collapse" method="POST" action="<%= Helpers.remote_interaction_path(@conn, :remote_subscribe) %>">
<input type="hidden" name="nickname" value="<%= @user.nickname %>"> <input type="hidden" name="nickname" value="<%= @user.nickname %>">
<input type="hidden" name="profile" value=""> <input type="hidden" name="profile" value="">
<button type="submit" class="collapse"><%= Gettext.dpgettext("static_pages", "static fe profile page remote follow button", "Remote follow") %></button> <button type="submit" class="collapse"><%= Gettext.dpgettext("static_pages", "static fe profile page remote follow button", "Remote follow") %></button>

6
test/pleroma/web/remote_interaction/remote_interaction_controller_test.exs
View file

@ -428,7 +428,7 @@ defmodule Pleroma.Web.RemoteInteraction.RemoteInteractionControllerTest do
avatar: %{"url" => [%{"href" => "https://remote.org/avatar.png"}]} avatar: %{"url" => [%{"href" => "https://remote.org/avatar.png"}]}
}) })
avatar_url = Pleroma.Web.PleromaAPI.RemoteFollowView.avatar_url(user) avatar_url = Pleroma.Web.RemoteInteraction.RemoteInteractionView.avatar_url(user)
assert avatar_url == "https://remote.org/avatar.png" assert avatar_url == "https://remote.org/avatar.png"
end end
@ -445,7 +445,7 @@ defmodule Pleroma.Web.RemoteInteraction.RemoteInteractionControllerTest do
avatar: %{"url" => [%{"href" => "https://remote.org/avatar.png"}]} avatar: %{"url" => [%{"href" => "https://remote.org/avatar.png"}]}
}) })
avatar_url = Pleroma.Web.PleromaAPI.RemoteFollowView.avatar_url(user) avatar_url = Pleroma.Web.RemoteInteraction.RemoteInteractionView.avatar_url(user)
url = Pleroma.Web.Endpoint.url() url = Pleroma.Web.Endpoint.url()
assert String.starts_with?(avatar_url, url) assert String.starts_with?(avatar_url, url)
@ -460,7 +460,7 @@ defmodule Pleroma.Web.RemoteInteraction.RemoteInteractionControllerTest do
avatar: %{"url" => [%{"href" => "#{Pleroma.Web.Endpoint.url()}/localuser/avatar.png"}]} avatar: %{"url" => [%{"href" => "#{Pleroma.Web.Endpoint.url()}/localuser/avatar.png"}]}
}) })
avatar_url = Pleroma.Web.PleromaAPI.RemoteFollowView.avatar_url(user) avatar_url = Pleroma.Web.RemoteInteraction.RemoteInteractionView.avatar_url(user)
assert avatar_url == "#{Pleroma.Web.Endpoint.url()}/localuser/avatar.png" assert avatar_url == "#{Pleroma.Web.Endpoint.url()}/localuser/avatar.png"
end end