projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/1601-add-new-meta-tag' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
views
/
account_view.ex
diff --git
a/lib/pleroma/web/mastodon_api/views/account_view.ex
b/lib/pleroma/web/mastodon_api/views/account_view.ex
index 0efcabc019b420f56c7b3a0e7f7c9f844b1ea07f..c482bba6498d4c806e37a9b540663c84eb8506b6 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/views/account_view.ex
+++ b/
lib/pleroma/web/mastodon_api/views/account_view.ex
@@
-43,7
+43,7
@@
defmodule Pleroma.Web.MastodonAPI.AccountView do
id: to_string(user.id),
acct: user.nickname,
username: username_from_nickname(user.nickname),
id: to_string(user.id),
acct: user.nickname,
username: username_from_nickname(user.nickname),
- url:
User.profile_url(user)
+ url:
user.uri || user.ap_id
}
end
}
end
@@
-207,7
+207,7
@@
defmodule Pleroma.Web.MastodonAPI.AccountView do
following_count: following_count,
statuses_count: user.note_count,
note: user.bio || "",
following_count: following_count,
statuses_count: user.note_count,
note: user.bio || "",
- url:
User.profile_url(user)
,
+ url:
user.uri || user.ap_id
,
avatar: image,
avatar_static: image,
header: header,
avatar: image,
avatar_static: image,
header: header,