X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fuser.ex;h=65925caed0aa3eee377b8264bbaa277e269b4bf9;hb=6cf7c132282e612514af992c6dea0b03ee5b678d;hp=418522172ddc5019cd92183cf0bb1e219b489af5;hpb=ef5033d7a7f744607235e974c7beb96b014c2b61;p=akkoma

diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 418522172..65925caed 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -1,7 +1,8 @@
 defmodule Pleroma.User do
   use Ecto.Schema
-  import Ecto.Changeset
-  alias Pleroma.{Repo, User}
+  import Ecto.{Changeset, Query}
+  alias Pleroma.{Repo, User, Object, Web}
+  alias Comeonin.Pbkdf2
 
   schema "users" do
     field :bio, :string
@@ -11,15 +12,22 @@ defmodule Pleroma.User do
     field :password_hash, :string
     field :password, :string, virtual: true
     field :password_confirmation, :string, virtual: true
-    field :following, { :array, :string }, default: []
+    field :following, {:array, :string}, default: []
     field :ap_id, :string
     field :avatar, :map
 
     timestamps()
   end
 
+  def avatar_url(user) do
+    case user.avatar do
+      %{"url" => [%{"href" => href} | _]} -> href
+      _ -> "https://placehold.it/48x48"
+    end
+  end
+
   def ap_id(%User{nickname: nickname}) do
-    "#{Pleroma.Web.base_url}/users/#{nickname}"
+    "#{Web.base_url}/users/#{nickname}"
   end
 
   def ap_followers(%User{} = user) do
@@ -32,6 +40,22 @@ defmodule Pleroma.User do
     |> validate_required([:following])
   end
 
+  def user_info(%User{} = user) do
+    note_count_query = from a in Object,
+      where: fragment("? @> ?", a.data, ^%{actor: user.ap_id, type: "Note"}),
+      select: count(a.id)
+
+    follower_count_query = from u in User,
+      where: fragment("? @> ?", u.following, ^User.ap_followers(user)),
+      select: count(u.id)
+
+    %{
+      following_count: length(user.following),
+      note_count: Repo.one(note_count_query),
+      follower_count: Repo.one(follower_count_query)
+    }
+  end
+
   def register_changeset(struct, params \\ %{}) do
     changeset = struct
     |> cast(params, [:bio, :email, :name, :nickname, :password, :password_confirmation])
@@ -39,9 +63,10 @@ defmodule Pleroma.User do
     |> validate_confirmation(:password)
     |> unique_constraint(:email)
     |> unique_constraint(:nickname)
+    |> validate_format(:nickname, ~r/^[a-zA-Z\d]+$/)
 
     if changeset.valid? do
-      hashed = Comeonin.Pbkdf2.hashpwsalt(changeset.changes[:password])
+      hashed = 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
@@ -56,8 +81,8 @@ defmodule Pleroma.User do
   def follow(%User{} = follower, %User{} = followed) do
     ap_followers = User.ap_followers(followed)
     if following?(follower, followed) do
-      { :error,
-        "Could not follow user: #{followed.nickname} is already on your list." }
+      {:error,
+       "Could not follow user: #{followed.nickname} is already on your list."}
     else
       following = [ap_followers | follower.following]
       |> Enum.uniq
@@ -78,7 +103,7 @@ defmodule Pleroma.User do
       |> follow_changeset(%{following: following})
       |> Repo.update
     else
-      { :error, "Not subscribed!" }
+      {:error, "Not subscribed!"}
     end
   end
 
@@ -87,15 +112,12 @@ defmodule Pleroma.User do
   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)
+    key = "ap_id:#{ap_id}"
+    Cachex.get!(:user_cache, key, fallback: fn(_) -> Repo.get_by(User, ap_id: ap_id) 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)
+    key = "nickname:#{nickname}"
+    Cachex.get!(:user_cache, key, fallback: fn(_) -> Repo.get_by(User, nickname: nickname) end)
   end
 end