Merge remote-tracking branch 'upstream/pull/2009'

[rails.git] / app / controllers / diary_entry_controller.rb

diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb
index afa2722a1f99ab82782eb2610468dd0e49d0bb09..70cb1654da8c9d0f7adf5b56197d482d81d54626 100644 (file)
--- a/app/controllers/diary_entry_controller.rb
+++ b/app/controllers/diary_entry_controller.rb
@@ -1,20 +1,266 @@
 class DiaryEntryController < ApplicationController
 class DiaryEntryController < ApplicationController

-  layout 'site'
-  
-  before_filter :authorize_web, :only => [:new]
-  before_filter :require_user, :only => [:new]
+  layout "site", :except => :rss
+
+  before_action :authorize_web
+  before_action :set_locale
+
+  authorize_resource
+
+  before_action :lookup_user, :only => [:show, :comments]
+  before_action :check_database_readable
+  before_action :check_database_writable, :only => [:new, :edit, :comment, :hide, :hidecomment, :subscribe, :unsubscribe]
+  before_action :allow_thirdparty_images, :only => [:new, :edit, :index, :show, :comments]

 
   def new
 
   def new

-    if params[:diary_entry]     
-      @entry = DiaryEntry.new(@params[:diary_entry])
-      @entry.user = @user
-      if @entry.save 
-        redirect_to :controller => 'user', :action => 'diary', :display_name => @user.display_name 
+    @title = t "diary_entry.new.title"
+
+    if request.post?
+      @diary_entry = DiaryEntry.new(entry_params)
+      @diary_entry.user = current_user
+
+      if @diary_entry.save
+        default_lang = current_user.preferences.where(:k => "diary.default_language").first
+        if default_lang
+          default_lang.v = @diary_entry.language_code
+          default_lang.save!
+        else
+          current_user.preferences.create(:k => "diary.default_language", :v => @diary_entry.language_code)
+        end
+
+        # Subscribe user to diary comments
+        @diary_entry.subscriptions.create(:user => current_user)
+
+        redirect_to :action => "index", :display_name => current_user.display_name
+      else
+        render :action => "edit"
+      end
+    else
+      default_lang = current_user.preferences.where(:k => "diary.default_language").first
+      lang_code = default_lang ? default_lang.v : current_user.preferred_language
+      @diary_entry = DiaryEntry.new(entry_params.merge(:language_code => lang_code))
+      set_map_location
+      render :action => "edit"
+    end
+  end
+
+  def edit
+    @title = t "diary_entry.edit.title"
+    @diary_entry = DiaryEntry.find(params[:id])
+
+    if current_user != @diary_entry.user
+      redirect_to diary_entry_path(@diary_entry.user, @diary_entry)
+    elsif params[:diary_entry] && @diary_entry.update(entry_params)
+      redirect_to diary_entry_path(@diary_entry.user, @diary_entry)
+    end
+
+    set_map_location
+  rescue ActiveRecord::RecordNotFound
+    render :action => "no_such_entry", :status => :not_found
+  end
+
+  def comment
+    @entry = DiaryEntry.find(params[:id])
+    @diary_comment = @entry.comments.build(comment_params)
+    @diary_comment.user = current_user
+    if @diary_comment.save
+
+      # Notify current subscribers of the new comment
+      @entry.subscribers.visible.each do |user|
+        Notifier.diary_comment_notification(@diary_comment, user).deliver_later if current_user != user
+      end
+
+      # Add the commenter to the subscribers if necessary
+      @entry.subscriptions.create(:user => current_user) unless @entry.subscribers.exists?(current_user.id)
+
+      redirect_to diary_entry_path(@entry.user, @entry)
+    else
+      render :action => "show"
+    end
+  rescue ActiveRecord::RecordNotFound
+    render :action => "no_such_entry", :status => :not_found
+  end
+
+  def subscribe
+    diary_entry = DiaryEntry.find(params[:id])
+
+    diary_entry.subscriptions.create(:user => current_user) unless diary_entry.subscribers.exists?(current_user.id)
+
+    redirect_to diary_entry_path(diary_entry.user, diary_entry)
+  rescue ActiveRecord::RecordNotFound
+    render :action => "no_such_entry", :status => :not_found
+  end
+
+  def unsubscribe
+    diary_entry = DiaryEntry.find(params[:id])
+
+    diary_entry.subscriptions.where(:user => current_user).delete_all if diary_entry.subscribers.exists?(current_user.id)
+
+    redirect_to diary_entry_path(diary_entry.user, diary_entry)
+  rescue ActiveRecord::RecordNotFound
+    render :action => "no_such_entry", :status => :not_found
+  end
+
+  def index
+    if params[:display_name]
+      @user = User.active.find_by(:display_name => params[:display_name])
+
+      if @user
+        @title = t "diary_entry.index.user_title", :user => @user.display_name
+        @entries = @user.diary_entries
+      else
+        render_unknown_user params[:display_name]
+        return
+      end
+    elsif params[:friends]
+      if current_user
+        @title = t "diary_entry.index.title_friends"
+        @entries = DiaryEntry.where(:user_id => current_user.friend_users)
+      else
+        require_user
+        return

       end
       end

