Join live session on fork

Author: CompuIves

packages/app/src/app/overmind/namespaces/editor/actions.ts

@@ -66,6 +66,11 @@ export const sandboxChanged: AsyncAction<{ id: string }> = withLoadApp<{
   // This happens when we fork. This can be avoided with state first routing
   if (state.editor.isForkingSandbox) {
     effects.vscode.openModule(state.editor.currentModule);
+
+    await actions.editor.internal.initializeLiveSandbox(
+      state.editor.currentSandbox
+    );
+
     state.editor.isForkingSandbox = false;
     return;
   }

packages/app/src/app/overmind/namespaces/live/actions.ts

@@ -194,13 +194,11 @@ export const onRemoveEditorClicked: Action<any> = (
 export const onSessionCloseClicked: Action = ({ actions, effects }) => {
   effects.live.sendClosed();
   actions.live.internal.disconnect();
-  actions.live.internal.reset();
 };
 
 export const onNavigateAway: Action = ({ actions, state }) => {
   if (state.live.isLive) {
     actions.live.internal.disconnect();
-    actions.live.internal.reset();
   }
 };
 

packages/app/src/app/overmind/namespaces/live/internalActions.ts

@@ -47,9 +47,9 @@ export const reset: Action = ({ state, actions, effects }) => {
   effects.live.resetClients();
 };
 
-export const disconnect: Action = ({ effects }) => {
-  effects.live.resetClients();
+export const disconnect: Action = ({ effects, actions }) => {
   effects.live.disconnect();
+  actions.live.internal.reset();
 };
 
 export const initialize: AsyncAction<string, Sandbox> = async (

packages/app/src/app/overmind/namespaces/live/liveMessageOperators.ts

@@ -17,9 +17,10 @@ export const onJoin: Operator<LiveMessage<{
 }>> = mutate(({ effects, state }, { data }) => {
   state.live.liveUserId = data.live_user_id;
 
-  effects.notificationToast.success(
-    state.live.isTeam ? 'Connected to Live Team!' : 'Connected to Live!'
-  );
+  // Show message to confirm that you've joined a live session if you're not the owner
+  if (!state.live.isCurrentEditor) {
+    effects.notificationToast.success('Connected to Live!');
+  }
 
   if (state.live.reconnecting) {
     effects.live.getAllClients().forEach(client => {