forked from rDrama/rDrama
Bring back mentions
parent
f9022827a9
commit
b17ca8bcc5
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "chat",
|
"name": "chat",
|
||||||
"version": "0.1.7",
|
"version": "0.1.8",
|
||||||
"main": "./src/index.tsx",
|
"main": "./src/index.tsx",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|
|
@ -9,6 +9,7 @@ html {
|
||||||
}
|
}
|
||||||
|
|
||||||
body {
|
body {
|
||||||
|
min-height: 100vh;
|
||||||
min-height: calc(var(--vh, 1vh) * 100);
|
min-height: calc(var(--vh, 1vh) * 100);
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
/* mobile viewport bug fix */
|
/* mobile viewport bug fix */
|
||||||
|
|
|
@ -44,11 +44,21 @@ export function ChatMessage({
|
||||||
time,
|
time,
|
||||||
quotes,
|
quotes,
|
||||||
} = message;
|
} = message;
|
||||||
const { admin, censored } = useRootContext();
|
const {
|
||||||
|
id: userId,
|
||||||
|
username: userUsername,
|
||||||
|
admin,
|
||||||
|
censored,
|
||||||
|
themeColor,
|
||||||
|
} = useRootContext();
|
||||||
const { messageLookup, deleteMessage, quoteMessage } = useChat();
|
const { messageLookup, deleteMessage, quoteMessage } = useChat();
|
||||||
|
const [confirmedDelete, setConfirmedDelete] = useState(false);
|
||||||
const quotedMessage = messageLookup[quotes];
|
const quotedMessage = messageLookup[quotes];
|
||||||
const content = censored ? text_censored : text_html;
|
const content = censored ? text_censored : text_html;
|
||||||
const [confirmedDelete, setConfirmedDelete] = useState(false);
|
const isMention =
|
||||||
|
text_html.includes(`/id/${userId}`) &&
|
||||||
|
userUsername &&
|
||||||
|
username !== userUsername;
|
||||||
const timestamp = useMemo(
|
const timestamp = useMemo(
|
||||||
() => formatTimeAgo(time),
|
() => formatTimeAgo(time),
|
||||||
[time, timestampUpdates]
|
[time, timestampUpdates]
|
||||||
|
@ -75,8 +85,17 @@ export function ChatMessage({
|
||||||
<div
|
<div
|
||||||
className={cx("ChatMessage", {
|
className={cx("ChatMessage", {
|
||||||
ChatMessage__showingUser: showUser,
|
ChatMessage__showingUser: showUser,
|
||||||
|
ChatMessage__isMention: isMention,
|
||||||
})}
|
})}
|
||||||
id={id}
|
id={id}
|
||||||
|
style={
|
||||||
|
isMention
|
||||||
|
? {
|
||||||
|
background: `#${themeColor}25`,
|
||||||
|
borderLeft: `1px solid #${themeColor}`,
|
||||||
|
}
|
||||||
|
: {}
|
||||||
|
}
|
||||||
>
|
>
|
||||||
{!actionsOpen && (
|
{!actionsOpen && (
|
||||||
<div className="ChatMessage-actions-button">
|
<div className="ChatMessage-actions-button">
|
||||||
|
|
Loading…
Reference in New Issue