Modified: trunk/app/models/user.rb (2099 => 2100)
--- trunk/app/models/user.rb 2009-02-12 21:33:35 UTC (rev 2099)
+++ trunk/app/models/user.rb 2009-02-12 21:49:42 UTC (rev 2100)
@@ -539,29 +539,6 @@
end
end
- def friend_recursive?(user_id)
- friend_r? user_id
- end
-
- # alias for friend_recursive?
- def friend!(user_id)
- friend_r? user_id
- end
-
- # alias for friend_recursive?
- def foaf?(user_id)
- friend_r? user_id
- end
-
- def friends_recursive
- friends_r_wrapper
- end
-
-# alias for friends_recursive
- def friends!
- friends_r_wrapper
- end
-
def email_confirmed?
not self.email_confirmed_at.blank? and not self.email.blank?
end
@@ -698,43 +675,10 @@
end
end
- def friend_r?(user_id, depth=0)
- unless depth > @@maxdepth
- return true if friend? user_id
-
- friends.each do |f|
- return true if f.friend_r? user_id, depth+1
- end
- end
-
- false
- end
-
- def friends_r_wrapper
- # removes circular references (friend(self, A) & friend(A, B) & friend(B, self) ==> friend(self, self))
- friends_r.collect { |u| u = (u.id.to_i == id.to_i) ? nil : u }.compact
- end
-
- def friends_r(depth=0)
- unless depth > @@maxdepth
- rtn = friends
-
- friends.each do |r|
- rtn = (rtn + r.friends_r(depth+1))
- end
-
- return rtn.uniq
- end
-
- []
- end
-
private
# clean string to remove spaces and force lowercase
def self.clean_string(string)
(string.downcase).gsub(" ","")
end
-
- @@maxdepth = 7 # maximum level of recursion for depth first search
end