diff options
| author | kaniini <nenolod@gmail.com> | 2018-09-22 03:30:00 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-09-22 03:30:00 +0000 |
| commit | 7e12ef0ab0cccfde8d46c48f5cc6e4a27f9291c3 (patch) | |
| tree | b4f46ed27466dcceaa012cd5f42e4702f383b6c7 | |
| parent | ec6a7799d8e6b912007b25df9398375f93728b4d (diff) | |
| parent | 56577d8b48fcb8046bf559e683f11045b3e98f51 (diff) | |
| download | pleroma-7e12ef0ab0cccfde8d46c48f5cc6e4a27f9291c3.tar.gz | |
Merge branch 'followup/twitterapi-no-rich-text-field' into 'develop'
twitter api: add no_rich_text option to userview for account prefs
See merge request pleroma/pleroma!355
| -rw-r--r-- | lib/pleroma/web/twitter_api/views/user_view.ex | 3 | ||||
| -rw-r--r-- | test/web/twitter_api/views/user_view_test.exs | 12 |
2 files changed, 10 insertions, 5 deletions
diff --git a/lib/pleroma/web/twitter_api/views/user_view.ex b/lib/pleroma/web/twitter_api/views/user_view.ex index cec9e11a0..cfbaef4c9 100644 --- a/lib/pleroma/web/twitter_api/views/user_view.ex +++ b/lib/pleroma/web/twitter_api/views/user_view.ex @@ -64,7 +64,8 @@ defmodule Pleroma.Web.TwitterAPI.UserView do "background_image" => image_url(user.info["background"]) |> MediaProxy.url(), "is_local" => user.local, "locked" => !!user.info["locked"], - "default_scope" => user.info["default_scope"] || "public" + "default_scope" => user.info["default_scope"] || "public", + "no_rich_text" => user.info["no_rich_text"] || false } if assigns[:token] do diff --git a/test/web/twitter_api/views/user_view_test.exs b/test/web/twitter_api/views/user_view_test.exs index 7075a2370..50687f450 100644 --- a/test/web/twitter_api/views/user_view_test.exs +++ b/test/web/twitter_api/views/user_view_test.exs @@ -87,7 +87,8 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do "background_image" => nil, "is_local" => true, "locked" => false, - "default_scope" => "public" + "default_scope" => "public", + "no_rich_text" => false } assert represented == UserView.render("show.json", %{user: user}) @@ -126,7 +127,8 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do "background_image" => nil, "is_local" => true, "locked" => false, - "default_scope" => "public" + "default_scope" => "public", + "no_rich_text" => false } assert represented == UserView.render("show.json", %{user: user, for: follower}) @@ -166,7 +168,8 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do "background_image" => nil, "is_local" => true, "locked" => false, - "default_scope" => "public" + "default_scope" => "public", + "no_rich_text" => false } assert represented == UserView.render("show.json", %{user: follower, for: user}) @@ -213,7 +216,8 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do "background_image" => nil, "is_local" => true, "locked" => false, - "default_scope" => "public" + "default_scope" => "public", + "no_rich_text" => false } blocker = Repo.get(User, blocker.id) |