From b51ddddbeb48d39111b38adbdabaad6289a29d43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tao=20Bror=20Bojl=C3=A9n?= Date: Sat, 31 Aug 2019 20:03:29 +0100 Subject: [PATCH] display plain pleroma version string --- CHANGELOG.md | 2 ++ backend/lib/backend/crawler/crawlers/mastodon.ex | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dffc288..5451bee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed +- Display plain Pleroma version rather than the Mastodon-compatible string + ### Security ## [2.8.2 - 2019-08-31] diff --git a/backend/lib/backend/crawler/crawlers/mastodon.ex b/backend/lib/backend/crawler/crawlers/mastodon.ex index 68442b0..ed149f7 100644 --- a/backend/lib/backend/crawler/crawlers/mastodon.ex +++ b/backend/lib/backend/crawler/crawlers/mastodon.ex @@ -39,7 +39,7 @@ defmodule Backend.Crawler.Crawlers.Mastodon do user_count = get_in(instance, ["stats", "user_count"]) if is_above_user_threshold?(user_count) or has_opted_in?(domain) do - Map.merge(nodeinfo, crawl_large_instance(domain, instance)) + Map.merge(crawl_large_instance(domain, instance), nodeinfo) else ApiCrawler.get_default() |> Map.merge(nodeinfo)