Added support for private messages.

feed-to-muc.go

@@ -224,9 +224,12 @@ func processStanzas(client *xmpp.Client, muc string, mucNick string, feeds []str
 		switch v := stanza.(type) {
 		// Reply to requests for source and feeds.
 		case xmpp.Chat:
+			var command string
+
+			// Check for room mention of the bots nick if the the message type is groupchat.
+			if v.Type == "groupchat" {
 				// Get first word of the message and transform it to lower case.
-			var mention string
+				mention := strings.ToLower(strings.Split(v.Text, " ")[0])
-			mention = strings.ToLower(strings.Split(v.Text, " ")[0])
 
 				// If it is not the bots nick remove one trailing character as
 				// a lot of clients append `:` or `,` to mentions.
@@ -242,12 +245,23 @@ func processStanzas(client *xmpp.Client, muc string, mucNick string, feeds []str
 						break
 					}
 				}
+				// As the first word is the mention of the bots nickname, the command is
+				// the second word in a groupchat message.
+				command = strings.ToLower(strings.Split(v.Text, " ")[1])
+				// If the message type is chat (e.g. private message), the command is the
+				// first word.
+			} else if v.Type == "chat" {
+				command = strings.ToLower(strings.Split(v.Text, " ")[0])
+			} else {
+				break
+			}
 
-			// Check for the second word (command).
+			// Check for the command.
-			switch strings.ToLower(strings.Split(v.Text, " ")[1]) {
+			switch command {
 
 			// Reply with a short summary of available commands for `help`.
 			case "help":
+				if v.Type == "groupchat" {
 					_, err = client.Send(xmpp.Chat{Remote: muc,
 						Type: "groupchat", Text: strings.Split(v.Remote, "/")[1] +
 							": The following commands are available:\n" +
@@ -256,8 +270,18 @@ func processStanzas(client *xmpp.Client, muc string, mucNick string, feeds []str
 					if err != nil {
 						log.Fatal("Error: Failed sending message to MUC:", err)
 					}
+				} else if v.Type == "chat" {
+					_, err = client.Send(xmpp.Chat{Remote: v.Remote,
+						Type: "chat", Text: "The following commands are available:\n" +
+							"\"feeds\": List feeds I'm following.\n" +
+							"\"source\": Show source code URL."})
+					if err != nil {
+						log.Fatal("Error: Failed sending message to ", v.Remote, ": ", err)
+					}
+				}
 			// Reply with repo address for `source`.
 			case "source":
+				if v.Type == "groupchat" {
 					_, err = client.Send(xmpp.Chat{Remote: muc,
 						Type: "groupchat", Text: strings.Split(v.Remote, "/")[1] +
 							": My source can be found at " +
@@ -265,6 +289,14 @@ func processStanzas(client *xmpp.Client, muc string, mucNick string, feeds []str
 					if err != nil {
 						log.Fatal("Error: Failed sending message to MUC:", err)
 					}
+				} else if v.Type == "chat" {
+					_, err = client.Send(xmpp.Chat{Remote: v.Remote,
+						Type: "chat", Text: "My source can be found at " +
+							"https://salsa.debian.org/mdosch-guest/feed-to-muc"})
+					if err != nil {
+						log.Fatal("Error: Failed sending message to ", v.Remote, ": ", err)
+					}
+				}
 			// Reply with the list of monitored feeds for `feeds`.
 			case "feeds":
 				var feedList string
@@ -273,12 +305,20 @@ func processStanzas(client *xmpp.Client, muc string, mucNick string, feeds []str
 					feedList = feedList + feed + "\n"
 				}
 
+				if v.Type == "groupchat" {
 					_, err = client.Send(xmpp.Chat{Remote: muc,
 						Type: "groupchat", Text: strings.Split(v.Remote, "/")[1] +
 							": Feeds I'm following:\n" + feedList})
 					if err != nil {
 						log.Fatal("Error: Failed sending message to MUC:", err)
 					}
+				} else if v.Type == "chat" {
+					_, err = client.Send(xmpp.Chat{Remote: v.Remote,
+						Type: "chat", Text: "Feeds I'm following:\n" + feedList})
+					if err != nil {
+						log.Fatal("Error: Failed sending message to ", v.Remote, ": ", err)
+					}
+				}
 
 			}