class DiaryEntriesController < ApplicationController
+ include UserMethods
+ include PaginationMethods
+
layout "site", :except => :rss
before_action :authorize_web
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]
if @user
@title = t ".user_title", :user => @user.display_name
- @entries = @user.diary_entries
+ entries = @user.diary_entries
else
render_unknown_user params[:display_name]
return
elsif params[:friends]
if current_user
@title = t ".title_friends"
- @entries = DiaryEntry.where(:user_id => current_user.friends)
+ entries = DiaryEntry.where(:user => current_user.friends)
else
require_user
return
elsif params[:nearby]
if current_user
@title = t ".title_nearby"
- @entries = DiaryEntry.where(:user_id => current_user.nearby)
+ entries = DiaryEntry.where(:user => current_user.nearby)
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]
@title = t ".in_language_title", :language => Language.find(params[:language]).english_name
- @entries = @entries.where(:language_code => params[:language])
+ entries = entries.where(:language_code => params[:language])
else
+ 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
- @params = params.permit(:display_name, :friends, :nearby, :language)
+ entries = entries.visible unless can? :unhide, DiaryEntry
- @page = (params[:page] || 1).to_i
- @page_size = 20
+ @params = params.permit(:display_name, :friends, :nearby, :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)
+ @entries, @newer_entries_id, @older_entries_id = get_page_items(entries, :includes => [:user, :language])
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
@title = t ".title", :user => params[:display_name], :title => @entry.title
- @comments = can?(:unhidecomment, DiaryEntry) ? @entry.comments : @entry.visible_comments
+ @og_image = @entry.body.image
+ @og_image_alt = @entry.body.image_alt
+ @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
def new
@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
@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!
@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
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
- 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
- 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
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
##
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
@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
projects / rails.git / blobdiff