readme merge

README.md

@@ -33,16 +33,19 @@ Now you can visit [`localhost:4000`](http://localhost:4000) from your browser.
 - [x] Tracks
 - [x] Add metadata form step
 - [x] Embed at /embed/:track_id
+- [x] Embed at /embed/:track_id/private with signed_id
 - [ ] Paginate profile tracks /:username
 - [ ] Paginate /tracks
-- [ ] Filter public/private tracks (where: private: true)
+- [ ] Listening history
+- [x] Filter public/private tracks (where: private: true)
 - [ ] Give feedback on upload preprosessing
 - [ ] A logo for rauversion
-- [ ] Reposts
+- [x] Reposts
 - [ ] Albums
 - [ ] Playlists
-- [ ] Likes
-- [ ] Followers / Followings
+- [x] Likes
+- [x] Private preview on show
+- [x] Followers / Followings
 - [ ] Telemetry for dashboard
 - [ ] Centralized player, fixed (bottom) across navigation
 
@@ -79,4 +82,7 @@ Photo by <a href="https://unsplash.com/@schluditsch?utm_source=unsplash&utm_medi
 Photo by <a href="https://unsplash.com/@dancristianpaduret?utm_source=unsplash&utm_medium=referral&utm_content=creditCopyText">Dan-Cristian Pădureț</a> on <a href="https://unsplash.com/s/photos/music-studio?utm_source=unsplash&utm_medium=referral&utm_content=creditCopyText">Unsplash</a>
 
 Photo by <a href="https://unsplash.com/@grittzheng?utm_source=unsplash&utm_medium=referral&utm_content=creditCopyText">Gritt Zheng</a> on <a href="https://unsplash.com/s/photos/music-studio?utm_source=unsplash&utm_medium=referral&utm_content=creditCopyText">Unsplash</a>
+
+Photo by <a href="https://unsplash.com/@saiharishk?utm_source=unsplash&utm_medium=referral&utm_content=creditCopyText">Sai Harish</a> on <a href="https://unsplash.com/?utm_source=unsplash&utm_medium=referral&utm_content=creditCopyText">Unsplash</a>
+
 

lib/rauversion/accounts.ex

@@ -19,14 +19,27 @@ defmodule Rauversion.Accounts do
     {:ok, result}
   end
 
-  def broadcast_change({:error, result}, event) do
+  def broadcast_change({:error, result}, _event) do
     {:error, result}
   end
 
   def list_accounts(limit \\ 20) do
     User |> limit(^limit) |> Repo.all()
   end
 
+  def tracks_count(user) do
+    user
+    |> Ecto.assoc(:tracks)
+    |> Repo.aggregate(:count, :id)
+  end
+
+  def unfollowed_users(user) do
+    from(u in User,
+      left_join: m in assoc(u, :followings),
+      where: is_nil(m.id)
+    )
+  end
+
   ## Database getters
 
   @doc """
@@ -156,14 +169,10 @@ defmodule Rauversion.Accounts do
     # a = Rauversion.Accounts.get_user_by_username("michelson") |> Rauversion.Repo.preload(:avatar_blob)
     case user do
       nil ->
-        Rauversion.BlobUtils.fallback_image(
-          "/images/dan-cristian-padure-XKCH37dHt7w-unsplash.jpg"
-        )
+        Rauversion.BlobUtils.fallback_image("/images/sai-harish-kjNwiW4BjJE-unsplash-sqr.png")
 
       %{avatar_blob: nil} ->
-        Rauversion.BlobUtils.fallback_image(
-          "/images/dan-cristian-padure-XKCH37dHt7w-unsplash.jpg"
-        )
+        Rauversion.BlobUtils.fallback_image("/images/sai-harish-kjNwiW4BjJE-unsplash-sqr.png")
 
       %{avatar_blob: %ActiveStorage.Blob{} = avatar_blob} ->
         avatar_blob |> ActiveStorage.url()

lib/rauversion/accounts/user.ex

@@ -15,6 +15,8 @@ defmodule Rauversion.Accounts.User do
     field :confirmed_at, :naive_datetime
 
     has_many :tracks, Rauversion.Tracks.Track
+    has_many :followings, Rauversion.UserFollows.UserFollow, foreign_key: :following_id
+    has_many :followers, Rauversion.UserFollows.UserFollow, foreign_key: :follower_id
 
     has_one(:avatar_attachment, ActiveStorage.Attachment,
       where: [record_type: "User", name: "avatar"],
@@ -30,22 +32,21 @@ defmodule Rauversion.Accounts.User do
     "User"
   end
 
-  def profile_changeset(user, attrs, opts \\ []) do
+  def profile_changeset(user, attrs, _opts \\ []) do
     user
     |> validate_contact_fields(attrs)
     |> process_avatar(attrs)
   end
 
   def changeset(user, attrs, opts \\ []) do
-    user =
-      user
-      |> validate_contact_fields(attrs)
-      |> registration_changeset(attrs, opts)
+    user
+    |> validate_contact_fields(attrs)
+    |> registration_changeset(attrs, opts)
   end
 
   def process_avatar(user, attrs) do
     case attrs do
-      %{"avatar" => avatar} ->
+      %{"avatar" => _avatar} ->
         blob =
           ActiveStorage.Blob.create_and_upload!(
             %ActiveStorage.Blob{},

lib/rauversion/blob_utils.ex

@@ -2,7 +2,7 @@ defmodule Rauversion.BlobUtils do
   def fallback_image(url \\ nil) do
     RauversionWeb.Router.Helpers.static_path(
       RauversionWeb.Endpoint,
-      url || "/images/daniel-schludi-mbGxz7pt0jM-unsplash.jpg"
+      url || "/images/daniel-schludi-mbGxz7pt0jM-unsplash-sqr-s.png"
     )
   end
 

lib/rauversion/repo.ex

@@ -2,4 +2,6 @@ defmodule Rauversion.Repo do
   use Ecto.Repo,
     otp_app: :rauversion,
     adapter: Ecto.Adapters.Postgres
+
+  use Scrivener, page_size: 10
 end

lib/rauversion/reposts.ex

@@ -37,6 +37,14 @@ defmodule Rauversion.Reposts do
   """
   def get_repost!(id), do: Repo.get!(Repost, id)
 
+  def get_repost_by_user_and_track(user_id, track_id) do
+    Repost |> where(user_id: ^user_id) |> where(track_id: ^track_id) |> Repo.one()
+  end
+
+  def get_reposts_by_user_id(user_id) do
+    Repost |> where(user_id: ^user_id)
+  end
+
   @doc """
   Creates a repost.
 

lib/rauversion/services/peaks_generator.ex

@@ -21,7 +21,7 @@ defmodule Rauversion.Services.PeaksGenerator do
       ])
 
     # |> normalize
-    frames = Jason.decode!(output)["data"]
+    Jason.decode!(output)["data"]
 
     # audiowaveform -i ~/Desktop/patio/STE-098.mp3
 
@@ -40,15 +40,14 @@ defmodule Rauversion.Services.PeaksGenerator do
     IO.inspect(cmd)
     output = :os.cmd(cmd)
 
-    frames =
-      Jason.decode!(output)["frames"]
-      |> Enum.map(fn x ->
-        case get_in(x, ["tags", "lavfi.astats.Overall.Peak_level"]) |> Float.parse() do
-          {f, _} -> f
-          _ -> nil
-        end
-      end)
-      |> normalize
+    Jason.decode!(output)["frames"]
+    |> Enum.map(fn x ->
+      case get_in(x, ["tags", "lavfi.astats.Overall.Peak_level"]) |> Float.parse() do
+        {f, _} -> f
+        _ -> nil
+      end
+    end)
+    |> normalize
   end
 
   def desired_pixels_per_second(desired_pixels, duration) do

lib/rauversion/track_likes.ex

@@ -0,0 +1,108 @@
+defmodule Rauversion.TrackLikes do
+  @moduledoc """
+  The TrackLikes context.
+  """
+
+  import Ecto.Query, warn: false
+  alias Rauversion.Repo
+
+  alias Rauversion.TrackLikes.TrackLike
+
+  @doc """
+  Returns the list of track_likes.
+
+  ## Examples
+
+      iex> list_track_likes()
+      [%TrackLike{}, ...]
+
+  """
+  def list_track_likes do
+    Repo.all(TrackLike)
+  end
+
+  @doc """
+  Gets a single track_like.
+
+  Raises `Ecto.NoResultsError` if the Track like does not exist.
+
+  ## Examples
+
+      iex> get_track_like!(123)
+      %TrackLike{}
+
+      iex> get_track_like!(456)
+      ** (Ecto.NoResultsError)
+
+  """
+  def get_track_like!(id), do: Repo.get!(TrackLike, id)
+
+  @doc """
+  Creates a track_like.
+
+  ## Examples
+
+      iex> create_track_like(%{field: value})
+      {:ok, %TrackLike{}}
+
+      iex> create_track_like(%{field: bad_value})
+      {:error, %Ecto.Changeset{}}
+
+  """
+  def create_track_like(attrs \\ %{}) do
+    %TrackLike{}
+    |> TrackLike.changeset(attrs)
+    |> Repo.insert()
+  end
+
+  @doc """
+  Updates a track_like.
+
+  ## Examples
+
+      iex> update_track_like(track_like, %{field: new_value})
+      {:ok, %TrackLike{}}
+
+      iex> update_track_like(track_like, %{field: bad_value})
+      {:error, %Ecto.Changeset{}}
+
+  """
+  def update_track_like(%TrackLike{} = track_like, attrs) do
+    track_like
+    |> TrackLike.changeset(attrs)
+    |> Repo.update()
+  end
+
+  @doc """
+  Deletes a track_like.
+
+  ## Examples
+
+      iex> delete_track_like(track_like)
+      {:ok, %TrackLike{}}
+
+      iex> delete_track_like(track_like)
+      {:error, %Ecto.Changeset{}}
+
+  """
+  def delete_track_like(%TrackLike{} = track_like) do
+    Repo.delete(track_like)
+  end
+
+  def get_like_by_user_and_track(user_id, track_id) do
+    TrackLike |> where(user_id: ^user_id) |> where(track_id: ^track_id) |> Repo.one()
+  end
+
+  @doc """
+  Returns an `%Ecto.Changeset{}` for tracking track_like changes.
+
+  ## Examples
+
+      iex> change_track_like(track_like)
+      %Ecto.Changeset{data: %TrackLike{}}
+
+  """
+  def change_track_like(%TrackLike{} = track_like, attrs \\ %{}) do
+    TrackLike.changeset(track_like, attrs)
+  end
+end

lib/rauversion/track_likes/track_like.ex

@@ -0,0 +1,21 @@
+defmodule Rauversion.TrackLikes.TrackLike do
+  use Ecto.Schema
+  import Ecto.Changeset
+
+  schema "track_likes" do
+    # field :user_id, :id
+    # field :track_id, :id
+
+    belongs_to :user, Rauversion.Accounts.User
+    belongs_to :track, Rauversion.Tracks.Track
+
+    timestamps()
+  end
+
+  @doc false
+  def changeset(track_like, attrs) do
+    track_like
+    |> cast(attrs, [:track_id, :user_id])
+    |> validate_required([:track_id, :user_id])
+  end
+end

lib/rauversion/tracks.ex

@@ -19,10 +19,21 @@ defmodule Rauversion.Tracks do
     {:ok, result}
   end
 
-  def broadcast_change({:error, result}, event) do
+  def broadcast_change({:error, result}, _event) do
     {:error, result}
   end
 
+  def signed_id(track) do
+    token = Phoenix.Token.sign(RauversionWeb.Endpoint, "user auth", track.id)
+  end
+
+  def find_by_signed_id!(token) do
+    case Phoenix.Token.verify(RauversionWeb.Endpoint, "user auth", token, max_age: 86400) do
+      {:ok, track_id} -> get_track!(track_id)
+      _ -> nil
+    end
+  end
+
   @doc """
   Returns the list of tracks.
 

lib/rauversion/tracks/track.ex

@@ -23,6 +23,9 @@ defmodule Rauversion.Tracks.Track do
     field :slug, TitleSlug.Type
     field :title, :string
 
+    has_many :track_playlists, Rauversion.TrackPlaylists.TrackPlaylist
+    has_many :playlists, through: [:track_playlists, :playlist]
+
     belongs_to(:user, Rauversion.Accounts.User)
 
     # original audio

lib/rauversion/tracks/track_metadata.ex

@@ -82,7 +82,7 @@ defmodule Rauversion.Tracks.TrackMetadata do
     # |> validate_prescence_url_if(["frame", "link", "url"])
   end
 
-  def form_definitions(type = "metadata") do
+  def form_definitions(_type = "metadata") do
     [
       %{
         name: :genre,
@@ -230,7 +230,7 @@ defmodule Rauversion.Tracks.TrackMetadata do
     ]
   end
 
-  def form_definitions(type = "common") do
+  def form_definitions(_type = "common") do
     [
       %{
         name: :attribution,
@@ -269,7 +269,7 @@ defmodule Rauversion.Tracks.TrackMetadata do
 
   # TODO: move this to another store / module
   def genres do
-    names = [
+    [
       "Alternative Rock",
       "Ambient",
       "Classical",