Merge branch 'master' into production

external/lang

@@ -1 +1 @@
-Subproject commit d42440461f1c661e4f341a81e253021d45d1d526
+Subproject commit dd597a0fb984e6c681dcf936bdbb1fc07c0521dd

package.json

@@ -50,6 +50,8 @@
     },
     "devDependencies": {
         "@babel/plugin-proposal-decorators": "^7.17.9",
+        "@floating-ui/react-dom": "^1.0.0",
+        "@floating-ui/react-dom-interactions": "^0.9.1",
         "@fontsource/atkinson-hyperlegible": "^4.4.5",
         "@fontsource/bitter": "^4.5.7",
         "@fontsource/comic-neue": "^4.4.5",

src/components/common/messaging/Message.tsx

@@ -5,7 +5,7 @@ import { useTriggerEvents } from "preact-context-menu";
 import { memo } from "preact/compat";
 import { useEffect, useState } from "preact/hooks";
 
-import { Category } from "@revoltchat/ui";
+import { Category, Button } from "@revoltchat/ui";
 
 import { internalEmit } from "../../../lib/eventEmitter";
 import { isTouchscreenDevice } from "../../../lib/isTouchscreenDevice";
@@ -88,6 +88,7 @@ const Message = observer(
 
         // ! FIXME(?): animate on hover
         const [mouseHovering, setAnimate] = useState(false);
+        const [reactionsOpen, setReactionsOpen] = useState(false);
         useEffect(() => setAnimate(false), [replacement]);
 
         return (
@@ -182,10 +183,12 @@ const Message = observer(
                             <Embed key={index} embed={embed} />
                         ))}
                         <Reactions message={message} />
-                        {mouseHovering &&
+                        {(mouseHovering || reactionsOpen) &&
                             !replacement &&
                             !isTouchscreenDevice && (
                                 <MessageOverlayBar
+                                    reactionsOpen={reactionsOpen}
+                                    setReactionsOpen={setReactionsOpen}
                                     message={message}
                                     queued={queued}
                                 />

src/components/common/messaging/MessageBox.tsx

@@ -26,7 +26,10 @@ import { state, useApplicationState } from "../../../mobx/State";
 import { Reply } from "../../../mobx/stores/MessageQueue";
 
 import { emojiDictionary } from "../../../assets/emojis";
-import { useClient } from "../../../controllers/client/ClientController";
+import {
+    clientController,
+    useClient,
+} from "../../../controllers/client/ClientController";
 import { takeError } from "../../../controllers/client/jsx/error";
 import {
     FileUploader,
@@ -143,8 +146,14 @@ const RE_SED = new RegExp("^s/([^])*/([^])*$");
 // Tests for code block delimiters (``` at start of line)
 const RE_CODE_DELIMITER = new RegExp("^```", "gm");
 
-const HackAlertThisFileWillBeReplaced = observer(
-    ({ channel, onClose }: Props & { onClose: () => void }) => {
+export const HackAlertThisFileWillBeReplaced = observer(
+    ({
+        onSelect,
+        onClose,
+    }: {
+        onSelect: (emoji: string) => void;
+        onClose: () => void;
+    }) => {
         const renderEmoji = useMemo(
             () =>
                 memo(({ emoji }: { emoji: string }) => (
@@ -162,8 +171,12 @@ const HackAlertThisFileWillBeReplaced = observer(
 
         for (const server of state.ordering.orderedServers) {
             // ! FIXME: add a separate map on each server for emoji
-            const list = [...channel.client.emojis.values()]
-                .filter((emoji) => emoji.parent.id === server._id)
+            const list = [...clientController.getReadyClient()!.emojis.values()]
+                .filter(
+                    (emoji) =>
+                        emoji.parent.type !== "Detached" &&
+                        emoji.parent.id === server._id,
+                )
                 .map(({ _id, name }) => ({ id: _id, name }));
 
             if (list.length > 0) {
@@ -187,13 +200,7 @@ const HackAlertThisFileWillBeReplaced = observer(
                 emojis={emojis}
                 categories={categories}
                 renderEmoji={renderEmoji}
-                onSelect={(emoji) => {
-                    const v = state.draft.get(channel._id);
-                    state.draft.set(
-                        channel._id,
-                        `${v ? `${v} ` : ""}:${emoji}:`,
-                    );
-                }}
+                onSelect={onSelect}
                 onClose={onClose}
             />
         );
@@ -568,7 +575,13 @@ export default observer(({ channel }: Props) => {
             <FloatingLayer>
                 {picker && (
                     <HackAlertThisFileWillBeReplaced
-                        channel={channel}
+                        onSelect={(emoji) => {
+                            const v = state.draft.get(channel._id);
+                            state.draft.set(
+                                channel._id,
+                                `${v ? `${v} ` : ""}:${emoji}:`,
+                            );
+                        }}
                         onClose={closePicker}
                     />
                 )}

src/components/common/messaging/attachments/Reactions.tsx

@@ -1,11 +1,20 @@
+import {
+    autoPlacement,
+    offset,
+    shift,
+    useFloating,
+} from "@floating-ui/react-dom-interactions";
 import { observer } from "mobx-react-lite";
 import { Message } from "revolt.js";
 import styled, { css } from "styled-components";
 
-import { useCallback } from "preact/hooks";
+import { createPortal } from "preact/compat";
+import { useCallback, useRef } from "preact/hooks";
 
+import { emojiDictionary } from "../../../../assets/emojis";
 import { useClient } from "../../../../controllers/client/ClientController";
 import { RenderEmoji } from "../../../markdown/plugins/emoji";
+import { HackAlertThisFileWillBeReplaced } from "../MessageBox";
 
 interface Props {
     message: Message;
@@ -131,3 +140,78 @@ export const Reactions = observer(({ message }: Props) => {
         </List>
     );
 });
+
+const Base = styled.div`
+    > div {
+        position: unset;
+    }
+`;
+
+/**
+ * ! FIXME: rewrite
+ */
+export const ReactionWrapper: React.FC<{
+    message: Message;
+    open: boolean;
+    setOpen: (v: boolean) => void;
+}> = ({ open, setOpen, message, children }) => {
+    const { x, y, reference, floating, strategy } = useFloating({
+        open,
+        middleware: [
+            offset(4),
+            shift({ mainAxis: true, crossAxis: true, padding: 4 }),
+            autoPlacement(),
+        ],
+    });
+
+    const skip = useRef();
+    const toggle = () => {
+        if (skip.current) {
+            skip.current = null;
+            return;
+        }
+
+        setOpen(!open);
+
+        if (!open) {
+            skip.current = true;
+        }
+    };
+
+    return (
+        <>
+            <div
+                ref={reference}
+                onClick={toggle}
+                style={{ width: "fit-content" }}>
+                {children}
+            </div>
+
+            {createPortal(
+                <div id="reaction">
+                    {open && (
+                        <Base
+                            ref={floating}
+                            style={{
+                                position: strategy,
+                                top: y ?? 0,
+                                left: x ?? 0,
+                            }}>
+                            <HackAlertThisFileWillBeReplaced
+                                onSelect={(emoji) =>
+                                    message.react(
+                                        emojiDictionary[
+                                            emoji as keyof typeof emojiDictionary
+                                        ] ?? emoji,
+                                    )
+                                }
+                                onClose={toggle}
+                            />
+                        </Base>
+                    )}
+                </div>,
+                document.body,
+            )}
+        </>
+    );
+};

src/components/common/messaging/bars/MessageOverlayBar.tsx

@@ -5,6 +5,7 @@ import {
     Share,
     InfoSquare,
     Notification,
+    HappyBeaming,
 } from "@styled-icons/boxicons-solid";
 import { observer } from "mobx-react-lite";
 import { Message as MessageObject } from "revolt.js";
@@ -17,12 +18,16 @@ import { internalEmit } from "../../../../lib/eventEmitter";
 import { shiftKeyPressed } from "../../../../lib/modifiers";
 import { getRenderer } from "../../../../lib/renderer/Singleton";
 
+import { state } from "../../../../mobx/State";
 import { QueuedMessage } from "../../../../mobx/stores/MessageQueue";
 
 import { modalController } from "../../../../controllers/modals/ModalController";
 import Tooltip from "../../../common/Tooltip";
+import { ReactionWrapper } from "../attachments/Reactions";
 
 interface Props {
+    reactionsOpen: boolean;
+    setReactionsOpen: (v: boolean) => void;
     message: MessageObject;
     queued?: QueuedMessage;
 }
@@ -81,7 +86,8 @@ const Divider = styled.div`
     background: var(--tertiary-background);
 `;
 
-export const MessageOverlayBar = observer(({ message, queued }: Props) => {
+export const MessageOverlayBar = observer(
+    ({ reactionsOpen, setReactionsOpen, message, queued }: Props) => {
         const client = message.client;
         const isAuthor = message.author_id === client.user!._id;
 
@@ -102,11 +108,30 @@ export const MessageOverlayBar = observer(({ message, queued }: Props) => {
 
         return (
             <OverlayBar>
+                {message.channel?.havePermission("SendMessage") && (
                     <Tooltip content="Reply">
-                <Entry onClick={() => internalEmit("ReplyBar", "add", message)}>
+                        <Entry
+                            onClick={() =>
+                                internalEmit("ReplyBar", "add", message)
+                            }>
                             <Share size={18} />
                         </Entry>
                     </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>
+                    )}
 
                 {isAuthor && (
                     <Tooltip content="Edit">
@@ -170,14 +195,20 @@ export const MessageOverlayBar = observer(({ message, queued }: Props) => {
                                         unread_id = messages[index - 1]._id;
                                     }
 
-                                internalEmit("NewMessages", "mark", unread_id);
+                                    internalEmit(
+                                        "NewMessages",
+                                        "mark",
+                                        unread_id,
+                                    );
                                     message.channel?.ack(unread_id, true);
                                 }}>
                                 <Notification size={18} />
                             </Entry>
                         </Tooltip>
                         <Tooltip
-                        content={copied === "link" ? "Copied!" : "Copy Link"}
+                            content={
+                                copied === "link" ? "Copied!" : "Copy Link"
+                            }
                             hideOnClick={false}>
                             <Entry
                                 onClick={() => {
@@ -202,4 +233,5 @@ export const MessageOverlayBar = observer(({ message, queued }: Props) => {
                 )}
             </OverlayBar>
         );
-});
+    },
+);

src/components/navigation/items/ButtonItem.tsx

@@ -155,7 +155,9 @@ export const ChannelButton = observer((props: ChannelProps) => {
             data-alert={alerting}
             data-muted={muted}
             aria-label={channel.name}
-            className={classNames(styles.item, { [styles.compact]: compact })}
+            className={classNames(styles.item, {
+                [styles.compact]: compact,
+            })}
             {...useTriggerEvents("Menu", {
                 channel: channel._id,
                 unread: !!alert,
@@ -175,7 +177,9 @@ export const ChannelButton = observer((props: ChannelProps) => {
                             <Text
                                 id="quantities.members"
                                 plural={channel.recipients!.length}
-                                fields={{ count: channel.recipients!.length }}
+                                fields={{
+                                    count: channel.recipients!.length,
+                                }}
                             />
                         )}
                     </div>

src/mobx/stores/Experiments.ts

@@ -45,7 +45,7 @@ export const EXPERIMENTS: {
     picker: {
         title: "Custom Emoji",
         description:
-            "This will enable a work-in-progress emoji picker and custom emoji settings.",
+            "This will enable a work-in-progress emoji picker, custom emoji settings and reaction picker.",
     },
 };
 

src/pages/developer/Developer.tsx

@@ -43,6 +43,7 @@ export default function Developer() {
                     fields={{ provider: <b>GAMING!</b> }}
                 />
             </div>
+
             <div style={{ padding: "16px" }}>
                 <a onClick={() => setCrash(true)}>click to crash app</a>
                 {crash && (window as any).sus.sus()}

src/pages/settings/server/Emojis.tsx

@@ -44,7 +44,7 @@ const UserInfo = styled(Row)`
 
 export const Emojis = observer(({ server }: Props) => {
     const emoji = [...server.client.emojis.values()].filter(
-        (x) => x.parent.id === server._id,
+        (x) => x.parent.type === "Server" && x.parent.id === server._id,
     );
 
     return (

yarn.lock

@@ -1825,6 +1825,47 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@floating-ui/core@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "@floating-ui/core@npm:1.0.0"
+  checksum: 093eaa226c1317c1770218bfa9e689c57b3aaef9eab15521269b24f50aeb16143471347bf8025c70ea67a80a165242b6f3a3335a47cbda565d3e055fbfa29501
+  languageName: node
+  linkType: hard
+
+"@floating-ui/dom@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "@floating-ui/dom@npm:1.0.0"
+  dependencies:
+    "@floating-ui/core": ^1.0.0
+  checksum: dd2f2fab4498b194cabc564b1fa9c7f79885271054a5d64f0bf546a374b12a11732f774d97798397f4bae8e87cfb817d110b8a950ae2422c8ffc571647c263d5
+  languageName: node
+  linkType: hard
+
+"@floating-ui/react-dom-interactions@npm:^0.9.1":
+  version: 0.9.1
+  resolution: "@floating-ui/react-dom-interactions@npm:0.9.1"
+  dependencies:
+    "@floating-ui/react-dom": ^1.0.0
+    aria-hidden: ^1.1.3
+  peerDependencies:
+    react: ">=16.8.0"
+    react-dom: ">=16.8.0"
+  checksum: 00f077547e883f3be45386a6e74c64913c02af417ae2b15cf86b10af79724b52095b820e8ba034b0bac5eba597010b1ea95095ba692c33cbc307f1df7608c54a
+  languageName: node
+  linkType: hard
+
+"@floating-ui/react-dom@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "@floating-ui/react-dom@npm:1.0.0"
+  dependencies:
+    "@floating-ui/dom": ^1.0.0
+  peerDependencies:
+    react: ">=16.8.0"
+    react-dom: ">=16.8.0"
+  checksum: d79e3c8570b0eaef5e968cd9c69de2c6bb372a5316e4e69a1cd12dae81771863ef430e81b74a0c21cefba663a2f971d8540c7294d7fb3b9807e32ba2a00c1e76
+  languageName: node
+  linkType: hard
+
 "@fontsource/atkinson-hyperlegible@npm:^4.4.5":
   version: 4.5.1
   resolution: "@fontsource/atkinson-hyperlegible@npm:4.5.1"
@@ -3156,6 +3197,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"aria-hidden@npm:^1.1.3":
+  version: 1.1.3
+  resolution: "aria-hidden@npm:1.1.3"
+  dependencies:
+    tslib: ^1.0.0
+  checksum: 2d40a328246baac7ae0b243ebe0cbef53c836c5f78c9212e9c1ff93f3aee185bd9aa51773e161e0025722d691c9d5f125070f6175a7074c4a57778ddc30d9e74
+  languageName: node
+  linkType: hard
+
 "array-includes@npm:^3.1.2, array-includes@npm:^3.1.3":
   version: 3.1.3
   resolution: "array-includes@npm:3.1.3"
@@ -3603,6 +3653,8 @@ __metadata:
   resolution: "client@workspace:."
   dependencies:
     "@babel/plugin-proposal-decorators": ^7.17.9
+    "@floating-ui/react-dom": ^1.0.0
+    "@floating-ui/react-dom-interactions": ^0.9.1
     "@fontsource/atkinson-hyperlegible": ^4.4.5
     "@fontsource/bitter": ^4.5.7
     "@fontsource/comic-neue": ^4.4.5
@@ -8792,7 +8844,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tslib@npm:^1.8.1":
+"tslib@npm:^1.0.0, tslib@npm:^1.8.1":
   version: 1.14.1
   resolution: "tslib@npm:1.14.1"
   checksum: dbe628ef87f66691d5d2959b3e41b9ca0045c3ee3c7c7b906cc1e328b39f199bb1ad9e671c39025bd56122ac57dfbf7385a94843b1cc07c60a4db74795829acd