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

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

diff --git a/app/controllers/diary_entries_controller.rb b/app/controllers/diary_entries_controller.rb
index 8e6215dbd2726a8a8356cd71eaa9c90be91011c1..760c9a301248d5bba8ff9b03ca7540e2d31d875d 100644 (file)
--- a/app/controllers/diary_entries_controller.rb
+++ b/app/controllers/diary_entries_controller.rb
@@ -1,4 +1,7 @@
 class DiaryEntriesController < ApplicationController
 class DiaryEntriesController < ApplicationController

+  include UserMethods
+  include PaginationMethods
+

   layout "site", :except => :rss
 
   before_action :authorize_web
   layout "site", :except => :rss
 
   before_action :authorize_web


@@ -7,65 +10,74 @@ class DiaryEntriesController < ApplicationController
 
   authorize_resource
 
 
   authorize_resource
 

-  before_action :lookup_user, :only => [:show, :comments]
-  before_action :check_database_writable, :only => [:new, :create, :edit, :update, :comment, :hide, :hidecomment, :subscribe, :unsubscribe]
-  before_action :allow_thirdparty_images, :only => [:new, :create, :edit, :update, :index, :show, :comments]
+  before_action :lookup_user, :only => :show
+  before_action :check_database_writable, :only => [:new, :create, :edit, :update, :hide, :unhide, :subscribe, :unsubscribe]
+
+  allow_thirdparty_images :only => [:new, :create, :edit, :update, :index, :show]

 
   def index
     if params[:display_name]
       @user = User.active.find_by(:display_name => params[:display_name])
 
       if @user
 
   def index
     if params[:display_name]
       @user = User.active.find_by(:display_name => params[:display_name])
 
       if @user

-        @title = t "diary_entries.index.user_title", :user => @user.display_name
-        @entries = @user.diary_entries
+        @title = t ".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
       else
         render_unknown_user params[:display_name]
         return
       end
     elsif params[:friends]
       if current_user

-        @title = t "diary_entries.index.title_friends"
-        @entries = DiaryEntry.where(:user_id => current_user.friends)
+        @title = t ".title_friends"
+        entries = DiaryEntry.where(:user => current_user.friends)

       else
         require_user
         return
       end
     elsif params[:nearby]
       if current_user
       else
         require_user
         return
       end
     elsif params[:nearby]
       if current_user

-        @title = t "diary_entries.index.title_nearby"
-        @entries = DiaryEntry.where(:user_id => current_user.nearby)
+        @title = t ".title_nearby"
+        entries = DiaryEntry.where(:user => current_user.nearby)

       else
         require_user
         return
       end
     else
       else
         require_user
         return
       end
     else

-      @entries = DiaryEntry.joins(:user).where(:users => { :status => %w[active confirmed] })
+      entries = DiaryEntry.joins(:user).where(:users => { :status => %w[active confirmed] })

 
       if params[:language]
 
       if params[:language]

-        @title = t "diary_entries.index.in_language_title", :language => Language.find(params[:language]).english_name
-        @entries = @entries.where(:language_code => params[:language])
+        @title = t ".in_language_title", :language => Language.find(params[:language]).english_name
+        entries = entries.where(:language_code => params[:language])

       else
       else

-        @title = t "diary_entries.index.title"
+        candidate_codes = preferred_languages.flat_map(&:candidates).uniq.map(&:to_s)
+        @languages = Language.where(:code => candidate_codes).in_order_of(:code, candidate_codes)
+        @title = t ".title"

       end
     end
 
       end
     end
 

+    entries = entries.visible unless can? :unhide, DiaryEntry
+

     @params = params.permit(:display_name, :friends, :nearby, :language)
 
     @params = params.permit(:display_name, :friends, :nearby, :language)
 

-    @page = (params[:page] || 1).to_i
-    @page_size = 20
+    @entries, @newer_entries_id, @older_entries_id = get_page_items(entries, :includes => [:user, :language])

 
 

-    @entries = @entries.visible unless can? :unhide, DiaryEntry
-    @entries = @entries.order("created_at DESC")
-    @entries = @entries.offset((@page - 1) * @page_size)
-    @entries = @entries.limit(@page_size)
-    @entries = @entries.includes(:user, :language)
+    render :partial => "page" if turbo_frame_request_id == "pagination"

   end
 
   def show
   end
 
   def show

-    @entry = @user.diary_entries.visible.where(:id => params[:id]).first
+    entries = @user.diary_entries
+    entries = entries.visible unless can? :unhide, DiaryEntry
+    @entry = entries.find_by(:id => params[:id])

     if @entry
     if @entry

-      @title = t "diary_entries.show.title", :user => params[:display_name], :title => @entry.title
-      @comments = can?(:unhidecomment, DiaryEntry) ? @entry.comments : @entry.visible_comments
+      @title = t ".title", :user => params[:display_name], :title => @entry.title
+      @opengraph_properties = {
+        "og:title" => @entry.title,
+        "og:image" => @entry.body.image,
+        "og:image:alt" => @entry.body.image_alt,
+        "og:description" => @entry.body.description,
+        "article:published_time" => @entry.created_at.xmlschema
+      }
+      @comments = can?(:unhide, DiaryComment) ? @entry.comments : @entry.visible_comments

     else
       @title = t "diary_entries.no_such_entry.title", :id => params[:id]
       render :action => "no_such_entry", :status => :not_found
     else
       @title = t "diary_entries.no_such_entry.title", :id => params[:id]
       render :action => "no_such_entry", :status => :not_found


