Merge branch 'master' of https://github.com/hotsh/rstat.us

toypaj · Mar 24, 2011 · d7b86c5 · d7b86c5
2 parents 3b2d25f + 178031f
commit d7b86c5
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/rstatus.rb b/rstatus.rb
@@ -311,6 +311,10 @@ class Rstatus < Sinatra::Base
     if current_user.following? feed_url
       # which means it exists
       feed = Feed.first(:remote_url => feed_url)
+      if feed.nil? and feed_url[0] == "/"
+        feed_id = feed_url[/^\/feeds\/(.+)$/,1]
+        feed = Feed.first(:id => feed_id)
+      end
 
       flash[:notice] = "You're already following #{feed.author.username}."
       if feed.local