basic message sending works with these minor fixes

Denver Gingerich created 5 years ago

Change summary

sgx-bwmsgsv2.rb | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)

Detailed changes

sgx-bwmsgsv2.rb

@@ -283,26 +283,21 @@ module SGXbwmsgsv2
 			)
 		end
 
-		extra = if murl
-			{
-				media: murl
-			}
-		else
-			{
-				receiptRequested: 'all',
-				callbackUrl:      ARGV[4]
-			}
+		extra = {}
+		if murl
+			extra = { media: murl }
 		end
 
 		call_catapult(
 			token,
 			secret,
 			:post,
-			"v1/users/#{user_id}/messages",
+			"api/v2/users/#{user_id}/messages",
 			JSON.dump(extra.merge(
 				from: usern,
 				to:   num_dest,
 				text: body,
+				applicationId:  ARGV[4],
 				tag:
 					# callbacks need id and resourcepart
 					WEBrick::HTTPUtils.escape(s.id.to_s) +
@@ -922,7 +917,7 @@ at_exit do
 	if ARGV.size != 7
 		puts "Usage: sgx-bwmsgsv2.rb <component_jid> "\
 			"<component_password> <server_hostname> "\
-			"<server_port> <delivery_receipt_url> "\
+			"<server_port> <application_id> "\
 			"<http_listen_port> <mms_proxy_prefix_url>"
 		exit 0
 	end