Extended room disco info

1 files changed, 38 insertions, 15 deletions

diff --git a/xmpp/handlers.go b/xmpp/handlers.go
index 6531983..fde7382 100644
--- a/xmpp/handlers.go
+++ b/xmpp/handlers.go
@@ -340,11 +340,7 @@ func handleGetDisco(dt discoType, s xmpp.Sender, iq *stanza.IQ) {
 	if dt == discoTypeInfo {
 		disco := answer.DiscoInfo()
 		toID, toOk := toToID(iq.To)
-		if toOk {
-			disco.AddIdentity("", "account", "registered")
-		} else {
-			disco.AddIdentity("Telegram Gateway", "gateway", "telegram")
-		}
+		var isMuc bool
 		bare, _, fromOk := splitFrom(iq.From)
 		if fromOk {
 			session, sessionOk := sessions[bare]
@@ -352,24 +348,51 @@ func handleGetDisco(dt discoType, s xmpp.Sender, iq *stanza.IQ) {
 				if toOk {
 					chat, _, err := session.GetContactByID(toID, nil)
 					if err == nil && session.IsGroup(chat) {
+						isMuc = true
 						disco.AddIdentity(chat.Title, "conference", "text")
-					}
 
-					disco.AddFeatures(
-						"http://jabber.org/protocol/muc",
-						"muc_persistent",
-						"muc_hidden",
-						"muc_membersonly",
-						"muc_unmoderated",
-						"muc_nonanonymous",
-						"muc_unsecured",
-					)
+						disco.AddFeatures(
+							"http://jabber.org/protocol/muc",
+							"muc_persistent",
+							"muc_hidden",
+							"muc_membersonly",
+							"muc_unmoderated",
+							"muc_nonanonymous",
+							"muc_unsecured",
+						)
+						fields := []*stanza.Field{
+							&stanza.Field{
+								Var:        "FORM_TYPE",
+								Type:       "hidden",
+								ValuesList: []string{"http://jabber.org/protocol/muc#roominfo"},
+							},
+							&stanza.Field{
+								Var:        "muc#roominfo_description",
+								Label:      "Description",
+								ValuesList: []string{session.GetChatDescription(chat)},
+							},
+							&stanza.Field{
+								Var:        "muc#roominfo_occupants",
+								Label:      "Number of occupants",
+								ValuesList: []string{strconv.FormatInt(int64(session.GetChatMemberCount(chat)), 10)},
+							},
+						}
+
+						disco.Form = stanza.NewForm(fields, "result")
+					}
 				} else {
 					disco.AddFeatures(stanza.NSDiscoItems)
 					disco.AddIdentity("Telegram group chats", "conference", "text")
 				}
 			}
 		}
+		if toOk {
+			if !isMuc {
+				disco.AddIdentity("", "account", "registered")
+			}
+		} else {
+			disco.AddIdentity("Telegram Gateway", "gateway", "telegram")
+		}
 		answer.Payload = disco
 	} else if dt == discoTypeItems {
 		disco := answer.DiscoItems()