diff --git a/app/controllers/dashboards_controller.rb b/app/controllers/dashboards_controller.rb index 8264212a9faa68803a545e9126ce50d2b6861f13..b04f7b59cd4f3f1425d6b6431fb8d8be0d70e4a3 100644 --- a/app/controllers/dashboards_controller.rb +++ b/app/controllers/dashboards_controller.rb @@ -1,18 +1,10 @@ class DashboardsController < ApplicationController - - before_filter :authenticate_user!, :except => :receive + before_filter :authenticate_user! include ApplicationHelper def index @posts = Post.paginate :page => params[:page], :order => 'created_at DESC' end - - def receive - puts "SOMEONE JUST SENT ME: #{params[:xml]}" - store_objects_from_xml params[:xml] - render :nothing => true - end - def warzombie render :nothing => true diff --git a/app/controllers/publics_controller.rb b/app/controllers/publics_controller.rb index 454b614ff1d286c83b739edebf3112eef87a4889..ed643b7368a744f126ca22e7749c04955a7a6486 100644 --- a/app/controllers/publics_controller.rb +++ b/app/controllers/publics_controller.rb @@ -22,4 +22,11 @@ class PublicsController < ApplicationController render :text => params['hub.challenge'], :status => 202 end end + + def receive + puts "SOMEONE JUST SENT ME: #{params[:xml]}" + store_objects_from_xml params[:xml] + render :nothing => true + end + end diff --git a/config/routes.rb b/config/routes.rb index 279d74984f4532c0ad6db12585940fc0cd03487b..b211cc7b23938bec7369e7240ff05246ee11a3e9 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -20,14 +20,16 @@ Diaspora::Application.routes.draw do |map| match 'login', :to => 'devise/sessions#new', :as => "new_user_session" match 'logout', :to => 'devise/sessions#destroy', :as => "destroy_user_session" #match 'signup', :to => 'devise/registrations#new', :as => "new_user_registration" - - resources :users - match 'receive', :to => 'dashboards#receive' - match 'hubbub', :to => 'publics#hubbub' - match '.well-known/host-meta', :to => 'publics#host_meta' - match 'webfinger', :to => 'publics#webfinger' - match 'hcard', :to => 'publics#hcard' + + + #public routes + match 'receive', :to => 'publics#receive' + match 'hubbub', :to => 'publics#hubbub' + match '.well-known/host-meta',:to => 'publics#host_meta' + match 'webfinger', :to => 'publics#webfinger' + match 'hcard', :to => 'publics#hcard' + + #root root :to => 'dashboards#index' - end