diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2018-12-18 14:07:05 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2018-12-18 17:22:45 +0300 |
| commit | aed0f902871524ecc1db0d8c088ce5939e7c685a (patch) | |
| tree | 721be8fc2f057fcc8da719ed795dc311147a838b /lib | |
| parent | b86057cc7f45c79767ff5b83730c2c15ad6bb3bd (diff) | |
| download | pleroma-aed0f902871524ecc1db0d8c088ce5939e7c685a.tar.gz | |
[#114] Added `pleroma.confirmation_pending` to user views, adjusted view tests.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/views/account_view.ex | 1 | ||||
| -rw-r--r-- | lib/pleroma/web/twitter_api/views/user_view.ex | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/lib/pleroma/web/mastodon_api/views/account_view.ex b/lib/pleroma/web/mastodon_api/views/account_view.ex index ebcf9230b..50df88aca 100644 --- a/lib/pleroma/web/mastodon_api/views/account_view.ex +++ b/lib/pleroma/web/mastodon_api/views/account_view.ex @@ -62,6 +62,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do # Pleroma extension pleroma: %{ + confirmation_pending: user_info.confirmation_pending, tags: user.tags } } diff --git a/lib/pleroma/web/twitter_api/views/user_view.ex b/lib/pleroma/web/twitter_api/views/user_view.ex index 8a88d72b1..45b893eda 100644 --- a/lib/pleroma/web/twitter_api/views/user_view.ex +++ b/lib/pleroma/web/twitter_api/views/user_view.ex @@ -81,6 +81,7 @@ defmodule Pleroma.Web.TwitterAPI.UserView do # Pleroma extension "pleroma" => %{ + "confirmation_pending" => user_info.confirmation_pending, "tags" => user.tags } } |