Merge branch 'master' of github.com:magnolia-fan/BeatHaven

Conflicts:
	config/routes.rb

app/controllers/artist_controller.rb

@@ -3,15 +3,15 @@ class ArtistController < ApplicationController
   require 'open-uri'
 	def view
 	  # Dirty auth block START
-    unless request.session['session_id'].nil? or MainController.logged_in request.session['session_id']
-      redirect_to '/login'
-      return
-    else
-      if request.session['session_id'].nil?
-        redirect_to '/login'
-        return
-      end
-    end
+    # unless request.session['session_id'].nil? or MainController.logged_in request.session['session_id']
+    #   redirect_to '/login'
+    #   return
+    # else
+    #   if request.session['session_id'].nil?
+    #     redirect_to '/login'
+    #     return
+    #   end
+    # end
     # Dirty auth block END
   	if params[:name].nil?
 	  	name = ''

app/controllers/main_controller.rb

@@ -1,23 +1,7 @@
 class MainController < ApplicationController
   def index
-	  # Dirty auth block START
-    unless request.session['session_id'].nil? or MainController.logged_in request.session['session_id']
-      redirect_to '/login'
-    else
-      if request.session['session_id'].nil?
-        redirect_to '/login'
-      end
-    end
-    # Dirty auth block END
-  end
-  def self.logged_in session_id
-    user_data = User.collection.find({session_key: Digest::SHA256.hexdigest(session_id)}).first
-    unless user_data.nil?
-      user_data['lastvisit'] = Time.now()
-      User.collection.update({_id: user_data._id}, user_data.attributes)
-      return true
-    else
-      return false
-    end
+    # unless User.logged_in
+    #   redirect_to '/login'
+    # end
   end
 end

app/controllers/track_controller.rb

@@ -3,18 +3,14 @@ class TrackController < ApplicationController
   require 'uri'
   def listen
     pp track = Track.where(:id => params[:id].to_i).first
-    pp release = Release.where(:id => track.release_id).first
-    pp album = Album.where(:id => release.album_id).first
-    pp artist = Artist.where(:id => album.artist_id).first
     
-    data = Vkontakte.get(artist.name, track.name, (track.length / 1000).round)
-
+    data = Vkontakte.get(track.artist_name, track.name, (track.length / 1000).round)
+    # data = Vkontakte.get(1, 1, 1)
     url = URI.parse(data['url'])
     nginx_url = '/proxy-stream/no-token/' << data['remixsid'] << '/' << '5' << '/' << url.host << url.path
-    #render :inline => nginx_url
+
     headers['Content-Type'] = 'audio/mpeg'
     headers['X-Accel-Redirect'] = nginx_url
-    headers['Connection'] = 'close'
     render :nothing => true
   end
 end

app/controllers/user_controller.rb

@@ -1,4 +1,8 @@
 class UserController < ApplicationController
+  
+  @@invite_salt = 'Gouranga gives a fuck?!'
+  @@email_regex = /^[a-zA-Z][\w\.-]*[a-zA-Z0-9]@[a-zA-Z0-9][\w\.-]*[a-zA-Z0-9]\.[a-zA-Z][a-zA-Z\.]*[a-zA-Z]$/
+  
   def login
     @hide_player = 1
     unless params[:email].nil? or params[:password].nil?
@@ -28,7 +32,7 @@ class UserController < ApplicationController
     @hide_player = 1
     data = Invite.where(:email => params[:invite_email], :code => params[:invite_code]).first
     unless data.nil?
-      if  params[:email].match(/\A[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,4}\z/).nil? or
+      if  params[:email].match(@@email_regex).nil? or
           params[:password].length < 6 or
           params[:password] != params[:password_c]
         redirect_to '/'
@@ -49,4 +53,40 @@ class UserController < ApplicationController
       redirect_to '/login'
     end
   end
+  
+  def update
+    @data = User.collection.find({session_key: Digest::SHA256.hexdigest(request.session['session_id'])}).first
+    unless @data.nil?
+      if request.request_method == 'POST'
+        if params[:name]
+          @data.name = params[:name]
+        end
+        User.collection.update({_id: @data._id}, @data.attributes)
+      end
+    else
+      render :json => 'wtf?'
+    end
+  end
+  
+  def invite
+    @data = User.collection.find({session_key: Digest::SHA256.hexdigest(request.session['session_id'])}).first
+    unless @data.nil?
+      if @data.invites > 0
+        pp 1
+        if request.request_method == 'POST'
+          unless params[:email].nil?
+            if params[:email].match(@@email_regex)
+              Invite.collection.insert({email: params[:email], code: Digest::SHA256.hexdigest(params[:email] << @@invite_salt), referer: @data._id})
+              @data.invites -= 1
+              User.collection.update({_id: @data._id}, @data.attributes)
+              @ok = true
+            end
+          end
+        end
+        pp 2
+      else
+        render :json => 'wtf?'
+      end
+    end
+  end
 end