alias Comeonin.Pbkdf2
alias Pleroma.Web.{OStatus, Websub}
alias Pleroma.Web.ActivityPub.ActivityPub
+ alias Pleroma.Web.ActivityPub.Utils
schema "users" do
field :bio, :string
@email_regex ~r/^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/
def remote_user_creation(params) do
- changeset = %User{}
- |> cast(params, [:bio, :name, :ap_id, :nickname, :info])
- |> validate_required([:bio, :name, :ap_id, :nickname])
+ %User{}
+ |> cast(params, [:bio, :name, :ap_id, :nickname, :info, :avatar])
+ |> validate_required([:name, :ap_id, :nickname])
|> unique_constraint(:nickname)
|> validate_format(:nickname, @email_regex)
|> validate_length(:bio, max: 1000)
|> validate_length(:name, max: 100)
+ |> put_change(:local, false)
end
def register_changeset(struct, params \\ %{}) do
{:error,
"Could not follow user: #{followed.nickname} is already on your list."}
else
- if !followed.local do
+ if !followed.local && follower.local do
Websub.subscribe(follower, followed)
end
{ :ok, follower } = follower
|> follow_changeset(%{following: following})
|> Repo.update
- { :ok, follower, ActivityPub.fetch_latest_follow(follower, followed)}
+ { :ok, follower, Utils.fetch_latest_follow(follower, followed)}
else
{:error, "Not subscribed!"}
end
Enum.member?(follower.following, User.ap_followers(followed))
end
+ def get_by_ap_id(ap_id) do
+ Repo.get_by(User, ap_id: ap_id)
+ end
+
def get_cached_by_ap_id(ap_id) do
key = "ap_id:#{ap_id}"
- Cachex.get!(:user_cache, key, fallback: fn(_) -> Repo.get_by(User, ap_id: ap_id) end)
+ Cachex.get!(:user_cache, key, fallback: fn(_) -> get_by_ap_id(ap_id) end)
end
def get_cached_by_nickname(nickname) do