archive/phabricator
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Automatically select the right Conduit URI path for the irc bot

Browse Source 
Summary: The docs say "http://www.domain.com/" but if you don't put "/api/" it fails. GOTCHA!

Test Plan: Removed "/api/", launched bot, it worked.

Reviewers: btrahan

Reviewed By: btrahan

CC: aran, epriestley

Maniphest Tasks: T935

Differential Revision: https://secure.phabricator.com/D1763
This commit is contained in:
epriestley
2012-03-05 09:57:21 -08:00
parent 5590515007
commit 37451ffb25
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/infrastructure/daemon/irc/bot/PhabricatorIRCBot.php
View File

@@ -76,6 +76,12 @@ final class PhabricatorIRCBot extends PhabricatorDaemon {
$conduit_user = idx($config, 'conduit.user'); $conduit_user = idx($config, 'conduit.user');
$conduit_cert = idx($config, 'conduit.cert'); $conduit_cert = idx($config, 'conduit.cert');
// Normalize the path component of the URI so users can enter the
// domain without the "/api/" part.
$conduit_uri = new PhutilURI($conduit_uri);
$conduit_uri->setPath('/api/');
$conduit_uri = (string)$conduit_uri;
$conduit = new ConduitClient($conduit_uri); $conduit = new ConduitClient($conduit_uri);
$response = $conduit->callMethodSynchronous( $response = $conduit->callMethodSynchronous(
'conduit.connect', 'conduit.connect',

1
src/infrastructure/daemon/irc/bot/__init__.php
View File

@@ -12,6 +12,7 @@ phutil_require_module('phabricator', 'infrastructure/daemon/irc/message');
phutil_require_module('phutil', 'conduit/client'); phutil_require_module('phutil', 'conduit/client');
phutil_require_module('phutil', 'error'); phutil_require_module('phutil', 'error');
phutil_require_module('phutil', 'filesystem'); phutil_require_module('phutil', 'filesystem');
phutil_require_module('phutil', 'parser/uri');
phutil_require_module('phutil', 'utils'); phutil_require_module('phutil', 'utils');