Node.js based forum software built for the modern web
fix: chat switch, and error display if route is 404 and its not a v3 route
Barış Soner Uşaklı6415d646064a
diff --git a/public/src/client/chats.js b/public/src/client/chats.jsindex 5a5fade697..19d9a37693 100644--- a/public/src/client/chats.js+++ b/public/src/client/chats.js@@ -645,14 +645,18 @@ define('forum/chats', [params.set('switch', 1);const url = `/user/${ajaxify.data.userslug}/chats/${roomId}?${params.toString()}`;const dataUrl = `/api/${url}`;- const payload = await api.get(dataUrl).catch(alerts.error);- const html = await app.parseAndTranslate('partials/chats/message-window', payload);+ try {+ const payload = await api.get(dataUrl);+ const html = await app.parseAndTranslate('partials/chats/message-window', payload);+ chatMainWrapper.html(html);+ html.find('.timeago').timeago();+ ajaxify.data = { ...ajaxify.data, ...payload, roomId: roomId };+ } catch (err) {+ return alerts.error(err);+ }- chatMainWrapper.html(html);chatMainWrapper.attr('data-roomid', roomId);chatNavWrapper = $('[component="chat/nav-wrapper"]');- html.find('.timeago').timeago();- ajaxify.data = { ...ajaxify.data, ...payload, roomId: roomId };ajaxify.updateTitle(ajaxify.data.title);$('body').toggleClass('chat-loaded', !!roomId);if (!utils.isMobile()) {diff --git a/public/src/modules/api.js b/public/src/modules/api.jsindex 752505016e..4443f38c38 100644--- a/public/src/modules/api.js+++ b/public/src/modules/api.js@@ -89,7 +89,7 @@ async function xhr(options) {const jsonError = isJSON && (response.status?.message || response.error || '');throw new Error(isJSON && jsonError ?jsonError :- response+ typeof response === 'string' ? response : res.statusText);}throw new Error(res.statusText);