Merge pull request #270 from CaptainFact/chore/move-to-gravatar

Move from Adorable to Gravatar

Author: Betree

apps/cf/lib/accounts/accounts.ex

@@ -23,7 +23,7 @@ defmodule CF.Accounts do
   # 48 hours
   @request_validity 48 * 60 * 60
 
-  # Configure Fetching of user picture on adorable.io
+  # Configure Fetching of user picture on Gravatar
   @fetch_default_picture Application.get_env(:cf, :fetch_default_user_picture, true)
 
   # ---- User creation ----

apps/db/lib/db_schema/comment.ex

@@ -54,7 +54,9 @@ defmodule DB.Schema.Comment do
         inserted_at: u.inserted_at,
         picture_url: u.picture_url,
         achievements: u.achievements,
-        speaker_id: u.speaker_id
+        speaker_id: u.speaker_id,
+        # To create pictures with Gravatar
+        email: u.email
       }
     })
   end

apps/db/lib/db_type/user_picture.ex

@@ -7,6 +7,7 @@ defmodule DB.Type.UserPicture do
   use Arc.Ecto.Definition
 
   @versions [:thumb, :mini_thumb]
+
   # TODO  @extension_whitelist ~w(.jpg .jpeg .png)
 
   @doc """
@@ -37,17 +38,29 @@ defmodule DB.Type.UserPicture do
     "#{user_id}_#{Atom.to_string(version)}"
   end
 
-  # Use adorable.io as default profile picture provider
-  def default_url(:thumb, %{id: id}) do
-    "https://api.adorable.io/avatars/96/#{id}.png"
+  # Use Gravatar as default profile picture provider
+  def default_url(:thumb, %{email: email}) do
+    "https://gravatar.com/avatar/#{gravatar_hash(email)}.jpg?size=94&d=robohash"
   end
 
-  def default_url(:mini_thumb, %{id: id}) do
-    "https://api.adorable.io/avatars/24/#{id}.png"
+  def default_url(:mini_thumb, %{email: email}) do
+    "https://gravatar.com/avatar/#{gravatar_hash(email)}.jpg?size=24&d=robohash"
   end
 
   # Override the storage directory:
   def storage_dir(_, {_, _}) do
     "resources/users"
   end
+
+  defp gravatar_hash(email) do
+    email
+    |> String.trim()
+    |> String.downcase()
+    |> md5()
+    |> Base.encode16(case: :lower)
+  end
+
+  defp md5(str) do
+    :crypto.hash(:md5, str)
+  end
 end

apps/db/test/db_type/user_picture.ex

@@ -0,0 +1,15 @@
+defmodule DB.Type.UserPictureTest do
+  use DB.DataCase, async: true
+  doctest DB.Schema.User
+
+  import DB.Factory, only: [insert: 1, insert: 2]
+  alias DB.Schema.User
+
+  test "defaults to gravatar" do
+    user = insert(:user, picture_url: nil)
+    email_md5 = :crypto.hash(:md5, user.email) |> Base.encode16(case: :lower)
+
+    assert DB.Type.UserPicture.default_url(:thumb, user) ==
+             "https://gravatar.com/avatar/#{email_md5}.jpg?size=94&d=robohash"
+  end
+end