class DiaryEntriesController < ApplicationController
+ include UserMethods
+ include PaginationMethods
+
layout "site", :except => :rss
before_action :authorize_web
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]
+
+ allow_thirdparty_images :only => [:new, :create, :edit, :update, :index, :show, :comments]
def index
if params[:display_name]
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
@title = t ".in_language_title", :language => Language.find(params[:language]).english_name
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 = if params[:before]
- entries.where("diary_entries.id < ?", params[:before]).order(:id => :desc)
- elsif params[:after]
- entries.where("diary_entries.id > ?", params[:after]).order(:id => :asc)
- else
- entries.order(:id => :desc)
- end
-
- @entries = @entries.limit(20)
- @entries = @entries.includes(:user, :language)
- @entries = @entries.sort.reverse
-
- @newer_entries = @entries.count.positive? && entries.exists?(["diary_entries.id > ?", @entries.first.id])
- @older_entries = @entries.count.positive? && entries.exists?(["diary_entries.id < ?", @entries.last.id])
+ @entries, @newer_entries_id, @older_entries_id = get_page_items(entries, :includes => [:user, :language])
end
def show
entries = @user.diary_entries
entries = entries.visible unless can? :unhide, DiaryEntry
- @entry = entries.where(:id => params[:id]).first
+ @entry = entries.find_by(:id => params[:id])
if @entry
@title = t ".title", :user => params[:display_name], :title => @entry.title
+ @og_image = @entry.body.image
@comments = can?(:unhidecomment, DiaryEntry) ? @entry.comments : @entry.visible_comments
else
@title = t "diary_entries.no_such_entry.title", :id => params[:id]
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!
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
def comments
@title = t ".title", :user => @user.display_name
- conditions = { :user_id => @user }
+ comments = DiaryComment.where(:user => @user)
+ comments = comments.visible unless can? :unhidecomment, DiaryEntry
- conditions[:visible] = true unless can? :unhidecomment, DiaryEntry
+ @params = params.permit(:display_name, :before, :after)
- @comment_pages, @comments = paginate(:diary_comments,
- :conditions => conditions,
- :order => "created_at DESC",
- :per_page => 20)
- @page = (params[:page] || 1).to_i
+ @comments, @newer_comments_id, @older_comments_id = get_page_items(comments, :includes => [:user])
end
private
@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