Merge pull request #12868 from nanaya/chat-empty-join

Show join public channel page if not currently in any channels

Author: notbakaneko

resources/js/chat/conversation-panel.tsx

@@ -12,8 +12,6 @@ import ConversationView from './conversation-view';
 import CreateAnnouncement from './create-announcement';
 import JoinChannels from './join-channels';
 
-const lazerLink = 'https://github.com/ppy/osu/releases';
-
 @observer
 export default class ConversationPanel extends React.Component<Record<string, never>> {
   private readonly disposer: ReturnType<typeof autorun>;
@@ -66,29 +64,20 @@ export default class ConversationPanel extends React.Component<Record<string, ne
       return <CreateAnnouncement />;
     }
 
-    if (selected === 'join') {
+    if (selected === 'join' || core.dataStore.channelStore.channels.size === 0) {
       return <JoinChannels />;
     }
 
     if (selected != null) {
       return <ConversationView />;
     }
 
+    // requested channel not found
     return (
       <div className='chat-conversation-panel__no-channel'>
         <Img2x alt='Art by Badou_Rammsteiner' src='/images/layout/chat/none-yet.png' title='Art by Badou_Rammsteiner' />
-        {core.dataStore.channelStore.channels.size > 0 ? (
-          <>
-            <div className='chat-conversation-panel__title'>{trans('chat.not_found.title')}</div>
-            <div className='chat-conversation-panel__instructions'>{trans('chat.not_found.message')}</div>
-          </>
-        ) : (
-          <>
-            <div className='chat-conversation-panel__title'>{trans('chat.no-conversations.title')}</div>
-            <div className='chat-conversation-panel__instructions'>{trans('chat.no-conversations.howto')}</div>
-            <div dangerouslySetInnerHTML={{ __html: trans('chat.no-conversations.lazer', { link: lazerLink }) }} />
-          </>
-        )}
+        <div className='chat-conversation-panel__title'>{trans('chat.not_found.title')}</div>
+        <div className='chat-conversation-panel__instructions'>{trans('chat.not_found.message')}</div>
       </div>
     );
   }

resources/js/chat/main-view.tsx

@@ -45,6 +45,9 @@ export default class MainView extends React.Component<Record<string, never>> {
   componentDidMount() {
     runInAction(() => {
       core.dataStore.chatState.viewsMounted.add(this);
+      if (core.dataStore.channelStore.channels.size === 0 && core.dataStore.chatState.selectedChannelOrType == null) {
+        core.dataStore.chatState.selectChannel('join');
+      }
     });
   }
 
@@ -59,7 +62,7 @@ export default class MainView extends React.Component<Record<string, never>> {
       <>
         <HeaderV4 theme='chat' />
         <div className='chat osu-page osu-page--chat'>
-          {core.dataStore.channelStore.channels.size > 0 && <ConversationList />}
+          <ConversationList />
           <ConversationPanel />
         </div>
       </>

resources/lang/en/chat.php

@@ -58,12 +58,6 @@
         'send' => 'Send',
     ],
 
-    'no-conversations' => [
-        'howto' => "Start conversations from a user's profile or a usercard popup.",
-        'lazer' => 'Public channels you join via <a href=":link">osu!lazer</a> will also be visible here.',
-        'title' => 'no conversations yet',
-    ],
-
     'join_channels' => [
         'loading' => 'Loading channel list...',
     ],