Fix Ponder Answer email reply handler

Summary: Should fix all email reply issues, but no solid means of testing at home (how do you local reply test?)

Test Plan: Check for answer mail in /mail/ and see proper headers. Make sure question mail works too.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Maniphest Tasks: T3846

Differential Revision: https://secure.phabricator.com/D13951

src/applications/ponder/editor/PonderAnswerEditor.php

@@ -86,16 +86,17 @@ final class PonderAnswerEditor extends PonderEditor {
   }
 
   protected function buildReplyHandler(PhabricatorLiskDAO $object) {
-    $question = $object->getQuestion();
+    return id(new PonderAnswerReplyHandler())
-    return id(new PonderQuestionReplyHandler())
+      ->setMailReceiver($object);
-      ->setMailReceiver($question);
   }
 
   protected function buildMailTemplate(PhabricatorLiskDAO $object) {
-    $question = $object->getQuestion();
+    $id = $object->getID();
-    return parent::buildMailTemplate($question);
-  }
 
+    return id(new PhabricatorMetaMTAMail())
+      ->setSubject("ANSR{$id}")
+      ->addHeader('Thread-Topic', "ANSR{$id}");
+  }
 
   protected function buildMailBody(
     PhabricatorLiskDAO $object,

src/applications/ponder/editor/PonderEditor.php

@@ -7,23 +7,6 @@ abstract class PonderEditor
     return 'PhabricatorPonderApplication';
   }
 
-  protected function shouldPublishFeedStory(
-    PhabricatorLiskDAO $object,
-    array $xactions) {
-    return true;
-  }
-
-  protected function buildMailTemplate(PhabricatorLiskDAO $object) {
-    $id = $object->getID();
-    $title = $object->getTitle();
-    $original_title = $object->getOriginalTitle();
-
-    return id(new PhabricatorMetaMTAMail())
-      ->setSubject("Q{$id}: {$title}")
-      ->addHeader('Thread-Topic', "Q{$id}: {$original_title}");
-  }
-
-
   protected function getMailTo(PhabricatorLiskDAO $object) {
     return array(
       $object->getAuthorPHID(),

src/applications/ponder/editor/PonderQuestionEditor.php

@@ -231,6 +231,16 @@ final class PonderQuestionEditor
       ->setMailReceiver($object);
   }
 
+  protected function buildMailTemplate(PhabricatorLiskDAO $object) {
+    $id = $object->getID();
+    $title = $object->getTitle();
+    $original_title = $object->getOriginalTitle();
+
+    return id(new PhabricatorMetaMTAMail())
+      ->setSubject("Q{$id}: {$title}")
+      ->addHeader('Thread-Topic', "Q{$id}: {$original_title}");
+  }
+
   protected function buildMailBody(
     PhabricatorLiskDAO $object,
     array $xactions) {