end
# Get any conditions that need to be applied
- notes = closed_condition(Note.scoped)
+ notes = closed_condition(Note.all)
# Check that the boundaries are valid
bbox.check_boundaries
##
# Create a new note
def create
+ # Check the ACLs
+ raise OSM::APIAccessDenied if Acl.no_note_comment(request.remote_ip)
+
# Check the arguments are sane
raise OSM::APIBadUserInput.new("No lat was given") unless params[:lat]
raise OSM::APIBadUserInput.new("No lon was given") unless params[:lon]
raise OSM::APIBadUserInput.new("No text was given") if params[:text].blank?
# Extract the arguments
- lon = params[:lon].to_f
- lat = params[:lat].to_f
+ lon = OSM.parse_float(params[:lon], OSM::APIBadUserInput, "lon was not a number")
+ lat = OSM.parse_float(params[:lat], OSM::APIBadUserInput, "lat was not a number")
comment = params[:text]
# Include in a transaction to ensure that there is always a note_comment for every note
##
# Add a comment to an existing note
def comment
+ # Check the ACLs
+ raise OSM::APIAccessDenied if Acl.no_note_comment(request.remote_ip)
+
# Check the arguments are sane
raise OSM::APIBadUserInput.new("No id was given") unless params[:id]
raise OSM::APIBadUserInput.new("No text was given") if params[:text].blank?
# Find the note and check it is valid
@note = Note.find_by_id(id)
raise OSM::APINotFoundError unless @note
- raise OSM::APIAlreadyDeletedError.new("note", @note.id) unless @note.visible?
- raise OSM::APINoteAlreadyOpenError.new(@note) unless @note.closed?
+ raise OSM::APIAlreadyDeletedError.new("note", @note.id) unless @note.visible? or @user.moderator?
+ raise OSM::APINoteAlreadyOpenError.new(@note) unless @note.closed? or not @note.visible?
# Reopen the note and add a comment
Note.transaction do
# Get a feed of recent notes and comments
def feed
# Get any conditions that need to be applied
- notes = closed_condition(Note.scoped)
+ notes = closed_condition(Note.all)
# Process any bbox
if params[:bbox]
@note.status = "hidden"
@note.save
- add_comment(@note, comment, "hidden")
+ add_comment(@note, comment, "hidden", false)
end
# Return a copy of the updated note
raise OSM::APIBadUserInput.new("No query string was given") unless params[:q]
# Get any conditions that need to be applied
- @notes = closed_condition(Note.scoped)
- @notes = @notes.joins(:comments).where("note_comments.body ~ ?", params[:q])
+ @notes = closed_condition(Note.all)
+ @notes = @notes.joins(:comments).where("to_tsvector('english', note_comments.body) @@ plainto_tsquery('english', ?)", params[:q])
# Find the notes we want to return
@notes = @notes.order("updated_at DESC").limit(result_limit).preload(:comments)
@description = t 'note.mine.subheading', :user => render_to_string(:partial => "user", :object => @this_user)
@page = (params[:page] || 1).to_i
@page_size = 10
- @notes = @this_user.notes.order("updated_at DESC, id").uniq.offset((@page - 1) * @page_size).limit(@page_size).preload(:comments => :author).all
+ @notes = @this_user.notes.order("updated_at DESC, id").uniq.offset((@page - 1) * @page_size).limit(@page_size).preload(:comments => :author).to_a
else
@title = t 'user.no_such_user.title'
@not_found_user = params[:display_name]
##
# Get the maximum number of results to return
def result_limit
- if params[:limit] and params[:limit].to_i > 0 and params[:limit].to_i < 10000
- params[:limit].to_i
+ if params[:limit]
+ if params[:limit].to_i > 0 and params[:limit].to_i <= 10000
+ params[:limit].to_i
+ else
+ raise OSM::APIBadUserInput.new("Note limit must be between 1 and 10000")
+ end
else
100
end
##
# Add a comment to a note
- def add_comment(note, text, event)
+ def add_comment(note, text, event, notify = true)
attributes = { :visible => true, :event => event, :body => text }
if @user
attributes[:author_ip] = request.remote_ip
end
- comment = note.comments.create(attributes, :without_protection => true)
+ comment = note.comments.create(attributes)
note.comments.map { |c| c.author }.uniq.each do |user|
- if user and user != @user
- Notifier.note_comment_notification(comment, user).deliver
+ if notify and user and user != @user
+ Notifier.note_comment_notification(comment, user).deliver_now
end
end
end