diff options
| author | kaniini <nenolod@gmail.com> | 2018-09-01 08:48:40 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-09-01 08:48:40 +0000 |
| commit | 95abc0eaaa3c78901b4ff61efb9168ce3576ff01 (patch) | |
| tree | 32863cd983a8d687ee7044e25d142d20ddff6ab3 /lib/pleroma/user.ex | |
| parent | d31bbb1cfe04ca6073a322bcf77239e7d4b79839 (diff) | |
| parent | 0c2a0e3551f26bff8fa6161356ddcefb791baccf (diff) | |
| download | pleroma-95abc0eaaa3c78901b4ff61efb9168ce3576ff01.tar.gz | |
Merge branch 'verify-credentials-default-scope' into 'develop'
Specify default scope in verify_credentials
See merge request pleroma/pleroma!317
Diffstat (limited to 'lib/pleroma/user.ex')
| -rw-r--r-- | lib/pleroma/user.ex | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index fca490cb1..64c69b209 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -68,7 +68,8 @@ defmodule Pleroma.User do following_count: length(user.following) - oneself, note_count: user.info["note_count"] || 0, follower_count: user.info["follower_count"] || 0, - locked: user.info["locked"] || false + locked: user.info["locked"] || false, + default_scope: user.info["default_scope"] || "public" } end |