diff --git a/go-sendxmpp.go b/go-sendxmpp.go
index cc3f6f2..82086a3 100644
--- a/go-sendxmpp.go
+++ b/go-sendxmpp.go
@@ -158,12 +158,26 @@ func readMessage(messageFilePath string) (string, error) {
return output, err
}
+func oobMessage(recipient string, sender string, messageType string, url string) string {
+ orgMessage := "" + url +
+ "" + url + ""
+ println("OrgMessage: ", orgMessage)
+
+ return orgMessage
+}
+
func main() {
var (
- err error
- message, user, server, password, orgMessageStart string
- orgChatMessageEnd, orgGroupMessageEnd string
+ err error
+ message, user, server, password string
)
// Define command line flags.
@@ -290,13 +304,6 @@ func main() {
if *flagHttpUpload != "" {
message = httpUpload(client, tlsConfig.ServerName,
*flagHttpUpload)
- orgMessageStart = "" + message + "" +
- "" + message + ""
- orgChatMessageEnd = "' from ='" + client.JID() + "' type='chat' xml:lang='en'>" +
- "" + message + "" +
- message + ""
}
// Skip reading message if '-i' or '--interactive' is set to work with e.g. 'tail -f'.
@@ -359,8 +366,8 @@ func main() {
// Send the message.
for _, recipient := range recipients {
if *flagHttpUpload != "" {
- _, err = client.SendOrg(orgMessageStart + recipient +
- orgGroupMessageEnd)
+ _, err = client.SendOrg(oobMessage(recipient, client.JID(),
+ "groupchat", message))
} else {
_, err = client.Send(xmpp.Chat{Remote: recipient,
Type: "groupchat", Text: message})
@@ -404,8 +411,8 @@ func main() {
} else {
for _, recipient := range recipients {
if *flagHttpUpload != "" {
- _, err = client.SendOrg(orgMessageStart + recipient +
- orgChatMessageEnd)
+ _, err = client.SendOrg(oobMessage(recipient, client.JID(),
+ "chat", message))
} else {
_, err = client.Send(xmpp.Chat{Remote: recipient, Type: "chat",
Text: message})