abner/for-legacy-web
1
0
Fork 1
mirror of https://github.com/stoatchat/for-legacy-web.git synced 2026-03-06 17:11:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: strip emoji picker experiment

Browse Source 
chore: use discrim
This commit is contained in:
Paul Makles
2023-06-11 18:36:07 +01:00
parent 961ee92a1c
commit 6d5dd9b13e
9 changed files with 58 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/components/common/messaging/bars/MessageOverlayBar.tsx
View File

@@ -119,19 +119,18 @@ export const MessageOverlayBar = observer(
</Tooltip>
)}
{message.channel?.havePermission("React") &&
state.experiments.isEnabled("picker") && (
<ReactionWrapper
open={reactionsOpen}
setOpen={setReactionsOpen}
message={message}>
<Tooltip content="React">
<Entry>
<HappyBeaming size={18} />
</Entry>
</Tooltip>
</ReactionWrapper>
)}
{message.channel?.havePermission("React") && (
<ReactionWrapper
open={reactionsOpen}
setOpen={setReactionsOpen}
message={message}>
<Tooltip content="React">
<Entry>
<HappyBeaming size={18} />
</Entry>
</Tooltip>
</ReactionWrapper>
)}
{isAuthor && (
<Tooltip content="Edit">

14
src/components/common/user/UserHeader.tsx
View File

@@ -29,9 +29,14 @@ const HeaderBase = styled.div`
text-overflow: ellipsis;
}
.new-name {
font-size: 16px;
font-weight: 600;
}
.username {
cursor: pointer;
font-size: 16px;
font-size: 13px;
font-weight: 600;
}
@@ -50,6 +55,9 @@ export default observer(({ user }: Props) => {
return (
<Header topBorder palette="secondary">
<HeaderBase>
<div className="new-name">
{user.display_name ?? user.username}
</div>
<Localizer>
<Tooltip content={<Text id="app.special.copy_username" />}>
<span
@@ -57,7 +65,9 @@ export default observer(({ user }: Props) => {
onClick={() =>
modalController.writeText(user.username)
}>
@{user.username}
{user.username}
{"#"}
{user.discriminator}
</span>
</Tooltip>
</Localizer>

18
src/lib/ContextMenus.tsx
View File

@@ -20,7 +20,7 @@ import {
} from "preact-context-menu";
import { Text } from "preact-i18n";
import { IconButton, LineDivider } from "@revoltchat/ui";
import { Column, IconButton, LineDivider } from "@revoltchat/ui";
import { useApplicationState } from "../mobx/State";
import { QueuedMessage } from "../mobx/stores/MessageQueue";
@@ -1142,7 +1142,21 @@ export default function ContextMenus() {
content={
<Text id="app.special.copy_username" />
}>
@{user.username}
<Column gap="0">
<span>
{user.display_name ??
user.username}
</span>
<span
style={{
fontSize: "0.8em",
}}>
{user.username}
{"#"}
{user.discriminator ??
"0000"}
</span>
</Column>
</Tooltip>
</div>
<div

4
src/mobx/stores/Changelog.ts
View File

@@ -77,10 +77,6 @@ export default class Changelog implements Store, Persistent<Data>, Syncable {
runInAction(() => {
this.viewed = latestChangelog;
});
} else {
modalController.push({
type: "changelog_usernames",
});
}
}
}

8
src/mobx/stores/Experiments.ts
View File

@@ -10,7 +10,7 @@ import Store from "../interfaces/Store";
/**
* Union type of available experiments.
*/
export type Experiment = "dummy" | "offline_users" | "plugins" | "picker";
export type Experiment = "dummy" | "offline_users" | "plugins";
/**
* Currently active experiments.
@@ -19,7 +19,6 @@ export const AVAILABLE_EXPERIMENTS: Experiment[] = [
"dummy",
"offline_users",
"plugins",
"picker",
];
/**
@@ -42,11 +41,6 @@ export const EXPERIMENTS: {
description:
"This will enable the experimental plugin API. Only touch this if you know what you're doing.",
},
picker: {
title: "Custom Emoji",
description:
"This will enable a work-in-progress emoji picker, custom emoji settings and a reaction picker.",
},
};
export interface Data {

1
src/pages/settings/ServerSettings.tsx
View File

@@ -79,7 +79,6 @@ export default observer(() => {
id: "emojis",
icon: <HappyBeaming size={20} />,
title: <Text id="app.settings.server_pages.emojis.title" />,
hidden: !state.experiments.isEnabled("picker"),
},
{
category: (

17
src/pages/settings/Settings.tsx
View File

@@ -80,10 +80,15 @@ const AccountHeader = styled.div`
font-size: 12px;
gap: 2px;
> span {
.new {
font-size: 20px;
font-weight: 600;
}
.full {
font-size: 14px;
font-weight: 600;
}
}
}
@@ -336,7 +341,15 @@ export default observer(() => {
onClick={() => openContextMenu("Status")}
/>
<div className="details">
<Username user={client.user!} prefixAt />
<span className="new">
{client.user.display_name ??
client.user.username}
</span>
<span className="full">
{client.user.username}
{"#"}
{client.user.discriminator}
</span>
<UserStatus user={client.user!} />
</div>
</div>