diff --git a/CHANGELOG.md b/CHANGELOG.md index 38a986fc9..ae86b415f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,13 +4,14 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). -## 1.0.0 (Spirit) [Unreleased] +## 3.10.5 (Spirit) [Unreleased] ## Added - Full compatibility with Erlang OTP26 - Handling of GET /api/v1/preferences - Support for indefinite polls -- Added new translator +- Added new translatr +- Redirect /authorize_interaction to /ostatus_subscribe ## Changed - OTP builds are now built on erlang OTP26 diff --git a/lib/pleroma/web/fallback/redirect_controller.ex b/lib/pleroma/web/fallback/redirect_controller.ex index 66eed170d..d88940841 100644 --- a/lib/pleroma/web/fallback/redirect_controller.ex +++ b/lib/pleroma/web/fallback/redirect_controller.ex @@ -128,4 +128,8 @@ defmodule Pleroma.Web.Fallback.RedirectController do defp build_meta(:favicon, _) do "" end + + def redirect_interaction(conn, %{"uri" => uri}) do + redirect(conn, to: "/ostatus_subscribe?acct=#{uri}") + end end diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index ca4995281..1c2904249 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -936,6 +936,7 @@ defmodule Pleroma.Web.Router do end scope "/", Pleroma.Web.Fallback do + get("/authorize_interaction", RedirectController, :redirect_interaction) get("/registration/:token", RedirectController, :registration_page) get("/:maybe_nickname_or_id", RedirectController, :redirector_with_meta) get("/api/*path", RedirectController, :api_not_implemented) diff --git a/mix.exs b/mix.exs index 91d9c33f5..bdffd73c2 100644 --- a/mix.exs +++ b/mix.exs @@ -4,7 +4,7 @@ defmodule Pleroma.Mixfile do def project do [ app: :pleroma, - version: version("3.10.4"), + version: version("3.10.5"), elixir: "~> 1.14", elixirc_paths: elixirc_paths(Mix.env()), compilers: Mix.compilers(),