mirror of
https://github.com/duckietm/Nitro-V3.git
synced 2026-06-20 07:26:19 +00:00
Merge branch 'Dev' into merge-duckie-main-2026-05-06
This commit is contained in:
@@ -108,13 +108,14 @@ export const GroupCreatorView: FC<GroupCreatorViewProps> = props =>
|
||||
|
||||
setGroupData({
|
||||
groupId: -1,
|
||||
groupName: null,
|
||||
groupDescription: null,
|
||||
groupName: '',
|
||||
groupDescription: '',
|
||||
groupHomeroomId: -1,
|
||||
groupState: 1,
|
||||
groupCanMembersDecorate: true,
|
||||
groupColors: null,
|
||||
groupBadgeParts: null
|
||||
groupHasForum: false,
|
||||
groupColors: [],
|
||||
groupBadgeParts: []
|
||||
});
|
||||
|
||||
SendMessageComposer(new GroupBuyDataComposer());
|
||||
|
||||
@@ -58,7 +58,10 @@ export const GroupForumListView: FC<GroupForumListViewProps> = props =>
|
||||
<select
|
||||
className="form-select form-select-sm"
|
||||
value={ listMode }
|
||||
onChange={ e => { setListMode(parseInt(e.target.value)); setStartIndex(0); } }>
|
||||
onChange={ e =>
|
||||
{
|
||||
setListMode(parseInt(e.target.value)); setStartIndex(0);
|
||||
} }>
|
||||
<option value={ 0 }>{ LocalizeText('groupforum.list.tab.most_active') }</option>
|
||||
<option value={ 2 }>{ LocalizeText('groupforum.list.tab.my_forums') }</option>
|
||||
</select>
|
||||
@@ -89,7 +92,10 @@ export const GroupForumListView: FC<GroupForumListViewProps> = props =>
|
||||
<Column className="flex-shrink-0 text-end min-w-[100px]" gap={ 0 }>
|
||||
{ (forum.lastMessageAuthorId > 0) && <>
|
||||
<Text small variant="muted">{ LocalizeText('messageboard.last.message') }</Text>
|
||||
<Text small pointer underline onClick={ e => { e.stopPropagation(); GetUserProfile(forum.lastMessageAuthorId); } }>
|
||||
<Text small pointer underline onClick={ e =>
|
||||
{
|
||||
e.stopPropagation(); GetUserProfile(forum.lastMessageAuthorId);
|
||||
} }>
|
||||
{ forum.lastMessageAuthorName }
|
||||
</Text>
|
||||
<Text small variant="muted">{ formatTimeAgo(forum.lastMessageTimeAsSecondsAgo) }</Text>
|
||||
|
||||
@@ -165,7 +165,10 @@ export const GroupForumThreadListView: FC<GroupForumThreadListViewProps> = props
|
||||
</Flex>
|
||||
<Flex gap={ 1 }>
|
||||
<Text small variant="muted">{ LocalizeText('messageboard.started.by') }</Text>
|
||||
<Text small pointer underline onClick={ e => { e.stopPropagation(); GetUserProfile(thread.authorId); } }>
|
||||
<Text small pointer underline onClick={ e =>
|
||||
{
|
||||
e.stopPropagation(); GetUserProfile(thread.authorId);
|
||||
} }>
|
||||
{ thread.authorName }
|
||||
</Text>
|
||||
<Text small variant="muted">- { formatTimeAgo(thread.creationTimeAsSecondsAgo) }</Text>
|
||||
@@ -182,7 +185,10 @@ export const GroupForumThreadListView: FC<GroupForumThreadListViewProps> = props
|
||||
</Column> }
|
||||
<Column className="flex-shrink-0 text-end min-w-[100px]" gap={ 0 }>
|
||||
<Text small variant="muted">{ LocalizeText('messageboard.last.message') }</Text>
|
||||
<Text small pointer underline onClick={ e => { e.stopPropagation(); GetUserProfile(thread.lastUserId); } }>
|
||||
<Text small pointer underline onClick={ e =>
|
||||
{
|
||||
e.stopPropagation(); GetUserProfile(thread.lastUserId);
|
||||
} }>
|
||||
{ thread.lastUserName }
|
||||
</Text>
|
||||
<Text small variant="muted">{ formatTimeAgo(thread.lastCommentTime) }</Text>
|
||||
|
||||
Reference in New Issue
Block a user