yuuza/outline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Error in WebhookProcessor when team is permanatly destroyed

Browse Source
This commit is contained in:
Tom Moor
2022-07-26 22:33:48 +01:00
parent 2794057738
commit ea28dc46eb
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/commands/starCreator.ts
View File

@@ -54,7 +54,7 @@ export default async function starCreator({
index = fractionalIndex(null, stars.length ? stars[0].index : null); index = fractionalIndex(null, stars.length ? stars[0].index : null);
} }
const response = await Star.findOrCreate({ const [star, isCreated] = await Star.findOrCreate({
where: documentId where: documentId
? { ? {
userId: user.id, userId: user.id,
@@ -69,12 +69,12 @@ export default async function starCreator({
}, },
transaction, transaction,
}); });
const star = response[0];
if (response[1]) { if (isCreated) {
await Event.create( await Event.create(
{ {
name: "stars.create", name: "stars.create",
teamId: user.teamId,
modelId: star.id, modelId: star.id,
userId: user.id, userId: user.id,
actorId: user.id, actorId: user.id,

4
server/queues/processors/WebhookProcessor.ts
View File

@@ -7,6 +7,10 @@ export default class WebhookProcessor extends BaseProcessor {
static applicableEvents: ["*"] = ["*"]; static applicableEvents: ["*"] = ["*"];
async perform(event: Event) { async perform(event: Event) {
if (!event.teamId) {
return;
}
const webhookSubscriptions = await WebhookSubscription.findAll({ const webhookSubscriptions = await WebhookSubscription.findAll({
where: { where: {
enabled: true, enabled: true,