/[sudobot]/trunk/src/api/controllers/UserController.ts
ViewVC logotype

Diff of /trunk/src/api/controllers/UserController.ts

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 448 by rakin, Mon Jul 29 17:30:01 2024 UTC revision 449 by rakin, Mon Jul 29 17:30:18 2024 UTC
# Line 27  import KeyValuePair from "../../types/Ke Line 27  import KeyValuePair from "../../types/Ke
27  import { NextFunction, Response as ExpressResponse } from "express";  import { NextFunction, Response as ExpressResponse } from "express";
28  import ValidatorError from "../middleware/ValidatorError";  import ValidatorError from "../middleware/ValidatorError";
29  import RequireAuth from "../middleware/RequireAuth";  import RequireAuth from "../middleware/RequireAuth";
30    import { User as DiscordUser } from "discord.js";
31    
32  function RequireAdmin(request: Request, response: ExpressResponse, next: NextFunction) {  function RequireAdmin(request: Request, response: ExpressResponse, next: NextFunction) {
33      if (!request.user?.isAdmin) {      if (!request.user?.isAdmin) {
# Line 179  export default class UserController exte Line 180  export default class UserController exte
180              await user.save();              await user.save();
181          }          }
182    
183            let discordUser: DiscordUser | undefined;
184    
185            try {
186                discordUser = await this.client.users.fetch(user.discord_id);
187            }
188            catch (e) {
189                console.log(e);
190            }
191    
192            console.log(this.client.guilds.cache.map(g => g.id));
193            console.log(user.guilds);
194    
195          return {          return {
196              message: "Login successful",              message: "Login successful",
197              username,              username,
198              token,              token,
199                user: discordUser,
200              expires: new Date(user.tokenUpdatedAt!.getTime() + (2 * 24 * 60 * 60 * 1000)),              expires: new Date(user.tokenUpdatedAt!.getTime() + (2 * 24 * 60 * 60 * 1000)),
201              guilds: this.client.guilds.cache.filter(g => user.guilds.includes(g.id) ?? false)              guilds: this.client.guilds.cache.filter(g => user.guilds.includes(g.id))
202          };          };
203      }      }
204  }  }

Legend:
Removed from v.448  
changed lines
  Added in v.449

[email protected]
ViewVC Help
Powered by ViewVC 1.1.26