Better handling of the senders / channels listings.

app/assets/stylesheets/music_index.css

@@ -27,6 +27,11 @@ ul
   text-align: center;
 }
 
+.music_chan
+{
+  width: 10%
+}
+
 .music_title
 {
   width: 50%;

app/controllers/channels_controller.rb

+class ChannelsController < ApplicationController
+  def index_user
+    @users = Channel.all
+
+    respond_to do |format|
+      format.html
+    end
+  end
+
+  def show_user
+    @musics = Music.joins(:channel).where(playbot_chan: {sender_irc: params[:user]}).page params[:page]
+    respond_to do |format|
+      format.html
+    end
+  end
+
+  def show_channel
+    @musics = Music.joins(:channel).where(playbot_chan: {chan: "#"+params[:channel]}).page params[:page]
+    respond_to do |format|
+      format.html
+    end
+  end
+end

app/models/channel.rb

+class Channel < ActiveRecord::Base
+  self.table_name = "playbot_chan"
+
+  belongs_to :music
+end

app/models/music.rb

@@ -3,4 +3,5 @@ class Music < ActiveRecord::Base
   self.inheritance_column = "inheritance_type"
 
   has_many :tags, foreign_key: "id"
+  has_one :channel, primary_key: "id", foreign_key: "content"
 end

app/views/channels/show_channel.html.erb

+<div id="music_player"></div>
+
+<ul>
+  <% @musics.each do |music| %>
+    <li class="clickable_links" 
+        data-id="<%= music.id %>" 
+        data-player="<%= music.type %>" 
+        data-url="<%= 
+            if music.type == "youtube" 
+              track = music.url.sub(/.*v=/,'')
+            elsif music.type == "soundcloud"
+              begin
+                track = $soundcloud.get('/resolve', :url => music.url)
+                track.id 
+              rescue
+                "Link down"
+              end 
+            end %>">
+      <span class="music_id"><%= music.id %></span> 
+      <span class="music_chan">
+        <%= link_to(music.channel.chan,'/musics/channels/'+music.channel.chan.sub('#','')) %></span>
+      <span class="music_title"><%= music.title %></span>
+      <span class="music_tags"><%= music.tags.map{|t| t.tag}.join(", ") %></span>
+      <span class="music_sender"><%= music.channel.sender_irc %></span>
+    </li>
+  <% end %>
+</ul>
+<%= paginate @musics %>

app/views/channels/show_user.html.erb

+<div id="music_player"></div>
+
+<ul>
+  <% @musics.each do |music| %>
+    <li class="clickable_links" 
+        data-id="<%= music.id %>" 
+        data-player="<%= music.type %>" 
+        data-url="<%= 
+            if music.type == "youtube" 
+              track = music.url.sub(/.*v=/,'')
+            elsif music.type == "soundcloud"
+              begin
+                track = $soundcloud.get('/resolve', :url => music.url)
+                track.id 
+              rescue
+                "Link down"
+              end 
+            end %>">
+      <span class="music_id"><%= music.id %></span>
+      <span class="music_chan"><%= music.channel.chan %></span>
+      <span class="music_title"><%= music.title %></span>
+      <span class="music_tags"><%= music.tags.map{|t| t.tag}.join(", ") %></span>
+      <span class="music_sender"><%= music.channel.sender_irc %></span>
+    </li>
+  <% end %>
+</ul>
+<%= paginate @musics %>

app/views/musics/index.html.erb

@@ -17,9 +17,10 @@
               end 
             end %>">
       <span class="music_id"><%= music.id %></span>
+      <span class="music_chan"><%= music.channel.chan %></span>
       <span class="music_title"><%= music.title%></span>
       <span class="music_tags"><%= music.tags.map{|t| t.tag}.join(", ") %></span>
-      <span class="music_sender"><%= music.sender_irc %></span>
+      <span class="music_sender"><%= music.channel.sender_irc %></span>
     </li>
   <% end %>
 </ul>

config/routes.rb

@@ -55,6 +55,9 @@ Rails.application.routes.draw do
   #   end
   resources :musics
   resources :tags
+  resources :channels
 
   get '/musics/tags/:tag', to: "tags#show"
+  get '/musics/users/:user', to: "channels#show_user"
+  get '/musics/channels/:channel', to: "channels#show_channel"
 end