diff --git a/api/chatHistory.js b/api/chatHistory.js index ae3e0ba..9578176 100644 --- a/api/chatHistory.js +++ b/api/chatHistory.js @@ -2,11 +2,11 @@ const path = require("path"); const { history, clearHistory } = require(path.join(__dirname + "/../api/redis")); const getAllHistory = (req, res) => { - let { skip, take } = req.query; - skip = !isNaN(skip) ? Number(skip) : undefined; - take = !isNaN(take) ? Number(take) : undefined; + let { page, limit } = req.query; + page = !isNaN(page) ? Number(page) : undefined; + limit = !isNaN(limit) ? Number(limit) : undefined; - return history(skip, take) + return history(page, limit) .then(messages => res.json(messages)) .catch(error => res.status(500).json({ message: error.message, diff --git a/src/api.js b/src/api.js index 35a2109..fa5c0c1 100644 --- a/src/api.js +++ b/src/api.js @@ -280,10 +280,10 @@ const register = (username, password) => { }); }; -const getChatHistory = (skip = null, take = null) => { +const getChatHistory = (page=1, limit=10) => { const url = new URL("/api/chat/history", BASE_URL); - if (!isNaN(skip)) url.searchParams.append("skip", skip); - if (!isNaN(take)) url.searchParams.append("take", take); + if (!isNaN(page)) url.searchParams.append("page", page); + if (!isNaN(limit)) url.searchParams.append("limit", limit); return fetch(url.href).then(resp => resp.json()); };