aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/user.ex
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2019-01-17 03:19:55 +0000
committerkaniini <nenolod@gmail.com>2019-01-17 03:19:55 +0000
commitce2efd1ee25d6e06c4bc5c0d97aad7b84c7c6874 (patch)
tree7e2b60fb3be7407f756cd5e0a24660c6f2b18e65 /lib/pleroma/user.ex
parent608cc65d43277016a22500771360598775a3df1e (diff)
parent943324b66158d1bd2449894ec41bc544c56058a7 (diff)
downloadpleroma-ce2efd1ee25d6e06c4bc5c0d97aad7b84c7c6874.tar.gz
Merge branch 'resilient-user-view-2' into 'develop'
MastoAPI: Don't break on missing users. See merge request pleroma/pleroma!675
Diffstat (limited to 'lib/pleroma/user.ex')
-rw-r--r--lib/pleroma/user.ex10
1 files changed, 10 insertions, 0 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 681280539..a52e536d3 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -1040,4 +1040,14 @@ defmodule Pleroma.User do
@strict_local_nickname_regex
end
end
+
+ def error_user(ap_id) do
+ %User{
+ name: ap_id,
+ ap_id: ap_id,
+ info: %User.Info{},
+ nickname: "erroruser@example.com",
+ inserted_at: NaiveDateTime.utc_now()
+ }
+ end
end