From 8558f966358a2463d61b76119e91e8ec9a09af8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tao=20Bror=20Bojl=C3=A9n?= Date: Tue, 15 Oct 2019 13:20:10 +0100 Subject: [PATCH] Revert "display plain pleroma version string" This reverts commit b51ddddbeb48d39111b38adbdabaad6289a29d43. --- CHANGELOG.md | 1 - backend/lib/backend/crawler/crawlers/mastodon.ex | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 714887f..28b0545 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,7 +19,6 @@ 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 - Fixed some unsuccessful crawls being saved without their errors ### Security diff --git a/backend/lib/backend/crawler/crawlers/mastodon.ex b/backend/lib/backend/crawler/crawlers/mastodon.ex index ed149f7..68442b0 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(crawl_large_instance(domain, instance), nodeinfo) + Map.merge(nodeinfo, crawl_large_instance(domain, instance)) else ApiCrawler.get_default() |> Map.merge(nodeinfo)