summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2018-04-08 06:02:11 +0000
committerlambda <pleromagit@rogerbraun.net>2018-04-08 06:02:11 +0000
commit9998b4519da0a732d2a91ca067f4f849a0d37be6 (patch)
treef29460d280dad1d0e314b21b211c5717e575006c
parent9a2d3705c69ed4acd97d423013d29f8d5d608f94 (diff)
parent1857f403bea8d16f95a3b1ae46e07e2acd807c3c (diff)
downloadpleroma-9998b4519da0a732d2a91ca067f4f849a0d37be6.tar.gz
pleroma-9998b4519da0a732d2a91ca067f4f849a0d37be6.zip
Merge branch 'feature/mastodon-api-for-tootstream' into 'develop'
mastodon api emulation improvements for tootstream Closes #101 See merge request pleroma/pleroma!100
-rw-r--r--lib/pleroma/web/mastodon_api/mastodon_api_controller.ex3
-rw-r--r--lib/pleroma/web/router.ex1
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
index 97a618186..b00f1e15c 100644
--- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
+++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
@@ -102,13 +102,14 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
end
@instance Application.get_env(:pleroma, :instance)
+ @mastodon_api_level "2.3.3"
def masto_instance(conn, _params) do
response = %{
uri: Web.base_url(),
title: Keyword.get(@instance, :name),
description: "A Pleroma instance, an alternative fediverse server",
- version: Keyword.get(@instance, :version),
+ version: "#{@mastodon_api_level} (compatible; #{Keyword.get(@instance, :version)})",
email: Keyword.get(@instance, :email),
urls: %{
streaming_api: String.replace(Web.base_url(), ["http", "https"], "wss")
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index a33d03fc9..8ee27e63c 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -100,6 +100,7 @@ defmodule Pleroma.Web.Router do
get("/domain_blocks", MastodonAPIController, :empty_array)
get("/follow_requests", MastodonAPIController, :empty_array)
get("/mutes", MastodonAPIController, :empty_array)
+ get("/lists", MastodonAPIController, :empty_array)
get("/timelines/home", MastodonAPIController, :home_timeline)