diff --git a/docs/Pleroma-API.md b/docs/Pleroma-API.md
index e1448d3f045718e6097ced2b4c46e20e0897e118..379d3dbed9d997b257c57803df94d88bab63716c 100644
--- a/docs/Pleroma-API.md
+++ b/docs/Pleroma-API.md
@@ -94,3 +94,17 @@ Request parameters can be passed via [query strings](https://en.wikipedia.org/wi
## `/api/pleroma/admin/`…
See [Admin-API](Admin-API.md)
+
+## `/api/v1/pleroma/flavour/:flavour`
+* Method `POST`
+* Authentication: required
+* Response: JSON string. Returns the user flavour or the default one on success, otherwise returns `{"error": "error_msg"}`
+* Example response: "glitch"
+* Note: This is intended to be used only by mastofe
+
+## `/api/v1/pleroma/flavour`
+* Method `GET`
+* Authentication: required
+* Response: JSON string. Returns the user flavour or the default one.
+* Example response: "glitch"
+* Note: This is intended to be used only by mastofe
diff --git a/lib/pleroma/user/info.ex b/lib/pleroma/user/info.ex
index c59e74c4507937725848dce84c42550307e55727..9099d7fbba20167bb94cc37563d3e85b57b2f07d 100644
--- a/lib/pleroma/user/info.ex
+++ b/lib/pleroma/user/info.ex
@@ -35,6 +35,7 @@ defmodule Pleroma.User.Info do
field(:hide_followers, :boolean, default: false)
field(:hide_follows, :boolean, default: false)
field(:pinned_activities, {:array, :string}, default: [])
+ field(:flavour, :string, default: nil)
# Found in the wild
# ap_id -> Where is this used?
@@ -187,6 +188,14 @@ defmodule Pleroma.User.Info do
|> validate_required([:settings])
end
+ def mastodon_flavour_update(info, flavour) do
+ params = %{flavour: flavour}
+
+ info
+ |> cast(params, [:flavour])
+ |> validate_required([:flavour])
+ end
+
def set_source_data(info, source_data) do
params = %{source_data: source_data}
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
index f0bbe5b3f1e9a9ac5664cdc8244a53fedb33b2bc..e2715bd08ab2a4c1a32e88db6c6db3cec7dc6e38 100644
--- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
+++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
@@ -1051,6 +1051,8 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
accounts =
Map.put(%{}, user.id, AccountView.render("account.json", %{user: user, for: user}))
+ flavour = get_user_flavour(user)
+
initial_state =
%{
meta: %{
@@ -1135,7 +1137,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
conn
|> put_layout(false)
|> put_view(MastodonView)
- |> render("index.html", %{initial_state: initial_state})
+ |> render("index.html", %{initial_state: initial_state, flavour: flavour})
else
conn
|> redirect(to: "/web/login")
@@ -1157,6 +1159,43 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
end
end
+ @supported_flavours ["glitch", "vanilla"]
+
+ def set_flavour(%{assigns: %{user: user}} = conn, %{"flavour" => flavour} = _params)
+ when flavour in @supported_flavours do
+ flavour_cng = User.Info.mastodon_flavour_update(user.info, flavour)
+
+ with changeset <- Ecto.Changeset.change(user),
+ changeset <- Ecto.Changeset.put_embed(changeset, :info, flavour_cng),
+ {:ok, user} <- User.update_and_set_cache(changeset),
+ flavour <- user.info.flavour do
+ json(conn, flavour)
+ else
+ e ->
+ conn
+ |> put_resp_content_type("application/json")
+ |> send_resp(500, Jason.encode!(%{"error" => inspect(e)}))
+ end
+ end
+
+ def set_flavour(conn, _params) do
+ conn
+ |> put_status(400)
+ |> json(%{error: "Unsupported flavour"})
+ end
+
+ def get_flavour(%{assigns: %{user: user}} = conn, _params) do
+ json(conn, get_user_flavour(user))
+ end
+
+ defp get_user_flavour(%User{info: %{flavour: flavour}}) when flavour in @supported_flavours do
+ flavour
+ end
+
+ defp get_user_flavour(_) do
+ "glitch"
+ end
+
def login(conn, %{"code" => code}) do
with {:ok, app} <- get_or_make_app(),
%Authorization{} = auth <- Repo.get_by(Authorization, token: code, app_id: app.id),
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index d66a1c2a136b2d60eec02d900e747a5d90b99790..664f93c1c798d7318f93aed7b233a61c2a02cd3c 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -236,6 +236,9 @@ defmodule Pleroma.Web.Router do
get("/suggestions", MastodonAPIController, :suggestions)
get("/endorsements", MastodonAPIController, :empty_array)
+
+ post("/pleroma/flavour/:flavour", MastodonAPIController, :set_flavour)
+ get("/pleroma/flavour", MastodonAPIController, :get_flavour)
end
scope "/api/web", Pleroma.Web.MastodonAPI do
diff --git a/lib/pleroma/web/templates/mastodon_api/mastodon/index.html.eex b/lib/pleroma/web/templates/mastodon_api/mastodon/index.html.eex
index 9a725e4207e576cd0b18790f0f9476959284b593..5659c78280695530a52750f9dd5a05216273811d 100644
--- a/lib/pleroma/web/templates/mastodon_api/mastodon/index.html.eex
+++ b/lib/pleroma/web/templates/mastodon_api/mastodon/index.html.eex
@@ -8,7 +8,7 @@
</title>
<link rel="icon" type="image/png" href="/favicon.png"/>
<script crossorigin='anonymous' src="/packs/locales.js"></script>
-<script crossorigin='anonymous' src="/packs/locales/glitch/en.js"></script>
+<script crossorigin='anonymous' src="/packs/locales/<%= @flavour %>/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'>
@@ -19,10 +19,10 @@
<script src="/packs/core/common.js"></script>
<link rel="stylesheet" media="all" href="/packs/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/flavours/<%= @flavour %>/common.js"></script>
+<link rel="stylesheet" media="all" href="/packs/flavours/<%= @flavour %>/common.css" />
-<script src="/packs/flavours/glitch/home.js"></script>
+<script src="/packs/flavours/<%= @flavour %>/home.js"></script>
</head>
<body class='app-body no-reduce-motion system-font'>
<div class='app-holder' data-props='{"locale":"en"}' id='mastodon'>
diff --git a/test/web/mastodon_api/mastodon_api_controller_test.exs b/test/web/mastodon_api/mastodon_api_controller_test.exs
index 7749c5ded228fa37f9fe7222df5c591d7a32b45e..e43bc4508e9e3a9c6d0357afd0910ee444b33958 100644
--- a/test/web/mastodon_api/mastodon_api_controller_test.exs
+++ b/test/web/mastodon_api/mastodon_api_controller_test.exs
@@ -1792,4 +1792,29 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
|> json_response(200)
end
end
+
+ test "flavours switching (Pleroma Extension)", %{conn: conn} do
+ user = insert(:user)
+
+ get_old_flavour =
+ conn
+ |> assign(:user, user)
+ |> get("/api/v1/pleroma/flavour")
+
+ assert "glitch" == json_response(get_old_flavour, 200)
+
+ set_flavour =
+ conn
+ |> assign(:user, user)
+ |> post("/api/v1/pleroma/flavour/vanilla")
+
+ assert "vanilla" == json_response(set_flavour, 200)
+
+ get_new_flavour =
+ conn
+ |> assign(:user, user)
+ |> post("/api/v1/pleroma/flavour/vanilla")
+
+ assert json_response(set_flavour, 200) == json_response(get_new_flavour, 200)
+ end
end