diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8546370e9..74b21f600 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
## [Unreleased]
+### Fixed
+- Updated mastoFE path, for the newer version
+
### Removed
- Scrobbling support
- `/api/v1/pleroma/scrobble`
diff --git a/config/config.exs b/config/config.exs
index 61b5a0317..a7b38dbd0 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -710,6 +710,7 @@
config :pleroma, :frontends,
primary: %{"name" => "pleroma-fe", "ref" => "stable"},
admin: %{"name" => "admin-fe", "ref" => "stable"},
+ mastodon: %{"name" => "mastodon-fe", "ref" => "akkoma"},
swagger: %{
"name" => "swagger-ui",
"ref" => "stable",
@@ -728,9 +729,9 @@
"mastodon-fe" => %{
"name" => "mastodon-fe",
"git" => "https://akkoma.dev/AkkomaGang/masto-fe",
- "build_url" => "https://akkoma-updates.s3-website.fr-par.scw.cloud/frontend/masto-fe.zip",
+ "build_url" => "https://akkoma-updates.s3-website.fr-par.scw.cloud/frontend/${ref}/masto-fe.zip",
"build_dir" => "distribution",
- "ref" => "develop"
+ "ref" => "akkoma"
},
"admin-fe" => %{
"name" => "admin-fe",
diff --git a/config/description.exs b/config/description.exs
index c67da64b5..a4f115ce7 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -2991,6 +2991,12 @@
description: "Admin frontend",
children: installed_frontend_options
},
+ %{
+ key: :mastodon,
+ type: :map,
+ description: "Mastodon frontend",
+ children: installed_frontend_options
+ },
%{
key: :swagger,
type: :map,
diff --git a/lib/pleroma/web/templates/masto_fe/index.html.eex b/lib/pleroma/web/templates/masto_fe/index.html.eex
index 6f2b98957..dadf8f413 100644
--- a/lib/pleroma/web/templates/masto_fe/index.html.eex
+++ b/lib/pleroma/web/templates/masto_fe/index.html.eex
@@ -11,22 +11,22 @@
-
-
+
+
-
-
-
-
+
+
+
+
-
-
+
+
-
-
+
+
-
+
diff --git a/test/pleroma/web/activity_pub/transmogrifier/audio_handling_test.exs b/test/pleroma/web/activity_pub/transmogrifier/audio_handling_test.exs
index 0a1a965ca..f8b56685b 100644
--- a/test/pleroma/web/activity_pub/transmogrifier/audio_handling_test.exs
+++ b/test/pleroma/web/activity_pub/transmogrifier/audio_handling_test.exs
@@ -10,8 +10,6 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier.AudioHandlingTest do
alias Pleroma.Object
alias Pleroma.Web.ActivityPub.Transmogrifier
- import Pleroma.Factory
-
test "Funkwhale Audio object" do
Tesla.Mock.mock(fn
%{url: "https://channels.tests.funkwhale.audio/federation/actors/compositions"} ->