From 0e608c98b21cb7ec07688e2fe5e7cd50b62e7fb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?marcin=20miko=C5=82ajczak?= Date: Sun, 28 Apr 2024 23:02:11 +0200 Subject: [PATCH] Rename project to pl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: marcin mikołajczak --- README.md | 2 +- app.json | 6 +++--- lib/pleroma/web/mastodon_api/views/instance_view.ex | 5 +---- lib/soapbox.ex | 5 ----- mix.exs | 4 ++-- .../mastodon_api/controllers/instance_controller_test.exs | 1 - 6 files changed, 7 insertions(+), 16 deletions(-) delete mode 100644 lib/soapbox.ex diff --git a/README.md b/README.md index efd2ef1419..fca76b758c 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -A fork of Pleroma/Rebased. More information soon. +`pl`. A fork of Pleroma/Rebased. More information soon. --- diff --git a/app.json b/app.json index b0b28b9db4..c612a3ee75 100644 --- a/app.json +++ b/app.json @@ -1,10 +1,10 @@ { - "name": "Rebased", - "description": "Rebased, the recommended backend for Soapbox written in Elixir.", + "name": "pl", + "description": "Federated social media software, a fork of Pleroma/Rebased", "keywords": [ "fediverse" ], - "website": "https://soapbox.pub", + "website": "https://github.com/mkljczk/pl", "dokku": { "plugins": [ "postgres" diff --git a/lib/pleroma/web/mastodon_api/views/instance_view.ex b/lib/pleroma/web/mastodon_api/views/instance_view.ex index 0e473c1a4f..cb65ad62e9 100644 --- a/lib/pleroma/web/mastodon_api/views/instance_view.ex +++ b/lib/pleroma/web/mastodon_api/views/instance_view.ex @@ -190,10 +190,7 @@ defp common_information(instance) do title: Keyword.get(instance, :name), version: "#{@mastodon_api_level} (compatible; #{Pleroma.Application.compat_version()})", languages: Keyword.get(instance, :languages, ["en"]), - rules: render(__MODULE__, "rules.json"), - soapbox: %{ - version: Soapbox.version() - } + rules: render(__MODULE__, "rules.json") } end diff --git a/lib/soapbox.ex b/lib/soapbox.ex deleted file mode 100644 index 88b597147d..0000000000 --- a/lib/soapbox.ex +++ /dev/null @@ -1,5 +0,0 @@ -defmodule Soapbox do - @version "3.0.0" - - def version, do: @version -end diff --git a/mix.exs b/mix.exs index b53c976eef..386cebaf06 100644 --- a/mix.exs +++ b/mix.exs @@ -1,12 +1,12 @@ defmodule Pleroma.Mixfile do use Mix.Project - @build_name "soapbox" + @build_name "pl" def project do [ app: :pleroma, - name: "Rebased", + name: "pl", compat_name: "Pleroma", version: version("2.6.52"), elixir: "~> 1.11", diff --git a/test/pleroma/web/mastodon_api/controllers/instance_controller_test.exs b/test/pleroma/web/mastodon_api/controllers/instance_controller_test.exs index 6eb7cdaf4d..cde7941282 100644 --- a/test/pleroma/web/mastodon_api/controllers/instance_controller_test.exs +++ b/test/pleroma/web/mastodon_api/controllers/instance_controller_test.exs @@ -58,7 +58,6 @@ test "get instance information", %{conn: conn} do assert result["pleroma"]["vapid_public_key"] assert result["pleroma"]["stats"]["mau"] == 0 assert result["pleroma"]["oauth_consumer_strategies"] == [] - assert result["soapbox"]["version"] =~ "." assert email == from_config_email assert thumbnail == from_config_thumbnail