revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-12-31 18:01:00 +01:00
Code Issues Releases Wiki Activity

Remove chatbot example configuration

Browse source 
Summary: This is no longer needed after the chatbot was removed in D17756.

Test Plan: N/A

Reviewers: epriestley, #blessed_reviewers

Reviewed By: epriestley, #blessed_reviewers

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D18378
This commit is contained in:
Joshua Spence 2017-08-09 22:49:25 +00:00 committed by joshuaspence
parent 46d1596bf7
commit bd47d001b5
2 changed files with 6 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
resources/chatbot/example_config.json
View file

@ -1,24 +0,0 @@
{
"server" : "irc.freenode.net",
"port" : 6667,
"nick" : "phabot",
"join" : [
"#phabot-test"
],
"handlers" : [
"PhabricatorBotObjectNameHandler",
"PhabricatorBotSymbolHandler",
"PhabricatorBotLogHandler",
"PhabricatorBotFeedNotificationHandler",
"PhabricatorBotWhatsNewHandler",
"PhabricatorBotMacroHandler"
],
"conduit.uri" : null,
"conduit.token" : null,
"macro.size" : 48,
"macro.aspect" : 0.66,
"notification.channels" : ["#phabot-test"]
}

8
src/applications/files/storage/PhabricatorFile.php
View file

@ -854,7 +854,7 @@ final class PhabricatorFile extends PhabricatorFileDAO
return $this->getTransformedURI($transform->getTransformKey());
}
private function getTransformedURI($transform) {
private function getTransformedURI($transform, $cdn) {
$parts = array();
$parts[] = 'file';
$parts[] = 'xform';
@ -871,7 +871,11 @@ final class PhabricatorFile extends PhabricatorFileDAO
$path = implode('/', $parts);
$path = $path.'/';
return PhabricatorEnv::getCDNURI($path);
if ($cdn) {
return PhabricatorEnv::getCDNURI($path);
} else {
return PhabricatorEnv::getURI($path);
}
}
public function isViewableInBrowser() {