Luke made the remote_username stuff work

2 files changed, 12 insertions, 4 deletions

diff --git a/app/models/remote_username.rb b/app/models/remote_username.rb
index c2c3d20..8c1ce26 100644
--- a/app/models/remote_username.rb
+++ b/app/models/remote_username.rb
@@ -3,7 +3,11 @@ class RemoteUsername < ActiveRecord::Base
 	belongs_to :user
 
 	def value
-		JSON.parse(self.json_value)
+		begin
+			return JSON.parse(self.json_value)
+		rescue
+			return {}
+		end
 	end
 
 	def value=(v)
diff --git a/app/models/user.rb b/app/models/user.rb
index 138f73e..5c0b5b1 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -24,9 +24,13 @@ class User < ActiveRecord::Base
 	end
 
 	def find_remote_username(game)
-		obj = remote_username.where(:game => game)
-		if obj.nil? and not game.parent.nil?
-			return find_remote_username(game.parent)
+		obj = self.remote_usernames.where(:game => game).first
+		if obj.nil?
+			if game.parent.nil?
+				return nil
+			else
+				return find_remote_username(game.parent)
+			end
 		else
 			return obj.value
 		end