Commit 0e89ff0f authored by Robert Speicher's avatar Robert Speicher

Simplify `Note#upvote?` and `Note#downvote?`

parent 5d08a5a5
...@@ -449,16 +449,6 @@ class Note < ActiveRecord::Base ...@@ -449,16 +449,6 @@ class Note < ActiveRecord::Base
@discussion_id ||= Note.build_discussion_id(noteable_type, noteable_id || commit_id, line_code) @discussion_id ||= Note.build_discussion_id(noteable_type, noteable_id || commit_id, line_code)
end end
# Returns true if this is a downvote note,
# otherwise false is returned
def downvote?
votable? && (note.start_with?('-1') ||
note.start_with?(':-1:') ||
note.start_with?(':thumbsdown:') ||
note.start_with?(':thumbs_down_sign:')
)
end
def for_commit? def for_commit?
noteable_type == "Commit" noteable_type == "Commit"
end end
...@@ -500,14 +490,18 @@ class Note < ActiveRecord::Base ...@@ -500,14 +490,18 @@ class Note < ActiveRecord::Base
nil nil
end end
# Returns true if this is an upvote note, DOWNVOTES = %w(-1 :-1: :thumbsdown: :thumbs_down_sign:)
# otherwise false is returned
# Check if the note is a downvote
def downvote?
votable? && note.start_with?(*DOWNVOTES)
end
UPVOTES = %w(+1 :+1: :thumbsup: :thumbs_up_sign:)
# Check if the note is an upvote
def upvote? def upvote?
votable? && (note.start_with?('+1') || votable? && note.start_with?(*UPVOTES)
note.start_with?(':+1:') ||
note.start_with?(':thumbsup:') ||
note.start_with?(':thumbs_up_sign:')
)
end end
def superceded?(notes) def superceded?(notes)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment