mirror of
https://github.com/thelounge/thelounge.git
synced 2024-05-19 06:36:46 +02:00
Fix sqlite tests?
This commit is contained in:
parent
db5eae414c
commit
8f27e03b40
|
@ -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) {
|
||||
|
|
|
@ -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"
|
||||
/>
|
||||
</template>
|
||||
|
@ -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;
|
||||
});
|
||||
|
|
|
@ -28,8 +28,8 @@ export default defineComponent({
|
|||
const networkData = ref<NetworkFormDefaults | null>(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}) => {
|
||||
|
|
|
@ -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,
|
||||
});
|
||||
};
|
||||
|
|
|
@ -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(
|
||||
|
|
|
@ -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) {
|
||||
|
|
2
src/plugins/messageStorage/types.d.ts
vendored
2
src/plugins/messageStorage/types.d.ts
vendored
|
@ -26,7 +26,7 @@ export type SearchQuery = {
|
|||
searchTerm: string;
|
||||
networkUuid: string;
|
||||
channelName: string;
|
||||
offset: string;
|
||||
offset: number | string;
|
||||
};
|
||||
|
||||
export type SearchResponse =
|
||||
|
|
2
test/fixtures/.thelounge/sts-policies.json
vendored
2
test/fixtures/.thelounge/sts-policies.json
vendored
|
@ -3,6 +3,6 @@
|
|||
"host": "irc.example.com",
|
||||
"port": 7000,
|
||||
"duration": 3600,
|
||||
"expires": 1654037554847
|
||||
"expires": 1654038111401
|
||||
}
|
||||
]
|
||||
|
|
Loading…
Reference in a new issue