Add user count to pds list endpoint (#426)

bluesky-social · Nov 10, 2023 · 668f3da · 668f3da
2 parents d47a672 + d51abd2
commit 668f3da
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 0 deletions.
diff --git a/bgs/admin.go b/bgs/admin.go
@@ -106,6 +106,12 @@ type enrichedPDS struct {
 	EventsSeenSinceStartup uint64    `json:"EventsSeenSinceStartup"`
 	IngestRate             rateLimit `json:"IngestRate"`
 	CrawlRate              rateLimit `json:"CrawlRate"`
+	UserCount              int64     `json:"UserCount"`
+}
+
+type UserCount struct {
+	PDSID     uint  `gorm:"column:pds"`
+	UserCount int64 `gorm:"column:user_count"`
 }
 
 func (bgs *BGS) handleListPDSs(e echo.Context) error {
@@ -118,6 +124,20 @@ func (bgs *BGS) handleListPDSs(e echo.Context) error {
 
 	activePDSHosts := bgs.slurper.GetActiveList()
 
+	var userCounts []UserCount
+	if err := bgs.db.Model(&User{}).
+		Select("pds, count(*) as user_count").
+		Group("pds").
+		Find(&userCounts).Error; err != nil {
+		return err
+	}
+
+	// Create a map for fast lookup
+	userCountMap := make(map[uint]int64)
+	for _, count := range userCounts {
+		userCountMap[count.PDSID] = count.UserCount
+	}
+
 	for i, p := range pds {
 		enrichedPDSs[i].PDS = p
 		enrichedPDSs[i].HasActiveConnection = false
@@ -133,6 +153,7 @@ func (bgs *BGS) handleListPDSs(e echo.Context) error {
 			continue
 		}
 		enrichedPDSs[i].EventsSeenSinceStartup = uint64(m.Counter.GetValue())
+		enrichedPDSs[i].UserCount = userCountMap[p.ID]
 
 		// Get the ingest rate limit for this PDS
 		ingestRate := rateLimit{

diff --git a/ts/bgs-dash/src/components/Dash/Dash.tsx b/ts/bgs-dash/src/components/Dash/Dash.tsx
@@ -593,6 +593,37 @@ const Dash: FC<{}> = () => {
                     </span>
                   </a>
                 </th>
+                <th
+                  scope="col"
+                  className="px-3 py-3.5 text-right text-sm font-semibold text-gray-900 pr-6 whitespace-nowrap"
+                >
+                  <a
+                    href="#"
+                    className="group inline-flex"
+                    onClick={() => {
+                      setSortField("UserCount");
+                      setSortOrder(sortOrder === "asc" ? "desc" : "asc");
+                    }}
+                  >
+                    Users
+                    <span
+                      className={`ml-2 flex-none rounded text-gray-400 ${
+                        sortField === "UserCount"
+                          ? "group-hover:bg-gray-200"
+                          : "invisible group-hover:visible group-focus:visible"
+                      }`}
+                    >
+                      {sortField === "UserCount" && sortOrder === "asc" ? (
+                        <ChevronUpIcon className="h-5 w-5" aria-hidden="true" />
+                      ) : (
+                        <ChevronDownIcon
+                          className="h-5 w-5"
+                          aria-hidden="true"
+                        />
+                      )}
+                    </span>
+                  </a>
+                </th>
                 <th
                   scope="col"
                   className="px-3 py-3.5 text-right text-sm font-semibold text-gray-900 pr-6 whitespace-nowrap"
@@ -810,6 +841,9 @@ const Dash: FC<{}> = () => {
                           </div>
                         )}
                       </td>
+                      <td className="whitespace-nowrap px-3 py-2 text-sm text-gray-400 text-center w-8 pr-6">
+                        {pds.UserCount?.toLocaleString()}
+                      </td>
                       <td className="whitespace-nowrap px-3 py-2 text-sm text-gray-400 text-center w-8 pr-6">
                         {pds.EventsSeenSinceStartup?.toLocaleString()}
                       </td>

diff --git a/ts/bgs-dash/src/models/pds.ts b/ts/bgs-dash/src/models/pds.ts
@@ -18,6 +18,7 @@ interface PDS {
   EventsSeenSinceStartup?: number;
   IngestRate: RateLimit;
   CrawlRate: RateLimit;
+  UserCount: number;
 }
 
 type PDSKey = keyof PDS;