Send http-upload in OOB message

4 years ago · db2ccee50e
parent 2622081bad
commit db2ccee50e
2 changed files with 22 additions and 5 deletions
--- a/go-sendxmpp.go
+++ b/go-sendxmpp.go
@ -339,8 +339,17 @@ func main() {
 		} else {
 			// Send the message.
 			for _, recipient := range recipients {
-				_, err = client.Send(xmpp.Chat{Remote: recipient,
-					Type: "groupchat", Text: message})
+				if *flagHttpUpload != "" {
+					_, err = client.SendOrg("<message to='" +
+						recipient + "' from ='" + client.JID() +
+						"' type='groupchat' xml:lang='en'>" +
+						"<body>" + message + "</body>" +
+						"<x xmlns='jabber:x:oob'><url>" +
+						message + "</url></x></message>")
+				} else {
+					_, err = client.Send(xmpp.Chat{Remote: recipient,
+						Type: "groupchat", Text: message})
+				}
 				if err != nil {
 					// Try to nicely close connection,
 					// even if there was an error sending.
@ -379,8 +388,17 @@ func main() {
 			}
 		} else {
 			for _, recipient := range recipients {
-				_, err = client.Send(xmpp.Chat{Remote: recipient, Type: "chat",
-					Text: message})
+				if *flagHttpUpload != "" {
+					_, err = client.SendOrg("<message to='" +
+						recipient + "' from ='" + client.JID() +
+						"' type='chat' xml:lang='en'>" +
+						"<body>" + message + "</body>" +
+						"<x xmlns='jabber:x:oob'><url>" +
+						message + "</url></x></message>")
+				} else {
+					_, err = client.Send(xmpp.Chat{Remote: recipient, Type: "chat",
+						Text: message})
+				}
 				if err != nil {
 					// Try to nicely close connection,
 					// even if there was an error sending.
--- a/httpupload.go
+++ b/httpupload.go
@ -5,7 +5,6 @@
 // TODO:
 // * Check filesize limit before trying to send
 // * Check IQ replies for type='error'
-// * Send link OOB
 // * Update Manpages

 package main