Page MenuHomePhabricator
Files F15245590

D16443.id39555.diff
No OneTemporary
Actions

D16443.id39555.diff
View Options

diff --git a/resources/chatbot/example_config.json b/resources/chatbot/example_config.json
--- a/resources/chatbot/example_config.json
+++ b/resources/chatbot/example_config.json
@@ -15,8 +15,7 @@
],
"conduit.uri" : null,
- "conduit.user" : null,
- "conduit.cert" : null,
+ "conduit.token" : null,
"macro.size" : 48,
"macro.aspect" : 0.66,
diff --git a/src/docs/tech/chatbot.diviner b/src/docs/tech/chatbot.diviner
--- a/src/docs/tech/chatbot.diviner
+++ b/src/docs/tech/chatbot.diviner
@@ -32,7 +32,7 @@
- `join` Array, list of channels to join.
- `handlers` Array, list of handlers to run. These are like plugins for the
bot.
- - `conduit.uri`, `conduit.user`, `conduit.cert` Conduit configuration,
+ - `conduit.uri`, `conduit.token` Conduit configuration,
see below.
- `notification.channels` Notification configuration, see below.
@@ -72,10 +72,8 @@
- `conduit.uri` The URI for your Phabricator install, like
`http://phabricator.example.com/`
- - `conduit.user` The username your bot should login to Phabricator with --
- whatever you selected above, like `phabot`.
- - `conduit.cert` The user's certificate, from the "Conduit Certificate" tab
- in the user's administrative view.
+ - `conduit.token` The user's conduit API token, from the "Conduit API Tokens"
+ tab in the user's administrative view.
Now the bot should be able to connect to Phabricator via Conduit.
diff --git a/src/infrastructure/daemon/bot/PhabricatorBot.php b/src/infrastructure/daemon/bot/PhabricatorBot.php
--- a/src/infrastructure/daemon/bot/PhabricatorBot.php
+++ b/src/infrastructure/daemon/bot/PhabricatorBot.php
@@ -159,11 +159,10 @@
if (empty($this->conduit)) {
throw new Exception(
pht(
- "This bot is not configured with a Conduit uplink. Set '%s', ".
- "'%s' and '%s' in the configuration to connect.",
+ "This bot is not configured with a Conduit uplink. Set '%s' and ".
+ "'%s' in the configuration to connect.",
'conduit.uri',
- 'conduit.user',
- 'conduit.cert'));
+ 'conduit.token'));
}
return $this->conduit;
}

File Metadata

Mime Type
text/plain
Expires
Tue, Feb 25, 11:59 PM (20 h, 21 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7203323
Default Alt Text
D16443.id39555.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility