[manual] send_message: Rename recipient/stream fields to 'to'.
This commit changes APIs and requires and update of all zephyr mirroring bots to deploy properly. (imported from commit 2672d2d07269379f7a865644aaeb6796d54183e1)
This commit is contained in:
parent
fb59f15099
commit
6727e9dbd9
|
@ -59,14 +59,14 @@ if child_pid == 0:
|
|||
humbug_client.send_message({
|
||||
"type": "private",
|
||||
"content": str(hzkey1),
|
||||
"recipient": humbug_user,
|
||||
"to": humbug_user,
|
||||
});
|
||||
time.sleep(0.2)
|
||||
humbug_client.send_message({
|
||||
"type": "stream",
|
||||
"subject": "test",
|
||||
"content": str(hzkey2),
|
||||
"stream": "tabbott-nagios-test",
|
||||
"to": "tabbott-nagios-test",
|
||||
});
|
||||
if options.verbose:
|
||||
print "Sent Humbug messages!"
|
||||
|
|
|
@ -19,7 +19,7 @@ def forward_message(message):
|
|||
return
|
||||
forwarded_message = {
|
||||
"type": "stream",
|
||||
"stream": "support",
|
||||
"to": "support",
|
||||
"subject": "feedback from %s" % message["sender_email"],
|
||||
"content": message["content"],
|
||||
}
|
||||
|
|
|
@ -139,7 +139,7 @@ def send_reminders():
|
|||
|
||||
humbug.send_message(dict(
|
||||
type = 'private',
|
||||
recipient = options.user,
|
||||
to = options.user,
|
||||
content = message))
|
||||
|
||||
sent |= keys
|
||||
|
|
|
@ -41,7 +41,7 @@ def trac_subject(ticket):
|
|||
def send_update(ticket, content):
|
||||
client.send_message({
|
||||
"type": "stream",
|
||||
"stream": "trac",
|
||||
"to": "trac",
|
||||
"content": content,
|
||||
"subject": trac_subject(ticket)
|
||||
})
|
||||
|
|
|
@ -89,15 +89,15 @@ def send_humbug(zeph):
|
|||
if zeph['type'] == 'stream':
|
||||
# Forward messages sent to -c foo -i bar to stream bar subject "instance"
|
||||
if zeph["stream"] == "message":
|
||||
message['stream'] = zeph['subject'].lower()
|
||||
message['to'] = zeph['subject'].lower()
|
||||
message['subject'] = "instance %s" % (zeph['subject'],)
|
||||
elif zeph["stream"] == "tabbott-test5":
|
||||
message['stream'] = zeph['subject'].lower()
|
||||
message['to'] = zeph['subject'].lower()
|
||||
message['subject'] = "test instance %s" % (zeph['subject'],)
|
||||
else:
|
||||
message["stream"] = zeph["stream"]
|
||||
message["to"] = zeph["stream"]
|
||||
else:
|
||||
message["recipient"] = zeph["recipient"]
|
||||
message["to"] = zeph["recipient"]
|
||||
message['content'] = unwrap_lines(zeph['content'])
|
||||
|
||||
if options.test_mode and options.site == DEFAULT_SITE:
|
||||
|
@ -109,7 +109,7 @@ def send_humbug(zeph):
|
|||
def send_error_humbug(error_msg):
|
||||
humbug = {"type": "private",
|
||||
"sender": options.user + "@mit.edu",
|
||||
"recipient": options.user + "@mit.edu",
|
||||
"to": options.user + "@mit.edu",
|
||||
"content": error_msg,
|
||||
}
|
||||
humbug_client.send_message(humbug)
|
||||
|
|
|
@ -5,7 +5,7 @@ curl https://humbughq.com/api/v1/send_message \
|
|||
-d "api-key=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" \
|
||||
-d "email=tabbott@humbughq.com" \
|
||||
-d "type=private" -d "content=test" \
|
||||
-d "recipient=tabbott@humbughq.com"
|
||||
-d "to=tabbott@humbughq.com"
|
||||
|
||||
curl https://humbughq.com/api/v1/get_messages \
|
||||
-d "api-key=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" \
|
||||
|
|
|
@ -40,6 +40,6 @@ client = api.common.HumbugAPI(email=options.sender,
|
|||
message_data = {
|
||||
"type": "private",
|
||||
"content": "test",
|
||||
"recipient": args[0]
|
||||
"to": args[0],
|
||||
}
|
||||
print client.send_message(message_data)
|
||||
|
|
Loading…
Reference in a new issue