deblan-mirror/thelounge
deblan-mirror/thelounge
1
0
Fork 0
mirror of https://github.com/thelounge/thelounge.git synced 2024-05-23 16:42:15 +02:00
Code Issues Projects Releases Wiki Activity

sqlite: use serialize_fetchall in getMessages

Browse source
This commit is contained in:
Reto Brunner 2022-08-27 14:55:35 +02:00 committed by Reto Brunner
parent cc3302e874
commit ee8223c200
1 changed files with 15 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -168,7 +168,7 @@ class SqliteMessageStorage implements ISqliteMessageStorage {
* @param network Network - Network object where the channel is * @param network Network - Network object where the channel is
* @param channel Channel - Channel object for which to load messages for * @param channel Channel - Channel object for which to load messages for
*/ */
getMessages(network: Network, channel: Channel) { async getMessages(network: Network, channel: Channel): Promise<Message[]> {
if (!this.isEnabled || Config.values.maxHistory === 0) { if (!this.isEnabled || Config.values.maxHistory === 0) {
return Promise.resolve([]); return Promise.resolve([]);
} }
@ -176,32 +176,23 @@ class SqliteMessageStorage implements ISqliteMessageStorage {
// If unlimited history is specified, load 100k messages // If unlimited history is specified, load 100k messages
const limit = Config.values.maxHistory < 0 ? 100000 : Config.values.maxHistory; const limit = Config.values.maxHistory < 0 ? 100000 : Config.values.maxHistory;
return new Promise((resolve, reject) => { const rows = await this.serialize_fetchall(
this.database.serialize(() => "SELECT msg, type, time FROM messages WHERE network = ? AND channel = ? ORDER BY time DESC LIMIT ?",
this.database.all( network.uuid,
"SELECT msg, type, time FROM messages WHERE network = ? AND channel = ? ORDER BY time DESC LIMIT ?", channel.name.toLowerCase(),
[network.uuid, channel.name.toLowerCase(), limit], limit
(err, rows) => { );
if (err) {
return reject(err);
}
resolve( return rows.reverse().map((row: any) => {
rows.reverse().map((row) => { const msg = JSON.parse(row.msg);
const msg = JSON.parse(row.msg); msg.time = row.time;
msg.time = row.time; msg.type = row.type;
msg.type = row.type;
const newMsg = new Msg(msg); const newMsg = new Msg(msg);
newMsg.id = this.client.idMsg++; newMsg.id = this.client.idMsg++;
return newMsg; return newMsg;
}) }) as Message[];
);
}
)
);
}) as Promise<Message[]>;
} }
search(query: SearchQuery): Promise<SearchResponse> { search(query: SearchQuery): Promise<SearchResponse> {