@dosgato/api 0.0.107 → 0.0.109
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -29,10 +29,10 @@ export async function createSiteComment(siteId, comment, userInternalId, tdb = d
|
|
|
29
29
|
}
|
|
30
30
|
export async function createSiteComments(siteId, comments, fallbackUser) {
|
|
31
31
|
let binds = [];
|
|
32
|
-
const users = await db.getall(`SELECT id, login FROM users WHERE login IN ${db.in(binds, comments.map(c => c.login))}`, binds);
|
|
32
|
+
const users = await db.getall(`SELECT id, login FROM users WHERE login IN (${db.in(binds, comments.map(c => c.login))})`, binds);
|
|
33
33
|
const userByLogin = keyby(users, 'login');
|
|
34
34
|
binds = [];
|
|
35
35
|
return await db.insert(`INSERT INTO comments (siteId, comment, createdAt, createdBy)
|
|
36
|
-
VALUES ${db.in(binds, comments.map(c => [siteId, c.comment, c.date, userByLogin[c.login] ?? fallbackUser.internalId]))}`, binds);
|
|
36
|
+
VALUES ${db.in(binds, comments.map(c => [siteId, c.comment, c.date, userByLogin[c.login].id ?? fallbackUser.internalId]))}`, binds);
|
|
37
37
|
}
|
|
38
38
|
//# sourceMappingURL=sitecomment.database.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sitecomment.database.js","sourceRoot":"","sources":["../../src/sitecomment/sitecomment.database.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,iBAAiB,CAAA;AAEhC,OAAO,EAAE,WAAW,EAAqC,MAAM,gBAAgB,CAAA;AAC/E,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAA;AAErC,MAAM,CAAC,KAAK,UAAU,eAAe,CAAE,MAA0B;IAC/D,MAAM,KAAK,GAAa,EAAE,CAAA;IAC1B,MAAM,KAAK,GAAa,EAAE,CAAA;IAE1B,IAAI,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE;QACvB,KAAK,CAAC,IAAI,CAAC,mBAAmB,EAAE,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;KAC3D;IAED,IAAI,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE;QAC3B,KAAK,CAAC,IAAI,CAAC,uBAAuB,EAAE,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;KACnE;IACD,IAAI,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE;QACzB,KAAK,CAAC,IAAI,CAAC,mBAAmB,EAAE,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;KAC7D;IACD,IAAI,KAAK,GAAG,kCAAkC,CAAA;IAC9C,IAAI,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE;QACzB,KAAK,IAAI,oDAAoD,CAAA;KAC9D;IACD,IAAI,KAAK,CAAC,MAAM,EAAE;QAChB,KAAK,IAAI,UAAU,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAA;KAC5C;IACD,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,CAAA;IAC9C,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC,CAAA;AAC9C,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAE,MAAc,EAAE,OAAe,EAAE,cAAsB,EAAE,MAAiB,EAAE;IACnH,OAAO,MAAM,GAAG,CAAC,MAAM,CAAC;kDACwB,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC,CAAA;AACtF,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAE,MAAc,EAAE,QAA4D,EAAE,YAAkB;IACxI,IAAI,KAAK,GAAU,EAAE,CAAA;IACrB,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,MAAM,CAAgC,
|
|
1
|
+
{"version":3,"file":"sitecomment.database.js","sourceRoot":"","sources":["../../src/sitecomment/sitecomment.database.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,iBAAiB,CAAA;AAEhC,OAAO,EAAE,WAAW,EAAqC,MAAM,gBAAgB,CAAA;AAC/E,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAA;AAErC,MAAM,CAAC,KAAK,UAAU,eAAe,CAAE,MAA0B;IAC/D,MAAM,KAAK,GAAa,EAAE,CAAA;IAC1B,MAAM,KAAK,GAAa,EAAE,CAAA;IAE1B,IAAI,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE;QACvB,KAAK,CAAC,IAAI,CAAC,mBAAmB,EAAE,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;KAC3D;IAED,IAAI,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE;QAC3B,KAAK,CAAC,IAAI,CAAC,uBAAuB,EAAE,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;KACnE;IACD,IAAI,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE;QACzB,KAAK,CAAC,IAAI,CAAC,mBAAmB,EAAE,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;KAC7D;IACD,IAAI,KAAK,GAAG,kCAAkC,CAAA;IAC9C,IAAI,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE;QACzB,KAAK,IAAI,oDAAoD,CAAA;KAC9D;IACD,IAAI,KAAK,CAAC,MAAM,EAAE;QAChB,KAAK,IAAI,UAAU,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAA;KAC5C;IACD,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,CAAA;IAC9C,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC,CAAA;AAC9C,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAE,MAAc,EAAE,OAAe,EAAE,cAAsB,EAAE,MAAiB,EAAE;IACnH,OAAO,MAAM,GAAG,CAAC,MAAM,CAAC;kDACwB,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC,CAAA;AACtF,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAE,MAAc,EAAE,QAA4D,EAAE,YAAkB;IACxI,IAAI,KAAK,GAAU,EAAE,CAAA;IACrB,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,MAAM,CAAgC,+CAA+C,EAAE,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAA;IAC/J,MAAM,WAAW,GAAG,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;IACzC,KAAK,GAAG,EAAE,CAAA;IACV,OAAO,MAAM,EAAE,CAAC,MAAM,CAAC;mCACU,EAAE,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,EAAE,KAAK,CAAC,CAAA;AAC7J,CAAC"}
|
|
@@ -11,12 +11,12 @@ export async function createCommentRoutes(app) {
|
|
|
11
11
|
throw new HttpError(404);
|
|
12
12
|
if (!await ctx.svc(SiteService).mayManageGovernance(site) || !await ctx.svc(GlobalRuleService).mayOverrideStamps())
|
|
13
13
|
throw new HttpError(403);
|
|
14
|
-
if (!req.body?.
|
|
14
|
+
if (!req.body?.length)
|
|
15
15
|
throw new HttpError(400);
|
|
16
|
-
for (const c of req.body
|
|
16
|
+
for (const c of req.body)
|
|
17
17
|
if (isBlank(c.comment) || c.date == null || isBlank(c.login))
|
|
18
18
|
throw new HttpError(422, 'Comment, date, and login are required.');
|
|
19
|
-
await createSiteComments(site.id, req.body
|
|
19
|
+
await createSiteComments(site.id, req.body, user);
|
|
20
20
|
});
|
|
21
21
|
}
|
|
22
22
|
//# sourceMappingURL=sitecomment.routes.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sitecomment.routes.js","sourceRoot":"","sources":["../../src/sitecomment/sitecomment.routes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAA;AAErD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAExH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAE,GAAoB;IAC7D,GAAG,CAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"sitecomment.routes.js","sourceRoot":"","sources":["../../src/sitecomment/sitecomment.routes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAA;AAErD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAExH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAE,GAAoB;IAC7D,GAAG,CAAC,IAAI,CAA4F,wBAAwB,EAAE,KAAK,EAAC,GAAG,EAAC,EAAE;QACxI,MAAM,GAAG,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC,CAAA;QAC5B,MAAM,IAAI,GAAG,MAAM,cAAc,CAAC,GAAG,CAAC,CAAA,CAAC,2BAA2B;QAClE,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;QAC3E,IAAI,CAAC,IAAI;YAAE,MAAM,IAAI,SAAS,CAAC,GAAG,CAAC,CAAA;QACnC,IAAI,CAAC,MAAM,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC,iBAAiB,EAAE;YAAE,MAAM,IAAI,SAAS,CAAC,GAAG,CAAC,CAAA;QAC5I,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM;YAAE,MAAM,IAAI,SAAS,CAAC,GAAG,CAAC,CAAA;QAC/C,KAAK,MAAM,CAAC,IAAI,GAAG,CAAC,IAAI;YAAE,IAAI,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,IAAI,IAAI,IAAI,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC;gBAAE,MAAM,IAAI,SAAS,CAAC,GAAG,EAAE,wCAAwC,CAAC,CAAA;QAC1J,MAAM,kBAAkB,CAAC,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;IACnD,CAAC,CAAC,CAAA;AACJ,CAAC"}
|