Skip to content

Commit

Permalink
Fixes for chat and username.
Browse files Browse the repository at this point in the history
  • Loading branch information
michelinewu committed Jan 6, 2025
1 parent 98e9426 commit 0f576ae
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
9 changes: 6 additions & 3 deletions app/components-react/root/LiveDock.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,8 @@ function LiveDock(p: { onLeft: boolean }) {
return <></>;
}

const showKickInfo = primaryChat === 'kick';
const showKickInfo =
visibleChat === 'kick' || (visibleChat === 'default' && primaryChat === 'kick');
if (showKickInfo) {
return (
<div
Expand Down Expand Up @@ -475,7 +476,8 @@ function LiveDock(p: { onLeft: boolean }) {
</div>
{!hideStyleBlockers &&
(isPlatform(['twitch', 'trovo']) ||
(isStreaming && isPlatform(['youtube', 'facebook', 'twitter', 'tiktok']))) && (
(isStreaming &&
isPlatform(['youtube', 'facebook', 'twitter', 'tiktok', 'kick']))) && (
<div className={styles.liveDockChat}>
{hasChatTabs && <ChatTabs visibleChat={visibleChat} setChat={setChat} />}

Expand All @@ -491,7 +493,8 @@ function LiveDock(p: { onLeft: boolean }) {
</div>
)}
{(!ctrl.platform ||
(isPlatform(['youtube', 'facebook', 'twitter', 'tiktok']) && !isStreaming)) && (
(isPlatform(['youtube', 'facebook', 'twitter', 'tiktok', 'kick']) &&
!isStreaming)) && (
<div className={cx('flex flex--center flex--column', styles.liveDockChatOffline)}>
<img className={styles.liveDockChatImgOffline} src={ctrl.offlineImageSrc} />
{!hideStyleBlockers && <span>{$t('Your chat is currently offline')}</span>}
Expand Down
5 changes: 2 additions & 3 deletions app/components-react/sidebar/PlatformIndicator.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,8 @@ export default function PlatformIndicator({ platform }: IPlatformIndicatorProps)
}

const SinglePlatformIndicator = ({ platform }: Pick<IPlatformIndicatorProps, 'platform'>) => {
const username = !['instagram', 'kick'].includes(platform?.type ?? '')
? undefined
: platform?.username;
const username =
platform?.type === 'instagram' || platform?.type === 'kick' ? undefined : platform?.username;

return (
<>
Expand Down
2 changes: 1 addition & 1 deletion app/services/platforms/kick.ts
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ export class KickService
}

get liveDockEnabled(): boolean {
return this.streamingService.views.isMultiplatformMode;
return true;
}

get chatUrl(): string {
Expand Down

0 comments on commit 0f576ae

Please sign in to comment.