diff --git a/packages/usdk/packages/upstreet-agent/packages/react-agents/components/plugins/discord.tsx b/packages/usdk/packages/upstreet-agent/packages/react-agents/components/plugins/discord.tsx index ba06c7629..b90368102 100644 --- a/packages/usdk/packages/upstreet-agent/packages/react-agents/components/plugins/discord.tsx +++ b/packages/usdk/packages/upstreet-agent/packages/react-agents/components/plugins/discord.tsx @@ -1,5 +1,5 @@ import { useContext, useEffect } from 'react'; -import { useAgent, useAuthToken, useConversation } from 'react-agents'; +import { useAgent, useAuthToken, useConversation, useEnv } from 'react-agents'; import type { DiscordArgs, DiscordProps, @@ -10,7 +10,6 @@ import { export const Discord: React.FC = (props: DiscordProps) => { const { - token, channels, dms, userWhitelist, @@ -20,9 +19,16 @@ export const Discord: React.FC = (props: DiscordProps) => { const appContextValue = useContext(AppContext); const codecs = appContextValue.useCodecs(); const authToken = useAuthToken(); + const env = useEnv(); useEffect(() => { if (!conversation) { + const token = (env as { DISCORD_BOT_TOKEN: string }).DISCORD_BOT_TOKEN; + + if (!token) { + throw new Error('DISCORD_BOT_TOKEN is not set in env.txt'); + } + const args: DiscordArgs = { token, channels: channels ? (Array.isArray(channels) ? channels : [channels]) : [], @@ -38,7 +44,7 @@ export const Discord: React.FC = (props: DiscordProps) => { }; } }, [ - token, + (env as { DISCORD_BOT_TOKEN: string }).DISCORD_BOT_TOKEN, JSON.stringify(channels), JSON.stringify(dms), JSON.stringify(userWhitelist), diff --git a/packages/usdk/packages/upstreet-agent/packages/react-agents/types/react-agents.d.ts b/packages/usdk/packages/upstreet-agent/packages/react-agents/types/react-agents.d.ts index fee90b32a..fbca12c67 100644 --- a/packages/usdk/packages/upstreet-agent/packages/react-agents/types/react-agents.d.ts +++ b/packages/usdk/packages/upstreet-agent/packages/react-agents/types/react-agents.d.ts @@ -120,7 +120,6 @@ export type TtsArgs = { export type DiscordRoomSpec = RegExp | string; export type DiscordRoomSpecs = DiscordRoomSpec | DiscordRoomSpec[]; export type DiscordProps = { - token: string; channels?: DiscordRoomSpecs; dms?: DiscordRoomSpecs; userWhitelist?: string[]; diff --git a/packages/usdk/packages/upstreet-agent/packages/react-agents/util/agent-features-renderer.tsx b/packages/usdk/packages/upstreet-agent/packages/react-agents/util/agent-features-renderer.tsx index e78e27993..130f0cc66 100644 --- a/packages/usdk/packages/upstreet-agent/packages/react-agents/util/agent-features-renderer.tsx +++ b/packages/usdk/packages/upstreet-agent/packages/react-agents/util/agent-features-renderer.tsx @@ -287,11 +287,11 @@ export const featureRenderers = { ); }, - discord: ({token, channels}) => { - if (token) { + discord: ({channels}) => { + if (channels) { channels = channels && channels.map((c: string) => c.trim()).filter(Boolean); return ( - + ); } else { return null; diff --git a/packages/usdk/packages/upstreet-agent/packages/react-agents/util/agent-features-spec.mjs b/packages/usdk/packages/upstreet-agent/packages/react-agents/util/agent-features-spec.mjs index f7bbfdf8d..1404e1d67 100644 --- a/packages/usdk/packages/upstreet-agent/packages/react-agents/util/agent-features-spec.mjs +++ b/packages/usdk/packages/upstreet-agent/packages/react-agents/util/agent-features-spec.mjs @@ -141,12 +141,11 @@ export const featureSpecs = [ `, schema: z.union([ z.object({ - token: z.string(), channels: z.array(z.string()), }), z.null(), ]), - examples: [{ token: 'YOUR_DISCORD_BOT_TOKEN', channels: ['general', 'voice'], }], + examples: [{ channels: ['general', 'voice'], }], // imports: (discord) => { // if (discord.token) { // return ['Discord'];