deblan-mirror/thelounge
deblan-mirror/thelounge
1
0
Fork 0
mirror of https://github.com/thelounge/thelounge.git synced 2024-05-13 03:36:56 +02:00
Code Issues Projects Releases Wiki Activity

SearchQuery: offset is always a number

Browse source 
Fix type confusion that specified offset to be a string, it is
always a number.
This commit is contained in:
Reto Brunner 2022-11-12 22:50:56 +01:00
parent dca202427a
commit 8095d9e88a
3 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
server/plugins/messageStorage/sqlite.ts
View file

@ -224,7 +224,7 @@ class SqliteMessageStorage implements ISqliteMessageStorage {
let select =
'SELECT msg, type, time, network, channel FROM messages WHERE type = "message" AND json_extract(msg, "$.text") LIKE ? ESCAPE \'@\'';
const params = [`%${escapedSearchTerm}%`];
const params: any[] = [`%${escapedSearchTerm}%`];
if (query.networkUuid) {
select += " AND network = ? ";
@ -239,9 +239,8 @@ class SqliteMessageStorage implements ISqliteMessageStorage {
const maxResults = 100;
select += " ORDER BY time DESC LIMIT ? OFFSET ? ";
params.push(maxResults.toString());
query.offset = parseInt(query.offset as string, 10) || 0;
params.push(String(query.offset));
params.push(maxResults);
params.push(query.offset);
return new Promise((resolve, reject) => {
this.database.all(select, params, (err, rows) => {
@ -252,8 +251,8 @@ class SqliteMessageStorage implements ISqliteMessageStorage {
searchTerm: query.searchTerm,
target: query.channelName,
networkUuid: query.networkUuid,
offset: query.offset as number,
results: parseSearchRowsToMessages(query.offset as number, rows).reverse(),
offset: query.offset,
results: parseSearchRowsToMessages(query.offset, rows).reverse(),
};
resolve(response);
}

2
server/plugins/messageStorage/types.d.ts vendored
View file

@ -26,7 +26,7 @@ export type SearchQuery = {
searchTerm: string;
networkUuid: string;
channelName: string;
offset: number | string;
offset: number;
};
export type SearchResponse =

8
test/plugins/sqlite.ts
View file

@ -167,7 +167,9 @@ describe("SQLite Message Storage", function () {
.search({
searchTerm: "msg",
networkUuid: "retrieval-order-test-network",
} as any)
channelName: "",
offset: 0,
})
.then((messages) => {
// @ts-expect-error Property 'results' does not exist on type '[]'.
expect(messages.results).to.have.lengthOf(100);
@ -192,7 +194,9 @@ describe("SQLite Message Storage", function () {
.search({
searchTerm: query,
networkUuid: "this-is-a-network-guid2",
} as any)
channelName: "",
offset: 0,
})
.then((messages) => {
// @ts-expect-error Property 'results' does not exist on type '[]'.
expect(messages.results.map((i) => i.text)).to.deep.equal(expected);