fix: canonical

packages/chat/src/client/effects.js

@@ -33,6 +33,7 @@ export default ({config: {'%socket': socket}}) => {
     },
     [submitJoin]: async ({dispatch}, {payload}) => {
       const {channel} = payload;
+      try {
         const {canonical, messages, users} = await socket.send(['Join', payload]);
         const realChannel = canonical ? parseChannel(canonical) : channel;
         dispatch(join({
@@ -44,6 +45,10 @@ export default ({config: {'%socket': socket}}) => {
         if (canonical) {
           dispatch(push(`/chat${canonical}`));
         }
+      }
+      catch (error) {
+        dispatch(push('/chat'));
+      }
     },
     [submitLeave]: async ({dispatch}, {payload}) => {
       const {channel} = payload;

packages/chat/src/index.js

@@ -37,12 +37,17 @@ export default {
       req.channel = channel;
       if (validateChannel(channel)) {
         const rendered = renderChannel(channel);
+        try {
           const chat = await ensureCanonical(latus, channel);
           if (chat.name !== rendered) {
             res.redirect(`/chat${chat.name}`);
             return;
           }
         }
+        catch (error) {
+          res.redirect('/chat');
+        }
+      }
       next();
     },
     '@latus/socket/packets': (latus) => ({

packages/chat/src/packets/join.server.js

@@ -1,4 +1,5 @@
 import {ModelMap} from '@latus/db';
+import {parseChannel} from '@reddichat/core';
 
 import ensureCanonical from '../ensure-canonical';
 import joinChannel from '../join-channel';
@@ -12,7 +13,7 @@ export default (latus) => class JoinServer extends Join(latus) {
     const {req} = socket;
     const {User} = ModelMap(latus);
     const chat = await ensureCanonical(latus, channel);
-    const canonical = {...channel, name: chat.name};
+    const canonical = parseChannel(chat.name);
     await joinChannel(latus, canonical, socket);
     const state = await channelState(req, latus, canonical);
     const usernames = Object.fromEntries(await Promise.all(