Cachex.get!(:user_cache, key, fallback: fn(_) -> user_info(user) end)
end
+ def fetch_by_nickname(nickname) do
+ ap_try = ActivityPub.make_user_from_nickname(nickname)
+
+ case ap_try do
+ {:ok, user} -> {:ok, user}
+ _ -> OStatus.make_user(nickname)
+ end
+ end
+
def get_or_fetch_by_nickname(nickname) do
with %User{} = user <- get_by_nickname(nickname) do
user
else _e ->
with [_nick, _domain] <- String.split(nickname, "@"),
- {:ok, user} <- OStatus.make_user(nickname) do
+ {:ok, user} <- fetch_by_nickname(nickname) do
user
else _e -> nil
end
update_and_set_cache(cs)
end
- def get_notified_from_activity(%Activity{data: %{"to" => to}}) do
+ def get_notified_from_activity(%Activity{recipients: to}) do
query = from u in User,
where: u.ap_id in ^to,
where: u.local == true
Repo.all(query)
end
- def get_recipients_from_activity(%Activity{data: %{"to" => to}}) do
+ def get_recipients_from_activity(%Activity{recipients: to}) do
query = from u in User,
where: u.ap_id in ^to,
or_where: fragment("? \\\?| ?", u.following, ^to)
Repo.insert(cs, on_conflict: :replace_all, conflict_target: :nickname)
end
- def ap_enabled?(%User{info: %{"ap_enabled" => ap}}), do: ap
+ def ap_enabled?(%User{info: info}), do: info["ap_enabled"]
end