From c9b581c84214f21fcb5ce49da565825b0e9b4d22 Mon Sep 17 00:00:00 2001 From: Nobody Date: Tue, 8 Mar 2022 10:52:54 -0300 Subject: fix(util): working invisible status type --- util/src/interfaces/Status.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'util/src/interfaces') diff --git a/util/src/interfaces/Status.ts b/util/src/interfaces/Status.ts index c4dab586..5d2e1bba 100644 --- a/util/src/interfaces/Status.ts +++ b/util/src/interfaces/Status.ts @@ -1,4 +1,4 @@ -export type Status = "idle" | "dnd" | "online" | "offline"; +export type Status = "idle" | "dnd" | "online" | "offline" | "invisible"; export interface ClientStatus { desktop?: string; // e.g. Windows/Linux/Mac -- cgit 1.5.1 From c63047284d2a1f85d670f438183584b0b1b03452 Mon Sep 17 00:00:00 2001 From: Erkin Alp Güney Date: Sat, 19 Mar 2022 15:17:11 +0300 Subject: add the necessary types for server assisted selfbotting --- util/src/interfaces/Interaction.ts | 2 ++ 1 file changed, 2 insertions(+) (limited to 'util/src/interfaces') diff --git a/util/src/interfaces/Interaction.ts b/util/src/interfaces/Interaction.ts index 3cafb2d5..5d3aae24 100644 --- a/util/src/interfaces/Interaction.ts +++ b/util/src/interfaces/Interaction.ts @@ -12,11 +12,13 @@ export interface Interaction { } export enum InteractionType { + SelfCommand = 0, Ping = 1, ApplicationCommand = 2, } export enum InteractionResponseType { + SelfCommandResponse = 0, Pong = 1, Acknowledge = 2, ChannelMessage = 3, -- cgit 1.5.1 From d08689b4180c2a66382ca9a6174b1c177076a65f Mon Sep 17 00:00:00 2001 From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com> Date: Tue, 5 Apr 2022 19:58:34 +1000 Subject: User Notes (#707) * Notes implementation. Bug: Client does not save note locally after uploading to server. Client does save after reloading page. Is this due to the response being sent by PUT? * I don't know why the client doesn't do optimistic UI updates with this, or any updates at all without reloading the page * Added USER_NOTE_UPDATE event, thanks @TheRealGeoDash2019 ! --- api/src/routes/users/@me/notes.ts | 35 ++++++++++++++++++++++++++++++----- util/src/entities/User.ts | 4 ++++ util/src/interfaces/Event.ts | 1 + 3 files changed, 35 insertions(+), 5 deletions(-) (limited to 'util/src/interfaces') diff --git a/api/src/routes/users/@me/notes.ts b/api/src/routes/users/@me/notes.ts index 96067bf5..4887b191 100644 --- a/api/src/routes/users/@me/notes.ts +++ b/api/src/routes/users/@me/notes.ts @@ -1,14 +1,39 @@ import { Request, Response, Router } from "express"; import { route } from "@fosscord/api"; +import { User, emitEvent } from "@fosscord/util"; const router: Router = Router(); +router.get("/:id", route({}), async (req: Request, res: Response) => { + const { id } = req.params; + const user = await User.findOneOrFail({ where: { id: req.user_id }, select: ["notes"] }); + + const note = user.notes[id]; + return res.json({ + note: note, + note_user_id: id, + user_id: user.id, + }); +}); + router.put("/:id", route({}), async (req: Request, res: Response) => { - //TODO - res.json({ - message: "Unknown User", - code: 10013 - }).status(404); + const { id } = req.params; + const user = await User.findOneOrFail({ where: { id: req.user_id } }); + const noteUser = await User.findOneOrFail({ where: { id: id }}); //if noted user does not exist throw + const { note } = req.body; + + await User.update({ id: req.user_id }, { notes: { ...user.notes, [noteUser.id]: note } }); + + await emitEvent({ + event: "USER_NOTE_UPDATE", + data: { + note: note, + id: noteUser.id + }, + user_id: user.id, + }) + + return res.status(204); }); export default router; diff --git a/util/src/entities/User.ts b/util/src/entities/User.ts index ed7bd4ce..7091ee24 100644 --- a/util/src/entities/User.ts +++ b/util/src/entities/User.ts @@ -164,6 +164,9 @@ export class User extends BaseClass { @Column({ type: "simple-json", select: false }) settings: UserSettings; + @Column({ type: "simple-json" }) + notes: { [key: string]: string }; //key is ID of user + toPublicUser() { const user: any = {}; PublicUserProjection.forEach((x) => { @@ -271,6 +274,7 @@ export class User extends BaseClass { }, settings: { ...defaultSettings, locale: language }, fingerprints: [], + notes: {}, }); await user.save(); diff --git a/util/src/interfaces/Event.ts b/util/src/interfaces/Event.ts index a5253c09..416082ed 100644 --- a/util/src/interfaces/Event.ts +++ b/util/src/interfaces/Event.ts @@ -623,6 +623,7 @@ export type EVENT = | "PRESENCE_UPDATE" | "TYPING_START" | "USER_UPDATE" + | "USER_NOTE_UPDATE" | "WEBHOOKS_UPDATE" | "INTERACTION_CREATE" | "VOICE_STATE_UPDATE" -- cgit 1.5.1