diff options
author | Alex Gleason <alex@alexgleason.me> | 2020-07-29 12:45:32 -0500 |
---|---|---|
committer | Alex Gleason <alex@alexgleason.me> | 2020-07-29 12:45:32 -0500 |
commit | 026a51cb27e250a55a03c509390390e8141dc290 (patch) | |
tree | e7615417e96539c6f93f64d7b9b9bff1ceac3c7f | |
parent | d8a01c94321e90832fea5a26fbb2a2f5be1c5ba5 (diff) | |
download | pleroma-026a51cb27e250a55a03c509390390e8141dc290.tar.gz |
:show_reactions, add CHANGELOG.md, refactor test
-rw-r--r-- | CHANGELOG.md | 1 | ||||
-rw-r--r-- | test/web/pleroma_api/controllers/emoji_reaction_controller_test.exs | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 7d5256600..7ce208b0f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -69,6 +69,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Added Pleroma.Upload.Filter.Exiftool as an alternate EXIF stripping mechanism targeting GPS/location metadata. - "By approval" registrations mode. - Configuration: Added `:welcome` settings for the welcome message to newly registered users. +- Ability to hide favourites and emoji reactions in the API with `[:instance, :show_reactions]` config. <details> <summary>API Changes</summary> diff --git a/test/web/pleroma_api/controllers/emoji_reaction_controller_test.exs b/test/web/pleroma_api/controllers/emoji_reaction_controller_test.exs index 8af2ee03f..3deab30d1 100644 --- a/test/web/pleroma_api/controllers/emoji_reaction_controller_test.exs +++ b/test/web/pleroma_api/controllers/emoji_reaction_controller_test.exs @@ -13,8 +13,6 @@ defmodule Pleroma.Web.PleromaAPI.EmojiReactionControllerTest do import Pleroma.Factory - setup do: clear_config([:instance, :show_reactions]) - test "PUT /api/v1/pleroma/statuses/:id/reactions/:emoji", %{conn: conn} do user = insert(:user) other_user = insert(:user) @@ -109,7 +107,7 @@ defmodule Pleroma.Web.PleromaAPI.EmojiReactionControllerTest do end test "GET /api/v1/pleroma/statuses/:id/reactions with :show_reactions disabled", %{conn: conn} do - Pleroma.Config.put([:instance, :show_reactions], false) + clear_config([:instance, :show_reactions], false) user = insert(:user) other_user = insert(:user) |