From 8f27e03b4007cdb91e5ff9a29e9dfa937bbe7bed Mon Sep 17 00:00:00 2001 From: Max Leiter Date: Tue, 31 May 2022 15:06:45 -0700 Subject: [PATCH] Fix sqlite tests? --- client/components/MessageSearchForm.vue | 2 +- client/components/RoutedChat.vue | 4 ++-- client/components/Windows/NetworkEdit.vue | 4 ++-- client/components/Windows/SearchResults.vue | 6 +++--- client/js/keybinds.ts | 2 +- src/plugins/messageStorage/sqlite.ts | 10 +++++----- src/plugins/messageStorage/types.d.ts | 2 +- test/fixtures/.thelounge/sts-policies.json | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/client/components/MessageSearchForm.vue b/client/components/MessageSearchForm.vue index 08664e16..98b1a0b2 100644 --- a/client/components/MessageSearchForm.vue +++ b/client/components/MessageSearchForm.vue @@ -111,7 +111,7 @@ export default defineComponent({ }); onMounted(() => { - searchInput.value = String(route.query.q); + searchInput.value = String(route.query.q || ""); searchOpened.value = onSearchPage.value; if (searchInputField.value && !searchInput.value && searchOpened.value) { diff --git a/client/components/RoutedChat.vue b/client/components/RoutedChat.vue index 90b2ab30..9aa5992a 100644 --- a/client/components/RoutedChat.vue +++ b/client/components/RoutedChat.vue @@ -3,7 +3,7 @@ v-if="activeChannel" :network="activeChannel.network" :channel="activeChannel.channel" - :focused="String(route.query.focused)" + :focused="String(route.query.focused || '')" @channel-changed="channelChanged" /> @@ -27,7 +27,7 @@ export default defineComponent({ const store = useStore(); const activeChannel = computed(() => { - const chanId = parseInt(String(route.params.id), 10); + const chanId = parseInt(String(route.params.id || ""), 10); const channel = store.getters.findChannel(chanId); return channel; }); diff --git a/client/components/Windows/NetworkEdit.vue b/client/components/Windows/NetworkEdit.vue index 9c6d94b2..420f7aee 100644 --- a/client/components/Windows/NetworkEdit.vue +++ b/client/components/Windows/NetworkEdit.vue @@ -28,8 +28,8 @@ export default defineComponent({ const networkData = ref(null); const setNetworkData = () => { - socket.emit("network:get", String(route.params.uuid)); - networkData.value = store.getters.findNetwork(String(route.params.uuid)); + socket.emit("network:get", String(route.params.uuid || "")); + networkData.value = store.getters.findNetwork(String(route.params.uuid || "")); }; const handleSubmit = (data: {uuid: string; name: string}) => { diff --git a/client/components/Windows/SearchResults.vue b/client/components/Windows/SearchResults.vue index 8f541a38..c57f7cfd 100644 --- a/client/components/Windows/SearchResults.vue +++ b/client/components/Windows/SearchResults.vue @@ -141,7 +141,7 @@ export default defineComponent({ }); const chan = computed(() => { - const chanId = parseInt(String(route.params.id), 10); + const chanId = parseInt(String(route.params.id || ""), 10); return store.getters.findChannel(chanId); }); @@ -198,7 +198,7 @@ export default defineComponent({ socket.emit("search", { networkUuid: network.value?.uuid, channelName: channel.value?.name, - searchTerm: String(route.query.q), + searchTerm: String(route.query.q || ""), offset: offset.value, }); }; @@ -217,7 +217,7 @@ export default defineComponent({ socket.emit("search", { networkUuid: network.value?.uuid, channelName: channel.value?.name, - searchTerm: String(route.query.q), + searchTerm: String(route.query.q || ""), offset: offset.value + 1, }); }; diff --git a/client/js/keybinds.ts b/client/js/keybinds.ts index cf02baf4..daae113a 100644 --- a/client/js/keybinds.ts +++ b/client/js/keybinds.ts @@ -127,7 +127,7 @@ Mousetrap.bind(["alt+/"], async function (e) { return false; }); -function jumpToChannel(targetChannel) { +function jumpToChannel(targetChannel: ClientChan) { switchToChannel(targetChannel); const element = document.querySelector( diff --git a/src/plugins/messageStorage/sqlite.ts b/src/plugins/messageStorage/sqlite.ts index 72e108fe..a7619d0f 100644 --- a/src/plugins/messageStorage/sqlite.ts +++ b/src/plugins/messageStorage/sqlite.ts @@ -240,8 +240,8 @@ class SqliteMessageStorage implements ISqliteMessageStorage { select += " ORDER BY time DESC LIMIT ? OFFSET ? "; params.push(maxResults.toString()); - const offset = parseInt(query.offset, 10) || 0; - params.push(query.offset); + query.offset = parseInt(query.offset as string, 10) || 0; + params.push(String(query.offset)); return new Promise((resolve, reject) => { this.database.all(select, params, (err, rows) => { @@ -252,8 +252,8 @@ class SqliteMessageStorage implements ISqliteMessageStorage { searchTerm: query.searchTerm, target: query.channelName, networkUuid: query.networkUuid, - offset: offset, - results: parseSearchRowsToMessages(query.offset, rows).reverse(), + offset: query.offset as number, + results: parseSearchRowsToMessages(query.offset as number, rows).reverse(), }; resolve(response); } @@ -269,7 +269,7 @@ class SqliteMessageStorage implements ISqliteMessageStorage { export default SqliteMessageStorage; // TODO: type any -function parseSearchRowsToMessages(id: string, rows: any[]) { +function parseSearchRowsToMessages(id: number, rows: any[]) { const messages: Msg[] = []; for (const row of rows) { diff --git a/src/plugins/messageStorage/types.d.ts b/src/plugins/messageStorage/types.d.ts index dd5aad1b..6dfa20db 100644 --- a/src/plugins/messageStorage/types.d.ts +++ b/src/plugins/messageStorage/types.d.ts @@ -26,7 +26,7 @@ export type SearchQuery = { searchTerm: string; networkUuid: string; channelName: string; - offset: string; + offset: number | string; }; export type SearchResponse = diff --git a/test/fixtures/.thelounge/sts-policies.json b/test/fixtures/.thelounge/sts-policies.json index 1858cf26..b046f95a 100644 --- a/test/fixtures/.thelounge/sts-policies.json +++ b/test/fixtures/.thelounge/sts-policies.json @@ -3,6 +3,6 @@ "host": "irc.example.com", "port": 7000, "duration": 3600, - "expires": 1654037554847 + "expires": 1654038111401 } ]