feat: dash recognizing ama bot

Author: didinele

apps/website/next.config.mjs

@@ -40,9 +40,9 @@ export default {
 				permanent: true,
 			},
 			{
-				source: '/invites/automoderator',
+				source: '/invites/ama',
 				destination:
-					'https://discord.com/api/oauth2/authorize?client_id=847081327950168104&permissions=1100451531910&scope=applications.commands%20bot',
+					'https://discord.com/oauth2/authorize?client_id=872022469081448489&permissions=274878024704&scope=applications.commands+bot',
 				permanent: true,
 			},
 		];

apps/website/src/app/dashboard/_components/GuildCard.tsx

@@ -1,6 +1,6 @@
 import type { MeGuild } from '@chatsift/api';
 import { GuildIcon } from '@/components/common/GuildIcon';
-import { SvgAutoModerator } from '@/components/icons/SvgAutoModerator';
+import { SvgAMA } from '@/components/icons/SvgAMA';
 import { cn } from '@/utils/util';
 
 interface GuildCardProps {
@@ -26,9 +26,9 @@ export default function GuildCard({ data }: GuildCardProps) {
 
 				{hasBots ? (
 					<ul className="flex flex-row gap-1">
-						{data.bots.includes('automoderator') && (
+						{data.bots.includes('AMA') && (
 							<li>
-								<SvgAutoModerator />
+								<SvgAMA />
 							</li>
 						)}
 					</ul>
@@ -41,8 +41,8 @@ export default function GuildCard({ data }: GuildCardProps) {
 							<p className="text-lg font-medium text-primary dark:text-primary-dark">Invite a bot:</p>
 							<ul className="flex flex-row gap-3">
 								<li>
-									<a href="/invites/automoderator">
-										<SvgAutoModerator />
+									<a href="/invites/ama">
+										<SvgAMA />
 									</a>
 								</li>
 							</ul>

apps/website/src/components/common/GuildIcon.tsx

@@ -19,21 +19,21 @@ export function GuildIcon({ data, hasBots }: GuildIconProps) {
 
 	return (
 		<div className="flex flex-row items-center">
-			{icon ? (
-				<a href={url}>
+			<a href={url}>
+				{icon ? (
 					<Image
 						alt="Guild icon"
 						className="flex h-12 w-12 items-center justify-center rounded-full border-on-secondary bg-on-tertiary dark:border-on-secondary-dark dark:bg-on-tertiary-dark"
 						height={48}
 						src={icon}
 						width={48}
 					/>
-				</a>
-			) : (
-				<p className="flex h-12 w-12 items-center justify-center overflow-hidden text-ellipsis whitespace-nowrap rounded-full border-on-secondary bg-on-tertiary after:max-w-[70%] dark:border-on-secondary-dark dark:bg-on-tertiary-dark">
-					{getGuildAcronym(data.name)}
-				</p>
-			)}
+				) : (
+					<p className="flex h-12 w-12 items-center justify-center overflow-hidden text-ellipsis whitespace-nowrap rounded-full border-on-secondary bg-on-tertiary after:max-w-[70%] dark:border-on-secondary-dark dark:bg-on-tertiary-dark">
+						{getGuildAcronym(data.name)}
+					</p>
+				)}
+			</a>
 		</div>
 	);
 }

apps/website/src/components/icons/SvgAMA.tsx

@@ -0,0 +1,16 @@
+export function SvgAMA({ width, height }: { readonly height?: number; readonly width?: number }) {
+	return (
+		<svg fill="none" height={height ?? 24} viewBox="0 0 24 24" width={width ?? 24} xmlns="http://www.w3.org/2000/svg">
+			<path
+				className="stroke-misc-accent"
+				d="M4.5 4.5V18H9L12 21L15 18H19.5V4.5H4.5Z"
+				strokeLinejoin="round"
+				strokeWidth="1.875"
+			/>
+			<path
+				className="fill-primary stroke-primary dark:fill-primary-dark dark:stroke-primary-dark"
+				d="M9.75 8.0625C9.23223 8.0625 8.8125 8.48223 8.8125 9C8.8125 9.51777 9.23223 9.9375 9.75 9.9375V8.0625ZM14.25 9H15.1875C15.1875 8.48223 14.7678 8.0625 14.25 8.0625V9ZM14.25 11.3333L14.5163 12.2322C14.9144 12.1143 15.1875 11.7485 15.1875 11.3333H14.25ZM11.7337 11.1011C11.2372 11.2482 10.954 11.7699 11.1011 12.2663C11.2482 12.7628 11.7699 13.046 12.2663 12.8989L11.7337 11.1011ZM12.9375 15C12.9375 14.4822 12.5178 14.0625 12 14.0625C11.4822 14.0625 11.0625 14.4822 11.0625 15H12.9375ZM11.0625 15.0015C11.0625 15.5193 11.4822 15.939 12 15.939C12.5178 15.939 12.9375 15.5193 12.9375 15.0015H11.0625ZM9.75 9.9375H14.25V8.0625H9.75V9.9375ZM13.3125 9V11.3333H15.1875V9H13.3125ZM13.9837 10.4345L11.7337 11.1011L12.2663 12.8989L14.5163 12.2322L13.9837 10.4345ZM11.0625 15V15.0015H12.9375V15H11.0625Z"
+			/>
+		</svg>
+	);
+}

packages/private/backend-core/src/lib/data/bots.ts

@@ -4,6 +4,7 @@ export const BOTS = ['AMA'] as const;
 
 export type BotId = (typeof BOTS)[number];
 
+// TODO: Abstract
 export const GlobalCaches = {
 	/**
 	 * Not to be used in such a way to risk race conditions. There should really be one place that sets this per bot,

packages/private/backend-core/src/lib/redis.ts

@@ -1,9 +1,13 @@
+import { Buffer } from 'node:buffer';
 import type { Logger } from 'pino';
-import { createClient } from 'redis';
+import { createClient, RESP_TYPES } from 'redis';
 import { ENV } from './env.js';
 
 export async function createRedis(logger: Logger) {
 	return createClient({ url: ENV.REDIS_URL })
+		.withTypeMapping({
+			[RESP_TYPES.BLOB_STRING]: Buffer,
+		})
 		.on('error', (err) => logger.error(err, 'redis error'))
 		.connect();
 }

packages/private/core/src/index.ts

@@ -1,4 +1,5 @@
 export * from './lib/constants.js';
 export * from './lib/discordPermissions.js';
+export * from './lib/promiseAllObject.js';
 
 export type * from './types/entities.js';

packages/private/core/src/lib/promiseAllObject.ts

@@ -0,0 +1,24 @@
+/* eslint-disable tsdoc/syntax */
+
+/**
+ * Transforms an object of promises into a promise of an object where all the values are awaited, much like
+ * {@link https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise/all | Promise.all}.
+ *
+ * @remarks
+ * This is the flow we follow:
+ *
+ * { a: Promise<X>, b: Promise<Y> }
+ *
+ * => [ ['a', Promise<X>], ['b', Promise<Y>] ]
+ *
+ * => [ Promise<['a', X]>, Promise<'b', Y>] ]
+ *
+ * => (via awaited Promise.all) [ ['a', X], ['b', Y] ]
+ *
+ * => Promise<{ a: X, b: Y }>
+ */
+export async function promiseAllObject<TRecord extends Record<string, Promise<any>>>(
+	obj: TRecord,
+): Promise<{ [K in keyof TRecord]: Awaited<TRecord[K]> }> {
+	return Object.fromEntries(await Promise.all(Object.entries(obj).map(async ([key, value]) => [key, await value])));
+}

services/api/src/middleware/__tests__/isAuthed.test.ts

@@ -34,7 +34,9 @@ vi.mock('@chatsift/backend-core', async (importActual) => {
 		...actual,
 		// @ts-expect-error - Arg forwarding
 		createContext: (...args: any[]) => ({ ...actual.createContext(...args), UP_SINCE: Date.now() - 1_000 * 60 * 5 }),
-		createRedis: () => null,
+		createRedis: () => ({
+			get: vi.fn(async () => null),
+		}),
 	};
 });
 

services/api/src/util/me.ts

@@ -1,13 +1,13 @@
 import { setTimeout } from 'node:timers';
-import { PermissionsBitField } from '@chatsift/backend-core';
+import type { BotId } from '@chatsift/backend-core';
+import { BOTS, GlobalCaches, PermissionsBitField, promiseAllObject } from '@chatsift/backend-core';
 import type { APIUser, RESTAPIPartialCurrentUserGuild } from '@discordjs/core';
 import { PermissionFlagsBits } from '@discordjs/core';
 import { context } from '../context.js';
 import { discordAPIOAuth } from './discordAPI.js';
 
-// TODO: Proper bots type
 export type MeGuild = Pick<RESTAPIPartialCurrentUserGuild, 'icon' | 'id' | 'name'> & {
-	bots: string[];
+	bots: BotId[];
 	meCanManage: boolean;
 };
 export type Me = APIUser & { guilds: MeGuild[]; isGlobalAdmin: boolean };
@@ -28,6 +28,17 @@ export async function fetchMe(discordAccessToken: string, force = false): Promis
 	const discordUser = await discordAPIOAuth.users.getCurrent({ auth });
 	const guildsRaw = await discordAPIOAuth.users.getGuilds({}, { auth });
 
+	const guildsByBot = await promiseAllObject(
+		Object.fromEntries(
+			BOTS.map((bot) => [
+				bot,
+				context.redis
+					.get(GlobalCaches.GuildList.key(bot))
+					.then((data) => (data ? GlobalCaches.GuildList.recipe.decode(data).guilds : [])),
+			]),
+		) as Record<BotId, Promise<string[]>>,
+	);
+
 	const guilds = guildsRaw.map<MeGuild>(({ id, name, icon, owner, permissions }) => ({
 		id,
 		name,
@@ -39,7 +50,7 @@ export async function fetchMe(discordAccessToken: string, force = false): Promis
 				BigInt(permissions),
 				PermissionFlagsBits.ManageGuild | PermissionFlagsBits.Administrator,
 			) || owner,
-		bots: [],
+		bots: BOTS.filter((bot) => guildsByBot[bot]?.includes(id)),
 	}));
 
 	const me: Me = {