duckietm/Nitro-V3
1
0
Fork 0
mirror of https://github.com/duckietm/Nitro-V3.git synced 2026-06-19 15:06:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/main'

Browse Source
This commit is contained in:
github-actions[bot]
2026-06-03 10:15:33 +00:00
parent f84103d18f d44787621f
commit 7128f4553b
5 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/customize/CustomizeNickIconView.tsx
+9 -3
View File
@@ -1,4 +1,4 @@
import { AddLinkEventTracker, ILinkEventTracker, PurchaseCatalogPrefixComposer, PurchaseNickIconComposer, PurchasePrefixComposer, RemoveLinkEventTracker, RequestNickIconsComposer, SetActiveNickIconComposer, SetActivePrefixComposer, SetDisplayOrderComposer, UserNickIconsEvent } from '@nitrots/nitro-renderer'; import { AddLinkEventTracker, CustomPrefixPurchaseFailedEvent, ILinkEventTracker, PurchaseCatalogPrefixComposer, PurchaseNickIconComposer, PurchasePrefixComposer, RemoveLinkEventTracker, RequestNickIconsComposer, SetActiveNickIconComposer, SetActivePrefixComposer, SetDisplayOrderComposer, UserNickIconsEvent } from '@nitrots/nitro-renderer';
import data from '@emoji-mart/data'; import data from '@emoji-mart/data';
import Picker from '@emoji-mart/react'; import Picker from '@emoji-mart/react';
import { FC, useEffect, useMemo, useState } from 'react'; import { FC, useEffect, useMemo, useState } from 'react';
@@ -66,6 +66,12 @@ export const CustomizeNickIconView: FC<{}> = () =>
const [ customPrefixFont, setCustomPrefixFont ] = useState(''); const [ customPrefixFont, setCustomPrefixFont ] = useState('');
const [ showEmojiPicker, setShowEmojiPicker ] = useState(false); const [ showEmojiPicker, setShowEmojiPicker ] = useState(false);
useMessageEvent<CustomPrefixPurchaseFailedEvent>(CustomPrefixPurchaseFailedEvent, () =>
{
setIsLoading(false);
setIsVisible(false);
});
useMessageEvent<UserNickIconsEvent>(UserNickIconsEvent, event => useMessageEvent<UserNickIconsEvent>(UserNickIconsEvent, event =>
{ {
const parser = event.getParser(); const parser = event.getParser();
@@ -298,7 +304,7 @@ export const CustomizeNickIconView: FC<{}> = () =>
<NitroCardContentView className="flex max-h-[78vh] flex-col gap-3 overflow-y-auto text-black"> <NitroCardContentView className="flex max-h-[78vh] flex-col gap-3 overflow-y-auto text-black">
<div className="rounded border border-black/10 bg-black/5 p-3"> <div className="rounded border border-black/10 bg-black/5 p-3">
<Text bold>Live preview</Text> <Text bold>Live preview</Text>
<div className="mt-2 flex min-h-[54px] items-center justify-center rounded border border-black/10 bg-[#1f2937] px-3 py-2 text-white"> <div className="mt-2 flex min-h-[54px] items-center justify-center rounded border border-black/10 bg-[#cfe8fb] px-3 py-2 text-[#1f2937]">
<UserIdentityView <UserIdentityView
displayOrder={ displayOrder } displayOrder={ displayOrder }
nickIcon={ activeIcon?.iconKey || '' } nickIcon={ activeIcon?.iconKey || '' }
@@ -509,7 +515,7 @@ export const CustomizeNickIconView: FC<{}> = () =>
Premium fonts add an extra price on top of the custom prefix. Premium fonts add an extra price on top of the custom prefix.
</div> } </div> }
</div> </div>
<div className="rounded border border-black/10 bg-[#1f2937] px-3 py-2 text-white" style={ customPrefixPreviewStyle }> <div className="rounded border border-black/10 bg-[#cfe8fb] px-3 py-2 text-[#1f2937]" style={ customPrefixPreviewStyle }>
<UserIdentityView <UserIdentityView
displayOrder={ displayOrder } displayOrder={ displayOrder }
nickIcon={ activeIcon?.iconKey || '' } nickIcon={ activeIcon?.iconKey || '' }
src/components/groups/views/forums/GroupForumNewThreadView.tsx
+2 -2
View File
@@ -58,8 +58,8 @@ export const GroupForumNewThreadView: FC<GroupForumNewThreadViewProps> = props =
return ( return (
<Column className="h-full p-3" gap={ 2 }> <Column className="h-full p-3" gap={ 2 }>
<Flex gap={ 2 } alignItems="center"> <Flex gap={ 2 } alignItems="center">
<Text pointer underline onClick={ onBack }> <Text pointer bold onClick={ onBack }>
&laquo; { LocalizeText('groupforum.view.back') } <span className="inline-block w-[7px] h-[7px] border-l-2 border-b-2 border-current rotate-45 mr-1 align-middle" /> { LocalizeText('groupforum.view.back') }
</Text> </Text>
</Flex> </Flex>
<Column gap={ 1 }> <Column gap={ 1 }>
src/components/groups/views/forums/GroupForumSettingsView.tsx
+2 -2
View File
@@ -58,8 +58,8 @@ export const GroupForumSettingsView: FC<GroupForumSettingsViewProps> = props =>
return ( return (
<Column className="h-full p-3" gap={ 3 }> <Column className="h-full p-3" gap={ 3 }>
<Flex gap={ 2 } alignItems="center"> <Flex gap={ 2 } alignItems="center">
<Text pointer underline onClick={ onBack }> <Text pointer bold onClick={ onBack }>
&laquo; { LocalizeText('groupforum.view.back') } <span className="inline-block w-[7px] h-[7px] border-l-2 border-b-2 border-current rotate-45 mr-1 align-middle" /> { LocalizeText('groupforum.view.back') }
</Text> </Text>
</Flex> </Flex>
<Text bold>{ LocalizeText('groupforum.settings.window_title') }</Text> <Text bold>{ LocalizeText('groupforum.settings.window_title') }</Text>
src/components/groups/views/forums/GroupForumThreadListView.tsx
+2 -2
View File
@@ -92,8 +92,8 @@ export const GroupForumThreadListView: FC<GroupForumThreadListViewProps> = props
<Column className="h-full" gap={ 0 }> <Column className="h-full" gap={ 0 }>
<Flex className="bg-muted p-2 border-b" gap={ 2 } alignItems="center" justifyContent="between"> <Flex className="bg-muted p-2 border-b" gap={ 2 } alignItems="center" justifyContent="between">
<Flex gap={ 2 } alignItems="center"> <Flex gap={ 2 } alignItems="center">
<Text pointer underline onClick={ onBack }> <Text pointer bold onClick={ onBack }>
&laquo; { LocalizeText('groupforum.view.back') } <span className="inline-block w-[7px] h-[7px] border-l-2 border-b-2 border-current rotate-45 mr-1 align-middle" /> { LocalizeText('groupforum.view.back') }
</Text> </Text>
</Flex> </Flex>
<Flex gap={ 1 } alignItems="center"> <Flex gap={ 1 } alignItems="center">
src/components/groups/views/forums/GroupForumThreadView.tsx
+7 -9
View File
@@ -203,19 +203,19 @@ export const GroupForumThreadView: FC<GroupForumThreadViewProps> = props =>
<Column className="h-full" gap={ 0 }> <Column className="h-full" gap={ 0 }>
<Flex className="bg-muted p-2 border-b" gap={ 2 } alignItems="center" justifyContent="between"> <Flex className="bg-muted p-2 border-b" gap={ 2 } alignItems="center" justifyContent="between">
<Flex gap={ 2 } alignItems="center"> <Flex gap={ 2 } alignItems="center">
<Text pointer underline onClick={ onBack }> <Text pointer bold onClick={ onBack }>
&laquo; { LocalizeText('groupforum.view.back') } <span className="inline-block w-[7px] h-[7px] border-l-2 border-b-2 border-current rotate-45 mr-1 align-middle" /> { LocalizeText('groupforum.view.back') }
</Text> </Text>
</Flex> </Flex>
{ canModerate && { canModerate &&
<Flex gap={ 1 }> <Flex gap={ 1 }>
<Button variant={ threadInfo?.isPinned ? 'warning' : 'outline-secondary' } className="btn-sm" onClick={ togglePinThread }> <Button variant="outline-secondary" className="btn-sm rounded-md text-white bg-[#5cb85c] border-[#5cb85c] [box-shadow:inset_0_2px_#ffffff26,inset_0_-2px_#0000001a,0_1px_#0000001a] hover:text-white hover:bg-[#4cae4c] hover:border-[#47a447]" onClick={ togglePinThread }>
{ threadInfo?.isPinned ? LocalizeText('groupforum.thread.unpin') : LocalizeText('groupforum.thread.pin') } { threadInfo?.isPinned ? LocalizeText('groupforum.thread.unpin') : LocalizeText('groupforum.thread.pin') }
</Button> </Button>
<Button variant={ isLocked ? 'danger' : 'outline-secondary' } className="btn-sm" onClick={ toggleLockThread }> <Button variant="outline-secondary" className="btn-sm rounded-md text-white bg-[#5cb85c] border-[#5cb85c] [box-shadow:inset_0_2px_#ffffff26,inset_0_-2px_#0000001a,0_1px_#0000001a] hover:text-white hover:bg-[#4cae4c] hover:border-[#47a447]" onClick={ toggleLockThread }>
{ isLocked ? LocalizeText('groupforum.thread.unlock') : LocalizeText('groupforum.thread.lock') } { isLocked ? LocalizeText('groupforum.thread.unlock') : LocalizeText('groupforum.thread.lock') }
</Button> </Button>
<Button variant="outline-danger" className="btn-sm" onClick={ hideThread }> <Button variant="outline-secondary" className="btn-sm rounded-md text-white bg-[#5cb85c] border-[#5cb85c] [box-shadow:inset_0_2px_#ffffff26,inset_0_-2px_#0000001a,0_1px_#0000001a] hover:text-white hover:bg-[#4cae4c] hover:border-[#47a447]" onClick={ hideThread }>
{ LocalizeText('groupforum.thread.hide') } { LocalizeText('groupforum.thread.hide') }
</Button> </Button>
<Button variant="danger" className="btn-sm" onClick={ deleteThread }> <Button variant="danger" className="btn-sm" onClick={ deleteThread }>
@@ -242,10 +242,8 @@ export const GroupForumThreadView: FC<GroupForumThreadViewProps> = props =>
className={ `p-3 border-b ${ (message.state !== STATE_NORMAL) ? 'bg-danger bg-opacity-10' : '' }` } className={ `p-3 border-b ${ (message.state !== STATE_NORMAL) ? 'bg-danger bg-opacity-10' : '' }` }
gap={ 3 }> gap={ 3 }>
<Column className="flex-shrink-0 items-center w-[50px]" gap={ 1 }> <Column className="flex-shrink-0 items-center w-[50px]" gap={ 1 }>
<div className="w-[40px] h-[40px] rounded-full mx-auto overflow-hidden bg-[rgba(255,255,255,0.1)] flex justify-center"> <div className="relative w-[40px] h-[40px] rounded-full mx-auto overflow-hidden bg-[rgba(255,255,255,0.1)]">
<div className="mt-[-25px]"> <LayoutAvatarImageView figure={ message.authorFigure } headOnly={ true } direction={ 2 } style={ { backgroundSize: '80px auto', backgroundPosition: '-19px -28px' } } />
<LayoutAvatarImageView figure={ message.authorFigure } headOnly={ true } direction={ 2 } />
</div>
</div> </div>
<Text small bold pointer underline onClick={ () => GetUserProfile(message.authorId) }> <Text small bold pointer underline onClick={ () => GetUserProfile(message.authorId) }>
{ message.authorName } { message.authorName }