@@ -73,9 +85,9 @@ class DiaryEntriesController < ApplicationController
   end
 
   def new
   end
 
   def new

-    @title = t "diary_entries.new.title"
+    @title = t ".title"

 
 

-    default_lang = current_user.preferences.where(:k => "diary.default_language").first
+    default_lang = current_user.preferences.find_by(:k => "diary.default_language")

     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
     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


@@ -83,7 +95,7 @@ class DiaryEntriesController < ApplicationController
   end
 
   def edit
   end
 
   def edit

-    @title = t "diary_entries.edit.title"
+    @title = t ".title"

     @diary_entry = DiaryEntry.find(params[:id])
 
     redirect_to diary_entry_path(@diary_entry.user, @diary_entry) if current_user != @diary_entry.user
     @diary_entry = DiaryEntry.find(params[:id])
 
     redirect_to diary_entry_path(@diary_entry.user, @diary_entry) if current_user != @diary_entry.user


@@ -100,7 +112,7 @@ class DiaryEntriesController < ApplicationController
     @diary_entry.user = current_user
 
     if @diary_entry.save
     @diary_entry.user = current_user
 
     if @diary_entry.save

-      default_lang = current_user.preferences.where(:k => "diary.default_language").first
+      default_lang = current_user.preferences.find_by(:k => "diary.default_language")

       if default_lang
         default_lang.v = @diary_entry.language_code
         default_lang.save!
       if default_lang
         default_lang.v = @diary_entry.language_code
         default_lang.save!


@@ -121,7 +133,7 @@ class DiaryEntriesController < ApplicationController
     @title = t "diary_entries.edit.title"
     @diary_entry = DiaryEntry.find(params[:id])
 
     @title = t "diary_entries.edit.title"
     @diary_entry = DiaryEntry.find(params[:id])
 

-    if current_user != @diary_entry.user ||
+    if cannot?(:update, @diary_entry) ||

        (params[:diary_entry] && @diary_entry.update(entry_params))
       redirect_to diary_entry_path(@diary_entry.user, @diary_entry)
     else
        (params[:diary_entry] && @diary_entry.update(entry_params))
       redirect_to diary_entry_path(@diary_entry.user, @diary_entry)
     else


@@ -132,45 +144,26 @@ class DiaryEntriesController < ApplicationController
     render :action => "no_such_entry", :status => :not_found
   end
 
     render :action => "no_such_entry", :status => :not_found
   end
 

-  def comment
-    @entry = DiaryEntry.find(params[:id])
-    @comments = @entry.visible_comments
-    @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|
-        UserMailer.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
   def subscribe

-    diary_entry = DiaryEntry.find(params[:id])
+    @diary_entry = DiaryEntry.find(params[:id])

 
 

-    diary_entry.subscriptions.create(:user => current_user) unless diary_entry.subscribers.exists?(current_user.id)
+    if request.post?
+      @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)
+      redirect_to diary_entry_path(@diary_entry.user, @diary_entry)
+    end

   rescue ActiveRecord::RecordNotFound
     render :action => "no_such_entry", :status => :not_found
   end
 
   def unsubscribe
   rescue ActiveRecord::RecordNotFound
     render :action => "no_such_entry", :status => :not_found
   end
 
   def unsubscribe

-    diary_entry = DiaryEntry.find(params[:id])
+    @diary_entry = DiaryEntry.find(params[:id])

 
 

-    diary_entry.subscriptions.where(:user => current_user).delete_all if diary_entry.subscribers.exists?(current_user.id)
+    if request.post?
+      @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)
+      redirect_to diary_entry_path(@diary_entry.user, @diary_entry)
+    end

   rescue ActiveRecord::RecordNotFound
     render :action => "no_such_entry", :status => :not_found
   end
   rescue ActiveRecord::RecordNotFound
     render :action => "no_such_entry", :status => :not_found
   end


@@ -221,32 +214,6 @@ class DiaryEntriesController < ApplicationController
     redirect_to :action => "index", :display_name => entry.user.display_name
   end
 
     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 unhidecomment
-    comment = DiaryComment.find(params[:comment])
-    comment.update(:visible => true)
-    redirect_to diary_entry_path(comment.diary_entry.user, comment.diary_entry)
-  end
-
-  def comments
-    @title = t ".title", :user => @user.display_name
-
-    conditions = { :user_id => @user }
-
-    conditions[:visible] = true unless can? :unhidecomment, DiaryEntry
-
-    @comment_pages, @comments = paginate(:diary_comments,
-                                         :conditions => conditions,
-                                         :order => "created_at DESC",
-                                         :per_page => 20)
-    @page = (params[:page] || 1).to_i
-  end
-

   private
 
   ##
   private
 
   ##


@@ -257,12 +224,6 @@ class DiaryEntriesController < ApplicationController
     ActionController::Parameters.new.permit(:title, :body, :language_code, :latitude, :longitude)
   end
 
     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
   ##
   # decide on a location for the diary entry map
   def set_map_location


@@ -270,7 +231,7 @@ class DiaryEntriesController < ApplicationController
       @lon = @diary_entry.longitude
       @lat = @diary_entry.latitude
       @zoom = 12
       @lon = @diary_entry.longitude
       @lat = @diary_entry.latitude
       @zoom = 12

-    elsif current_user.home_lat.nil? || current_user.home_lon.nil?
+    elsif !current_user.home_location?

       @lon = params[:lon] || -0.1
       @lat = params[:lat] || 51.5
       @zoom = params[:zoom] || 4
       @lon = params[:lon] || -0.1
       @lat = params[:lat] || 51.5
       @zoom = params[:zoom] || 4