+    elsif params[:nearby]
+      if current_user
+        @title = t "diary_entry.index.title_nearby"
+        @entries = DiaryEntry.where(:user_id => current_user.nearby)
+      else
+        require_user
+        return
+      end
+    else
+      @entries = DiaryEntry.joins(:user).where(:users => { :status => %w[active confirmed] })
+
+      if params[:language]
+        @title = t "diary_entry.index.in_language_title", :language => Language.find(params[:language]).english_name
+        @entries = @entries.where(:language_code => params[:language])
+      else
+        @title = t "diary_entry.index.title"
+      end
+    end
+
+    @params = params.permit(:display_name, :friends, :nearby, :language)
+
+    @page = (params[:page] || 1).to_i
+    @page_size = 20
+
+    @entries = @entries.visible
+    @entries = @entries.order("created_at DESC")
+    @entries = @entries.offset((@page - 1) * @page_size)
+    @entries = @entries.limit(@page_size)
+    @entries = @entries.includes(:user, :language)
+  end
+
+  def rss
+    if params[:display_name]
+      user = User.active.find_by(:display_name => params[:display_name])
+
+      if user
+        @entries = user.diary_entries
+        @title = t("diary_entry.feed.user.title", :user => user.display_name)
+        @description = t("diary_entry.feed.user.description", :user => user.display_name)
+        @link = url_for :controller => "diary_entry", :action => "index", :display_name => user.display_name, :host => SERVER_URL, :protocol => SERVER_PROTOCOL
+      else
+        head :not_found
+        return
+      end
+    else
+      @entries = DiaryEntry.joins(:user).where(:users => { :status => %w[active confirmed] })
+
+      if params[:language]
+        @entries = @entries.where(:language_code => params[:language])
+        @title = t("diary_entry.feed.language.title", :language_name => Language.find(params[:language]).english_name)
+        @description = t("diary_entry.feed.language.description", :language_name => Language.find(params[:language]).english_name)
+        @link = url_for :controller => "diary_entry", :action => "index", :language => params[:language], :host => SERVER_URL, :protocol => SERVER_PROTOCOL
+      else
+        @title = t("diary_entry.feed.all.title")
+        @description = t("diary_entry.feed.all.description")
+        @link = url_for :controller => "diary_entry", :action => "index", :host => SERVER_URL, :protocol => SERVER_PROTOCOL
+      end
+    end
+
+    @entries = @entries.visible.includes(:user).order("created_at DESC").limit(20)
+  end
+
+  def show
+    @entry = @user.diary_entries.visible.where(:id => params[:id]).first
+    if @entry
+      @title = t "diary_entry.show.title", :user => params[:display_name], :title => @entry.title
+    else
+      @title = t "diary_entry.no_such_entry.title", :id => params[:id]
+      render :action => "no_such_entry", :status => :not_found

     end
   end
     end
   end

-  
-  def list
-    @entries=DiaryEntry.find(:all, :order => 'created_at DESC', :limit=>20)
+
+  def hide
+    entry = DiaryEntry.find(params[:id])
+    entry.update(:visible => false)
+    redirect_to :action => "index", :display_name => entry.user.display_name
+  end
+
+  def hidecomment
+    comment = DiaryComment.find(params[:comment])
+    comment.update(:visible => false)
+    redirect_to diary_entry_path(comment.diary_entry.user, comment.diary_entry)
+  end
+
+  def comments
+    @comment_pages, @comments = paginate(:diary_comments,
+                                         :conditions => {
+                                           :user_id => @user,
+                                           :visible => true
+                                         },
+                                         :order => "created_at DESC",
+                                         :per_page => 20)
+    @page = (params[:page] || 1).to_i
+  end
+
+  private
+
+  # This is required because, being a default-deny system, cancancan
+  # _cannot_ tell you the reason you were denied access; and so
+  # the "nice" feedback presenting next steps can't be gleaned from
+  # the exception
+  ##
+  # for the hide actions, require that the user is a administrator, or fill out
+  # a helpful error message and return them to the user page.
+  def deny_access(exception)
+    if current_user && exception.action.in?([:hide, :hidecomment])
+      flash[:error] = t("users.filter.not_an_administrator")
+      redirect_to :action => "show"
+    else
+      super
+    end
+  end
+
+  ##
+  # return permitted diary entry parameters
+  def entry_params
+    params.require(:diary_entry).permit(:title, :body, :language_code, :latitude, :longitude)
+  rescue ActionController::ParameterMissing
+    ActionController::Parameters.new.permit(:title, :body, :language_code, :latitude, :longitude)
+  end
+
+  ##
+  # return permitted diary comment parameters
+  def comment_params
+    params.require(:diary_comment).permit(:body)
+  end
+
+  ##
+  # decide on a location for the diary entry map
+  def set_map_location
+    if @diary_entry.latitude && @diary_entry.longitude
+      @lon = @diary_entry.longitude
+      @lat = @diary_entry.latitude
+      @zoom = 12
+    elsif current_user.home_lat.nil? || current_user.home_lon.nil?
+      @lon = params[:lon] || -0.1
+      @lat = params[:lat] || 51.5
+      @zoom = params[:zoom] || 4
+    else
+      @lon = current_user.home_lon
+      @lat = current_user.home_lat
+      @zoom = 12
+    end

   end
 end
   end
 end