X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fuser.ex;h=ed85447fe3007d816700cce16367f3b7a9acbc93;hb=ce1eef9c989f0387168b48f6f61a4c1f84b3f5b5;hp=c77704db0c9b0184f78d072548b719a079b58cb5;hpb=ddaaab115e7d9834448b31c18cfffa1e31c43705;p=akkoma

diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index c77704db0..ed85447fe 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -9,6 +9,8 @@ defmodule Pleroma.User do
     field :name, :string
     field :nickname, :string
     field :password_hash, :string
+    field :password, :string, virtual: true
+    field :password_confirmation, :string, virtual: true
     field :following, { :array, :string }, default: []
     field :ap_id, :string
 
@@ -29,6 +31,27 @@ defmodule Pleroma.User do
     |> validate_required([:following])
   end
 
+  def register_changeset(struct, params \\ %{}) do
+    changeset = struct
+    |> cast(params, [:bio, :email, :name, :nickname, :password, :password_confirmation])
+    |> validate_required([:bio, :email, :name, :nickname, :password, :password_confirmation])
+    |> validate_confirmation(:password)
+    |> unique_constraint(:email)
+    |> unique_constraint(:nickname)
+
+    if changeset.valid? do
+      hashed = Comeonin.Pbkdf2.hashpwsalt(changeset.changes[:password])
+      ap_id = User.ap_id(%User{nickname: changeset.changes[:nickname]})
+      followers = User.ap_followers(%User{nickname: changeset.changes[:nickname]})
+      changeset
+      |> put_change(:password_hash, hashed)
+      |> put_change(:ap_id, ap_id)
+      |> put_change(:following, [followers])
+    else
+      changeset
+    end
+  end
+
   def follow(%User{} = follower, %User{} = followed) do
     ap_followers = User.ap_followers(followed)
     following = [ap_followers | follower.following]
@@ -52,4 +75,17 @@ defmodule Pleroma.User do
   def following?(%User{} = follower, %User{} = followed) do
     Enum.member?(follower.following, User.ap_followers(followed))
   end
+
+  def get_cached_by_ap_id(ap_id) do
+    ConCache.get_or_store(:users, "ap_id:#{ap_id}", fn() ->
+      # Return false so the cache will store it.
+      Repo.get_by(User, ap_id: ap_id) || false
+    end)
+  end
+
+  def get_cached_by_nickname(nickname) do
+    ConCache.get_or_store(:users, "nickname:#{nickname}", fn() ->
+      Repo.get_by(User, nickname: nickname) || false
+    end)
+  end
 end