ref: now using a helper method to check if a message is accepted

Author: ckruse

app/controllers/messages/accept_controller.rb

@@ -12,7 +12,7 @@ def accept
     Message.transaction do
       @message.flags_will_change!
 
-      if @message.flags['accepted'] == 'yes'
+      if @message.accepted?
         @message.flags.delete('accepted')
         audit(@message, 'accepted-no')
       else
@@ -26,11 +26,11 @@ def accept
 
     rescore_message(@message)
 
-    type = @message.flags['accepted'] == 'yes' ? 'accepted' : 'unaccepted'
+    type = @message.accepted? ? 'accepted' : 'unaccepted'
     VoteBadgeDistributorJob.perform_later(nil, @message.message_id, type)
 
     respond_to do |format|
-      msg = if @message.flags['accepted'] == 'yes'
+      msg = if @message.accepted?
               t('messages.accepted')
             else
               t('messages.unaccepted')
@@ -82,7 +82,7 @@ def check_for_access
   def give_score
     return if @message.user_id.blank?
 
-    if @message.flags['accepted'] == 'yes'
+    if @message.accepted?
       score_val = conf('accept_value').to_i
       score_val = conf('accept_self_value').to_i if @message.user_id == current_user.try(:user_id)
 

app/helpers/search_helper.rb

@@ -18,7 +18,7 @@ def search_index_message(thread, message)
       title: message.subject,
       content: message.to_search(self),
       url: message_url(thread, message),
-      relevance: base_relevance.to_f + (message.score.to_f / 10.0) + (message.flags['accepted'] == 'yes' ? 0.5 : 0.0) +
+      relevance: base_relevance.to_f + (message.score.to_f / 10.0) + (message.accepted? ? 0.5 : 0.0) +
                  ('0.0' + message.created_at.year.to_s).to_f,
       lang: Cforum::Application.config.search_dict,
       document_created: message.created_at,
@@ -51,7 +51,7 @@ def rescore_message(message)
 
     doc.relevance = base_relevance.to_f +
                     (message.score.to_f / 10.0) +
-                    (message.flags['accepted'] == 'yes' ? 0.5 : 0.0) +
+                    (message.accepted? ? 0.5 : 0.0) +
                     ('0.0' + message.created_at.year.to_s).to_f
     doc.save
   end

app/models/cf_thread.rb

@@ -71,7 +71,7 @@ def gen_tree(direction = 'ascending')
     prev = nil
 
     @sorted_messages.each do |msg|
-      accepted << msg if msg.flags['accepted'] == 'yes'
+      accepted << msg if msg.accepted?
       @message = msg if msg.parent_id.blank?
 
       if prev

app/models/message.rb

@@ -181,6 +181,10 @@ def no_votes
     upvotes + downvotes
   end
 
+  def accepted?
+    flags['accepted'] == 'yes'
+  end
+
   def serializable_hash(options = {})
     options ||= {}
     options[:except] ||= []

script/reindex_postings.rb

@@ -70,7 +70,7 @@ def uconf(name)
       doc.content = m.to_search(self, notify_mentions: false)
       doc.search_section_id = sections[m.forum_id].search_section_id
       doc.url = message_url(m.thread, m)
-      doc.relevance = base_relevance.to_f + (m.score.to_f / 10.0) + (m.flags['accepted'] == 'yes' ? 0.5 : 0.0) +
+      doc.relevance = base_relevance.to_f + (m.score.to_f / 10.0) + (m.accepted? ? 0.5 : 0.0) +
                       ('0.0' + m.created_at.year.to_s).to_f
       doc.lang = Cforum::Application.config.search_dict
       doc.document_created = m.created_at