Allow anonymous questions to be returned when the user has disabled anonymous questions

Fixes #267

app/controllers/ajax/answer_controller.rb

@@ -66,8 +66,8 @@ class Ajax::AnswerController < AjaxController
     end
 
     if answer.user == current_user
-      Inbox.create!(user: answer.user, question: answer.question, new: true)
+      Inbox.create!(user: answer.user, question: answer.question, new: true, returning: true)
-    end # TODO: decide what happens with the question
+    end
     answer.destroy
 
     @response[:status] = :okay

app/models/inbox.rb

@@ -2,8 +2,13 @@ class Inbox < ApplicationRecord
   belongs_to :user
   belongs_to :question
 
+  attr_accessor :returning
+
   before_create do
-    raise "User does not want to receive anonymous questions" if self.question.author_is_anonymous and self.question.author_name != 'justask' and !self.user.privacy_allow_anonymous_questions?
+    raise "User does not want to receive anonymous questions" if !returning &&
+      question.author_is_anonymous &&
+      (question.author_name != "justask") &&
+      !user.privacy_allow_anonymous_questions?
   end
 
   def answer(answer_content, user)

spec/controllers/ajax/answer_controller_spec.rb

@@ -268,6 +268,12 @@ describe Ajax::AnswerController, :ajax_controller, type: :controller do
         it "returns the question back to the user's inbox" do
           expect { subject }.to(change { Inbox.where(question_id: answer.question.id, user_id: user.id).count }.by(1))
         end
+
+        it "returns the question back to the user's inbox when the user has anonymous questions disabled" do
+          user.privacy_allow_anonymous_questions = false
+          user.save
+          expect { subject }.to(change { Inbox.where(question_id: answer.question.id, user_id: user.id).count }.by(1))
+        end
       end
 
       context "when the answer exists and was not made by the current user" do