update mastofe paths (#95)

Reviewed-on: https://akkoma.dev/AkkomaGang/akkoma/pulls/95

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8546370e97e2f1b29ff9b8e339bf50c5cb5f65e7..74b21f60047a456b2c9ffe8dfe15335628471091 100644 (file)
--- 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 61b5a0317e31bbf3b85efaa0706ad252e4c9d4fc..a7b38dbd0ab0ad862ecd5565beedbeb28104071d 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -710,6 +710,7 @@ config :pleroma, :static_fe, enabled: false
 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 @@ config :pleroma, :frontends,
     "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 c67da64b532f16ee79c56cee1d0821cd098e8b7f..a4f115ce7a38732c0befcd84a8ca5dbe456dd772 100644 (file)
--- a/config/description.exs
+++ b/config/description.exs
@@ -2991,6 +2991,12 @@ config :pleroma, :config_description, [
         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 6f2b989570f65539a38468b5d0acbd28d4bdebe1..dadf8f413ada0fc150a9ea14f3f6e500b22e96a4 100644 (file)
--- a/lib/pleroma/web/templates/masto_fe/index.html.eex
+++ b/lib/pleroma/web/templates/masto_fe/index.html.eex
@@ -11,22 +11,22 @@
 
 <meta name="theme-color" content="<%= Config.get([:manifest, :theme_color]) %>" />
 
-<script crossorigin='anonymous' src="/packs/locales.js"></script>
-<script crossorigin='anonymous' src="/packs/locales/glitch/en.js"></script>
+<script crossorigin='anonymous' src="/packs/js/locales.js"></script>
+<script crossorigin='anonymous' src="/packs/js/locales/glitch/en.js"></script>
 
-<link rel='preload' as='script' crossorigin='anonymous' href='/packs/features/getting_started.js'>
-<link rel='preload' as='script' crossorigin='anonymous' href='/packs/features/compose.js'>
-<link rel='preload' as='script' crossorigin='anonymous' href='/packs/features/home_timeline.js'>
-<link rel='preload' as='script' crossorigin='anonymous' href='/packs/features/notifications.js'>
+<link rel='preload' as='script' crossorigin='anonymous' href='/packs/js/features/getting_started.js'>
+<link rel='preload' as='script' crossorigin='anonymous' href='/packs/js/features/compose.js'>
+<link rel='preload' as='script' crossorigin='anonymous' href='/packs/js/features/home_timeline.js'>
+<link rel='preload' as='script' crossorigin='anonymous' href='/packs/js/features/notifications.js'>
 <script id='initial-state' type='application/json'><%= initial_state(@token, @user, @custom_emojis) %></script>
 
-<script src="/packs/core/common.js"></script>
-<link rel="stylesheet" media="all" href="/packs/core/common.css" />
+<script src="/packs/js/core/common.js"></script>
+<link rel="stylesheet" media="all" href="/packs/css/core/common.css" />
 
-<script src="/packs/flavours/glitch/common.js"></script>
-<link rel="stylesheet" media="all" href="/packs/flavours/glitch/common.css" />
+<script src="/packs/js/flavours/glitch/common.js"></script>
+<link rel="stylesheet" media="all" href="/packs/css/flavours/glitch/common.css" />
 
-<script src="/packs/flavours/glitch/home.js"></script>
+<script src="/packs/js/flavours/glitch/home.js"></script>
 </head>
 <body class='app-body no-reduce-motion system-font'>
   <div class='app-holder' data-props='{&quot;locale&quot;:&quot;en&quot;}' id='mastodon'>

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 0a1a965cac47523b51d5c24c69c903134a526808..f8b56685b71f4b57a6e3fd8963ac6b0c98d818db 100644 (file)
--- 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"} ->