MeowcaTheoRange/TrollCallAPIs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix error

Browse source
This commit is contained in:
MeowcaTheoRange 2023-09-25 12:50:38 -05:00
parent e7f94445da
commit 482593c0e4
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/lib/trollcall/api/message.ts
View file

@ -1,4 +1,4 @@
import { ClientClan, ServerClan } from "@/types/clan"; import { ServerClan } from "@/types/clan";
import { ClientMessage } from "@/types/message"; import { ClientMessage } from "@/types/message";
import { getSingleClan } from "../clan"; import { getSingleClan } from "../clan";
import { ServerMessageToClientMessage } from "../convert/message"; import { ServerMessageToClientMessage } from "../convert/message";
@ -26,8 +26,12 @@ export async function MessageGET(
_id: message.from _id: message.from
}); });
if (from == null) return null; if (from == null) return null;
const serverMessage = await ServerMessageToClientMessage(message); const fullClan = await ClanGET(null, from);
if (fullClan == null) return null;
const endMessage: ClientMessage = {
...(await ServerMessageToClientMessage(message)),
from: fullClan
};
// we know this is not null, as we passed in our own clan // we know this is not null, as we passed in our own clan
serverMessage.from = (await ClanGET(null, from)) as ClientClan; return endMessage;
return serverMessage as ClientMessage;
} }