mirror of
https://we.phorge.it/source/phorge.git
synced 2024-12-31 18:01:00 +01:00
Add mail keys to Ponder questions
Summary: We need to go slightly farther to stub reply handler functionality for Ponder in at least some configurations, where we rely on the presence of a unique random key to generate per-object or per-object+user reply addresses. This should probably be formalized in an interface since it's currently pretty ad-hoc. Test Plan: - Made comments in Ponder under a per-user email configuration. - Ran migration, verified mail keys were generated. - Ran migration again (with --apply), verified existing questions were skipped. - Created a new question, verified mail key generation. Reviewers: pieter Reviewed By: pieter CC: aran Maniphest Tasks: T1873 Differential Revision: https://secure.phabricator.com/D3665
This commit is contained in:
parent
a18de93a8c
commit
2532cb9613
5 changed files with 57 additions and 1 deletions
37
resources/sql/patches/ponder-mailkey-populate.php
Normal file
37
resources/sql/patches/ponder-mailkey-populate.php
Normal file
|
@ -0,0 +1,37 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Copyright 2012 Facebook, Inc.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
echo "Populating Questions with mail keys...\n";
|
||||||
|
foreach (new LiskMigrationIterator(new PonderQuestion()) as $question) {
|
||||||
|
$id = $question->getID();
|
||||||
|
|
||||||
|
echo "Question {$id}: ";
|
||||||
|
if (!$question->getMailKey()) {
|
||||||
|
queryfx(
|
||||||
|
$question->establishConnection('w'),
|
||||||
|
'UPDATE %T SET mailKey = %s WHERE id = %d',
|
||||||
|
$question->getTableName(),
|
||||||
|
Filesystem::readRandomCharacters(20),
|
||||||
|
$id);
|
||||||
|
echo "Generated Key\n";
|
||||||
|
} else {
|
||||||
|
echo "-\n";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
echo "Done.\n";
|
2
resources/sql/patches/ponder-mailkey.sql
Normal file
2
resources/sql/patches/ponder-mailkey.sql
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
ALTER TABLE `{$NAMESPACE}_ponder`.ponder_question
|
||||||
|
ADD mailKey VARCHAR(20) NOT NULL COLLATE utf8_bin;
|
|
@ -106,6 +106,7 @@ abstract class PonderMail {
|
||||||
->loadHandles();
|
->loadHandles();
|
||||||
|
|
||||||
$reply_handler = new PonderReplyHandler();
|
$reply_handler = new PonderReplyHandler();
|
||||||
|
$reply_handler->setMailReceiver($question);
|
||||||
|
|
||||||
$body = new PhabricatorMetaMTAMailBody();
|
$body = new PhabricatorMetaMTAMailBody();
|
||||||
$body->addRawSection($this->renderBody());
|
$body->addRawSection($this->renderBody());
|
||||||
|
|
|
@ -34,6 +34,7 @@ final class PonderQuestion extends PonderDAO
|
||||||
protected $voteCount;
|
protected $voteCount;
|
||||||
protected $answerCount;
|
protected $answerCount;
|
||||||
protected $heat;
|
protected $heat;
|
||||||
|
protected $mailKey;
|
||||||
|
|
||||||
private $answers;
|
private $answers;
|
||||||
private $vote;
|
private $vote;
|
||||||
|
@ -175,4 +176,12 @@ final class PonderQuestion extends PonderDAO
|
||||||
public function isAutomaticallySubscribed($phid) {
|
public function isAutomaticallySubscribed($phid) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function save() {
|
||||||
|
if (!$this->getMailKey()) {
|
||||||
|
$this->setMailKey(Filesystem::readRandomCharacters(20));
|
||||||
|
}
|
||||||
|
return parent::save();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -996,7 +996,14 @@ final class PhabricatorBuiltinPatchList extends PhabricatorSQLPatchList {
|
||||||
'type' => 'sql',
|
'type' => 'sql',
|
||||||
'name' => $this->getPatchPath('phamedomain.sql'),
|
'name' => $this->getPatchPath('phamedomain.sql'),
|
||||||
),
|
),
|
||||||
|
'ponder-mailkey.sql' => array(
|
||||||
|
'type' => 'sql',
|
||||||
|
'name' => $this->getPatchPath('ponder-mailkey.sql'),
|
||||||
|
),
|
||||||
|
'ponder-mailkey-populate.php' => array(
|
||||||
|
'type' => 'php',
|
||||||
|
'name' => $this->getPatchPath('ponder-mailkey-populate.php'),
|
||||||
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue