srxl/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Pull requests Activity

update mastofe paths (#95)

Browse source 
Reviewed-on: AkkomaGang/akkoma#95
This commit is contained in:
floatingghost 2022-07-20 20:13:50 +00:00
parent ab5bf7c020
commit 07ea4d73e1
5 changed files with 23 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -6,6 +6,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
## [Unreleased] ## [Unreleased]
### Fixed
- Updated mastoFE path, for the newer version
### Removed ### Removed
- Scrobbling support - Scrobbling support
- `/api/v1/pleroma/scrobble` - `/api/v1/pleroma/scrobble`

5
config/config.exs
View file

@ -710,6 +710,7 @@
config :pleroma, :frontends, config :pleroma, :frontends,
primary: %{"name" => "pleroma-fe", "ref" => "stable"}, primary: %{"name" => "pleroma-fe", "ref" => "stable"},
admin: %{"name" => "admin-fe", "ref" => "stable"}, admin: %{"name" => "admin-fe", "ref" => "stable"},
mastodon: %{"name" => "mastodon-fe", "ref" => "akkoma"},
swagger: %{ swagger: %{
"name" => "swagger-ui", "name" => "swagger-ui",
"ref" => "stable", "ref" => "stable",
@ -728,9 +729,9 @@
"mastodon-fe" => %{ "mastodon-fe" => %{
"name" => "mastodon-fe", "name" => "mastodon-fe",
"git" => "https://akkoma.dev/AkkomaGang/masto-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", "build_dir" => "distribution",
"ref" => "develop" "ref" => "akkoma"
}, },
"admin-fe" => %{ "admin-fe" => %{
"name" => "admin-fe", "name" => "admin-fe",

6
config/description.exs
View file

@ -2991,6 +2991,12 @@
description: "Admin frontend", description: "Admin frontend",
children: installed_frontend_options children: installed_frontend_options
}, },
%{
key: :mastodon,
type: :map,
description: "Mastodon frontend",
children: installed_frontend_options
},
%{ %{
key: :swagger, key: :swagger,
type: :map, type: :map,

22
lib/pleroma/web/templates/masto_fe/index.html.eex
View file

@ -11,22 +11,22 @@
<meta name="theme-color" content="<%= Config.get([:manifest, :theme_color]) %>" /> <meta name="theme-color" content="<%= Config.get([:manifest, :theme_color]) %>" />
<script crossorigin='anonymous' src="/packs/locales.js"></script> <script crossorigin='anonymous' src="/packs/js/locales.js"></script>
<script crossorigin='anonymous' src="/packs/locales/glitch/en.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/js/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/js/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/js/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/notifications.js'>
<script id='initial-state' type='application/json'><%= initial_state(@token, @user, @custom_emojis) %></script> <script id='initial-state' type='application/json'><%= initial_state(@token, @user, @custom_emojis) %></script>
<script src="/packs/core/common.js"></script> <script src="/packs/js/core/common.js"></script>
<link rel="stylesheet" media="all" href="/packs/core/common.css" /> <link rel="stylesheet" media="all" href="/packs/css/core/common.css" />
<script src="/packs/flavours/glitch/common.js"></script> <script src="/packs/js/flavours/glitch/common.js"></script>
<link rel="stylesheet" media="all" href="/packs/flavours/glitch/common.css" /> <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> </head>
<body class='app-body no-reduce-motion system-font'> <body class='app-body no-reduce-motion system-font'>
<div class='app-holder' data-props='{&quot;locale&quot;:&quot;en&quot;}' id='mastodon'> <div class='app-holder' data-props='{&quot;locale&quot;:&quot;en&quot;}' id='mastodon'>

2
test/pleroma/web/activity_pub/transmogrifier/audio_handling_test.exs
View file

@ -10,8 +10,6 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier.AudioHandlingTest do
alias Pleroma.Object alias Pleroma.Object
alias Pleroma.Web.ActivityPub.Transmogrifier alias Pleroma.Web.ActivityPub.Transmogrifier
import Pleroma.Factory
test "Funkwhale Audio object" do test "Funkwhale Audio object" do
Tesla.Mock.mock(fn Tesla.Mock.mock(fn
%{url: "https://channels.tests.funkwhale.audio/federation/actors/compositions"} -> %{url: "https://channels.tests.funkwhale.audio/federation/actors/compositions"} ->