Skip to content

feat: display member counts in /dashboard/:id #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
didinele merged 3 commits into from
Oct 9, 2025
Merged

feat: display member counts in /dashboard/:id #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
23b5330
Initial plan
Copilot Oct 9, 2025
453b67a
Add member count display to guild page
Copilot Oct 9, 2025
3cbf709
chore: nits
didinele Oct 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 19 additions & 6 deletions apps/website/src/app/dashboard/[id]/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,29 @@ export default function GuildPage() {
]}
/>

{/* TODO: Show member counts maybe */}
<div className="flex w-full flex-col gap-3 rounded-lg border-[1px] border-on-secondary bg-card p-4 dark:border-on-secondary-dark dark:bg-card-dark">
<div className="flex w-full flex-row gap-3 rounded-lg border-[1px] border-on-secondary bg-card p-4 dark:border-on-secondary-dark dark:bg-card-dark">
<div className="flex flex-row gap-4">
<GuildIcon data={guild} disableLink hasBots={guild.bots.length > 0} />
<p className="content-center w-full overflow-hidden overflow-ellipsis whitespace-nowrap text-lg font-medium text-primary dark:text-primary-dark">
{guild.name}
</p>
<div>
<p className="content-center w-full overflow-hidden overflow-ellipsis whitespace-nowrap text-lg font-medium text-primary dark:text-primary-dark">
{guild.name}
</p>
<p className="text-base text-secondary dark:text-secondary-dark">{guild.bots.length} bot(s) active</p>
</div>
</div>

<p className="text-base text-secondary dark:text-secondary-dark">{guild.bots.length} bot(s) active</p>
<div className="flex flex-col gap-1 ml-auto text-right">
{guild.approximate_member_count !== undefined && (
<p className="text-base text-secondary dark:text-secondary-dark">
{guild.approximate_member_count.toLocaleString()} member(s)
</p>
)}
{guild.approximate_presence_count !== undefined && (
<p className="text-base text-secondary dark:text-secondary-dark">
{guild.approximate_presence_count?.toLocaleString() ?? '0'} online
</p>
)}
</div>
</div>

<div className="space-y-4">
Expand Down
54 changes: 33 additions & 21 deletions services/api/src/util/me.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,16 @@ import { context } from '../context.js';
import { discordAPIOAuth } from './discordAPI.js';

export type MeGuild = Pick<RESTAPIPartialCurrentUserGuild, 'icon' | 'id' | 'name'> & {
approximate_member_count?: number;
approximate_presence_count?: number;
bots: BotId[];
meCanManage: boolean;
};
export type Me = APIUser & { guilds: MeGuild[]; isGlobalAdmin: boolean };

const CACHE = new Map<string, Me>();
const CACHE_TIMEOUTS = new Map<string, NodeJS.Timeout>();
const CACHE_TTL = 5 * 60 * 1_000; // 5 minutes

export async function fetchMe(discordAccessToken: string, force = false): Promise<Me> {
if (CACHE.has(discordAccessToken) && !force) {
Expand All @@ -26,7 +29,7 @@ export async function fetchMe(discordAccessToken: string, force = false): Promis
};

const discordUser = await discordAPIOAuth.users.getCurrent({ auth });
const guildsRaw = await discordAPIOAuth.users.getGuilds({}, { auth });
const guildsRaw = await discordAPIOAuth.users.getGuilds({ with_counts: true }, { auth });

const guildsByBot = await promiseAllObject(
Object.fromEntries(
Expand All @@ -39,19 +42,31 @@ export async function fetchMe(discordAccessToken: string, force = false): Promis
) as Record<BotId, Promise<string[]>>,
);

const guilds = guildsRaw.map<MeGuild>(({ id, name, icon, owner, permissions }) => ({
id,
name,
icon,
owner,
permissions,
meCanManage:
PermissionsBitField.has(
BigInt(permissions),
PermissionFlagsBits.ManageGuild | PermissionFlagsBits.Administrator,
) || owner,
bots: BOTS.filter((bot) => guildsByBot[bot]?.includes(id)),
}));
const guilds = guildsRaw.map<MeGuild>(
({ id, name, icon, owner, permissions, approximate_member_count, approximate_presence_count }) => {
const guild: MeGuild = {
id,
name,
icon,
meCanManage:
PermissionsBitField.has(
BigInt(permissions),
PermissionFlagsBits.ManageGuild | PermissionFlagsBits.Administrator,
) || owner,
bots: BOTS.filter((bot) => guildsByBot[bot]?.includes(id)),
};

if (approximate_member_count !== undefined) {
guild.approximate_member_count = approximate_member_count;
}

if (approximate_presence_count !== undefined) {
guild.approximate_presence_count = approximate_presence_count;
}

return guild;
},
);

const me: Me = {
...discordUser,
Expand All @@ -64,13 +79,10 @@ export async function fetchMe(discordAccessToken: string, force = false): Promis
const timeout = CACHE_TIMEOUTS.get(discordAccessToken)!;
timeout.refresh();
} else {
const timeout = setTimeout(
() => {
CACHE.delete(discordAccessToken);
CACHE_TIMEOUTS.delete(discordAccessToken);
},
5 * 60 * 1_000,
).unref();
const timeout = setTimeout(() => {
CACHE.delete(discordAccessToken);
CACHE_TIMEOUTS.delete(discordAccessToken);
}, CACHE_TTL).unref();

CACHE_TIMEOUTS.set(discordAccessToken, timeout);
}
Expand Down
Loading