diff --git a/rpc/servers.js b/rpc/servers.js index de793ab..157bdff 100644 --- a/rpc/servers.js +++ b/rpc/servers.js @@ -26,16 +26,22 @@ export default ($: AppContext) => ({ const { userId } = (ctx.session: { userId: string }) const srv = $.discord.client.guilds.get(id) - if (srv == null) { return { err: 'not_found' } } + if (userId == null) { + return { + id: id, + server: $.P.serverSlug(srv) + } + } + let gm if (srv.members.has(userId)) { gm = $.discord.gm(id, userId) } else if ($.discord.isRoot(userId)) { - // gm = $.discord.fakeGm({ id: userId }) + gm = $.discord.fakeGm({ id: userId }) } if (gm == null) { diff --git a/ui/pages/_internal/_server.js b/ui/pages/_internal/_server.js index fcd68a0..d709f0c 100644 --- a/ui/pages/_internal/_server.js +++ b/ui/pages/_internal/_server.js @@ -34,7 +34,7 @@ const Hider = styled.div` class Server extends React.Component { static async getInitialProps (ctx: *, rpc: *, router: *) { - const isDiscordBot = ctx.req.headers['user-agent'].includes('Discordbot') + const isDiscordBot = ctx.req && ctx.req.headers['user-agent'].includes('Discordbot') if (ctx.user == null) { if (!isDiscordBot) { redirect(ctx, `/auth/login?r=${router.asPath}`) diff --git a/ui/pages/auth/login.js b/ui/pages/auth/login.js index e21eefc..c1248d1 100644 --- a/ui/pages/auth/login.js +++ b/ui/pages/auth/login.js @@ -129,10 +129,6 @@ export default class AuthLogin extends React.Component