projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into ostatus
[akkoma]
/
lib
/
pleroma
/
web
/
twitter_api
/
representers
/
user_representer.ex
diff --git
a/lib/pleroma/web/twitter_api/representers/user_representer.ex
b/lib/pleroma/web/twitter_api/representers/user_representer.ex
index d8f98488e7cd817f33b09ce0b139ecc0d6d0d180..ab7d6d353a7476357703f18631f53d3418ef043a 100644
(file)
--- a/
lib/pleroma/web/twitter_api/representers/user_representer.ex
+++ b/
lib/pleroma/web/twitter_api/representers/user_representer.ex
@@
-4,15
+4,15
@@
defmodule Pleroma.Web.TwitterAPI.Representers.UserRepresenter do
alias Pleroma.User
def to_map(user, opts) do
alias Pleroma.User
def to_map(user, opts) do
-
- image = "https://placehold.it/48x48"
-
+ image = User.avatar_url(user)
following = if opts[:for] do
User.following?(opts[:for], user)
else
false
end
following = if opts[:for] do
User.following?(opts[:for], user)
else
false
end
+ user_info = User.user_info(user)
+
map = %{
"id" => user.id,
"name" => user.name,
map = %{
"id" => user.id,
"name" => user.name,
@@
-21,9
+21,9
@@
defmodule Pleroma.Web.TwitterAPI.Representers.UserRepresenter do
"following" => following,
# Fake fields
"favourites_count" => 0,
"following" => following,
# Fake fields
"favourites_count" => 0,
- "statuses_count" =>
0
,
- "friends_count" =>
0
,
- "followers_count" =>
0
,
+ "statuses_count" =>
user_info[:note_count]
,
+ "friends_count" =>
user_info[:following_count]
,
+ "followers_count" =>
user_info[:follower_count]
,
"profile_image_url" => image,
"profile_image_url_https" => image,
"profile_image_url_profile_size" => image,
"profile_image_url" => image,
"profile_image_url_https" => image,
"profile_image_url_profile_size" => image,