before_action :authorize_web, :only => [:mine]
before_action :setup_user_auth, :only => [:create, :comment, :show]
before_action :authorize, :only => [:close, :reopen, :destroy]
- before_action :require_moderator, :only => [:destroy]
+ before_action :api_deny_access_handler, :except => [:mine]
+
+ authorize_resource
+
before_action :check_api_writable, :only => [:create, :comment, :close, :reopen, :destroy]
- before_action :require_allow_write_notes, :only => [:create, :comment, :close, :reopen, :destroy]
before_action :set_locale
around_action :api_call_handle_error, :api_call_timeout
# Create a new note
def create
# Check the ACLs
- raise OSM::APIAccessDenied if Acl.no_note_comment(request.remote_ip)
+ raise OSM::APIAccessDenied if current_user.nil? && Acl.no_note_comment(request.remote_ip)
# Check the arguments are sane
raise OSM::APIBadUserInput, "No lat was given" unless params[:lat]
# Add a comment to an existing note
def comment
# Check the ACLs
- raise OSM::APIAccessDenied if Acl.no_note_comment(request.remote_ip)
+ raise OSM::APIAccessDenied if current_user.nil? && Acl.no_note_comment(request.remote_ip)
# Check the arguments are sane
raise OSM::APIBadUserInput, "No id was given" unless params[:id]
# Find the note and check it is valid
@note = Note.find(params[:id])
raise OSM::APINotFoundError unless @note
- raise OSM::APIAlreadyDeletedError.new("note", @note.id) unless @note.visible? || (current_user && current_user.moderator?)
+ raise OSM::APIAlreadyDeletedError.new("note", @note.id) unless @note.visible? || current_user&.moderator?
# Render the result
respond_to do |format|
##
# Return a list of notes matching a given string
def search
- # Filter either by the name or the id of the user
- if params[:display_name]
- @user = User.find_by(:display_name => params[:display_name])
- elsif params[:id]
- @user = User.find_by(:id => params[:id])
- end
+ # Get the initial set of notes
+ @notes = closed_condition(Note.all)
- if @user
- @notes = @user.notes
- @notes = closed_condition(@notes)
- elsif params[:display_name] || params[:id]
- # Return an error message because obviously the user could not be found
- raise OSM::APIBadUserInput, "The user could not be found"
- else
- @notes = closed_condition(Note.all)
- end
+ # Add any user filter
+ if params[:display_name] || params[:user]
+ if params[:display_name]
+ @user = User.find_by(:display_name => params[:display_name])
- # Filter by a given string
- if params[:q]
- # TODO: why doesn't this work if we want to filter the notes of a given user?
- if !params[:display_name] && !params[:id]
- @notes = @notes.joins(:comments).where("to_tsvector('english', note_comments.body) @@ plainto_tsquery('english', ?)", params[:q])
+ raise OSM::APIBadUserInput, "User #{params[:display_name]} not known" unless @user
+ else
+ @user = User.find_by(:id => params[:user])
+
+ raise OSM::APIBadUserInput, "User #{params[:user]} not known" unless @user
end
+
+ @notes = @notes.joins(:comments).where(:note_comments => { :author_id => @user })
end
- # Filter by a given start date and an optional end date
+ # Add any text filter
+ @notes = @notes.joins(:comments).where("to_tsvector('english', note_comments.body) @@ plainto_tsquery('english', ?)", params[:q]) if params[:q]
+
+ # Add any date filter
if params[:from]
- from = DateTime.parse(params[:from])
- if params[:to]
- to = DateTime.parse(params[:to])
- else
- to = DateTime.now
+ begin
+ from = Time.parse(params[:from])
+ rescue ArgumentError
+ raise OSM::APIBadUserInput, "Date #{params[:from]} is in a wrong format"
end
- if from && to
- @notes = @notes.where("(created_at > '#{from}' AND created_at < '#{to}')")
- else
- raise OSM::APIBadUserInput, "The date is in a wrong format"
+ begin
+ to = if params[:to]
+ Time.parse(params[:to])
+ else
+ Time.now
+ end
+ rescue ArgumentError
+ raise OSM::APIBadUserInput, "Date #{params[:to]} is in a wrong format"
end
+
+ @notes = @notes.where(:created_at => from..to)
end
# Find the notes we want to return
- @notes = @notes.order("updated_at DESC").distinct.limit(result_limit).preload(:comments)
+ @notes = @notes.order("updated_at DESC").limit(result_limit).preload(:comments)
# Render the result
respond_to do |format|
@page = (params[:page] || 1).to_i
@page_size = 10
@notes = @user.notes
- @notes = @notes.visible unless current_user && current_user.moderator?
+ @notes = @notes.visible unless current_user&.moderator?
@notes = @notes.order("updated_at DESC, id").distinct.offset((@page - 1) * @page_size).limit(@page_size).preload(:comments => :author).to_a
else
- @title = t "user.no_such_user.title"
+ @title = t "users.no_such_user.title"
@not_found_user = params[:display_name]
- render :template => "user/no_such_user", :status => :not_found
+ render :template => "users/no_such_user", :status => :not_found
end
end
end
# Get the maximum number of results to return
def result_limit
if params[:limit]
- if params[:limit].to_i > 0 && params[:limit].to_i <= 10000
+ if params[:limit].to_i.positive? && params[:limit].to_i <= 10000
params[:limit].to_i
else
raise OSM::APIBadUserInput, "Note limit must be between 1 and 10000"
7
end
- if closed_since < 0
- notes.where("status != 'hidden'")
- elsif closed_since > 0
- notes.where("(status = 'open' OR (status = 'closed' AND closed_at > '#{Time.now - closed_since.days}'))")
+ if closed_since.negative?
+ notes.where.not(:status => "hidden")
+ elsif closed_since.positive?
+ notes.where(:status => "open")
+ .or(notes.where(:status => "closed")
+ .where(notes.arel_table[:closed_at].gt(Time.now - closed_since.days)))
else
- notes.where("status = 'open'")
+ notes.where(:status => "open")
end
end
comment = note.comments.create!(attributes)
note.comments.map(&:author).uniq.each do |user|
- Notifier.note_comment_notification(comment, user).deliver_now if notify && user && user != current_user && user.visible?
+ Notifier.note_comment_notification(comment, user).deliver_later if notify && user && user != current_user && user.visible?
end
end
end
projects / rails.git / blobdiff