From ab870c2ffef1c66b6ec3f708c1e57517b18113f4 Mon Sep 17 00:00:00 2001
From: Shivaram Lingamneni <slingamn@cs.stanford.edu>
Date: Thu, 18 Mar 2021 04:24:45 -0400
Subject: [PATCH] fix #1576

List IRCv3 CAPs in `NS CLIENTS LIST` output
---
 irc/getters.go  | 3 +++
 irc/nickserv.go | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/irc/getters.go b/irc/getters.go
index 2580683d..2091e4af 100644
--- a/irc/getters.go
+++ b/irc/getters.go
@@ -9,6 +9,7 @@ import (
 	"time"
 	"unsafe"
 
+	"github.com/oragono/oragono/irc/caps"
 	"github.com/oragono/oragono/irc/languages"
 	"github.com/oragono/oragono/irc/modes"
 	"github.com/oragono/oragono/irc/utils"
@@ -74,6 +75,7 @@ type SessionData struct {
 	deviceID  string
 	connInfo  string
 	sessionID int64
+	caps      []string
 }
 
 func (client *Client) AllSessionData(currentSession *Session, hasPrivs bool) (data []SessionData, currentIndex int) {
@@ -102,6 +104,7 @@ func (client *Client) AllSessionData(currentSession *Session, hasPrivs bool) (da
 		if hasPrivs {
 			data[i].connInfo = utils.DescribeConn(session.socket.conn.UnderlyingConn().Conn)
 		}
+		data[i].caps = session.capabilities.Strings(caps.Cap302, nil, 300)
 	}
 	return
 }
diff --git a/irc/nickserv.go b/irc/nickserv.go
index 50d497a3..5bf45c4b 100644
--- a/irc/nickserv.go
+++ b/irc/nickserv.go
@@ -1140,6 +1140,11 @@ func nsClientsListHandler(service *ircService, server *Server, client *Client, p
 		if session.certfp != "" {
 			service.Notice(rb, fmt.Sprintf(client.t("Certfp:      %s"), session.certfp))
 		}
+		for _, capStr := range session.caps {
+			if capStr != "" {
+				service.Notice(rb, fmt.Sprintf(client.t("IRCv3 CAPs:  %s"), capStr))
+			}
+		}
 	}
 }