external/lang

@@ -1 +1 @@
-Subproject commit 4ec2f99855825743f65eabd715ec77f61c28c5d8
+Subproject commit 07f4343342c3d06a2b540db3bb14f598d745c09a

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

@@ -27,7 +27,7 @@ export default function AttachmentActions({ attachment }: Props) {
 
     const url = client.generateFileURL(attachment);
     const open_url = `${url}/${filename}`;
-    const download_url = url;
+    const download_url = url?.replace("attachments", "attachments/download");
 
     const filesize = determineFileSize(size);
 
@@ -49,11 +49,10 @@ export default function AttachmentActions({ attachment }: Props) {
                         </IconButton>
                     </a>
                     <a
-                        target="_blank"
                         href={download_url}
                         className={styles.downloadIcon}
                         download
-                        // target={isFirefox || window.native ? "_blank" : "_self"}
+                        target={isFirefox || window.native ? "_blank" : "_self"}
                         rel="noreferrer">
                         <IconButton>
                             <Download size={24} />

src/controllers/modals/components/ServerInfo.tsx

@@ -5,7 +5,6 @@ import { Text } from "preact-i18n";
 import { Column, H1, IconButton, Modal, Row } from "@revoltchat/ui";
 
 import Markdown from "../../../components/markdown/Markdown";
-import { useClient } from "../../client/ClientController";
 import { report } from "../../safety";
 import { modalController } from "../ModalController";
 import { ModalProps } from "../types";
@@ -14,49 +13,6 @@ export default function ServerInfo({
     server,
     ...props
 }: ModalProps<"server_info">) {
-    const client = useClient();
-    const isOwner = server.owner === client.user?._id;
-
-    const actions = [
-        {
-            onClick: () => {
-                modalController.push({
-                    type: "server_identity",
-                    member: server.member!,
-                });
-                return true;
-            },
-            children: "Edit Identity",
-            palette: "primary",
-        },
-    ];
-
-    if (!isOwner) {
-        actions.push({
-            onClick: () => {
-                modalController.push({
-                    type: "leave_server",
-                    target: server,
-                });
-                return true;
-            },
-            children: "Leave Server",
-            palette: "error",
-        });
-    }
-
-    actions.push({
-        onClick: () => {
-            modalController.push({
-                type: "report",
-                target: server,
-            });
-            return true;
-        },
-        children: <Text id="app.special.modals.actions.report" />,
-        palette: "error",
-    });
-
     return (
         <Modal
             {...props}
@@ -70,7 +26,41 @@ export default function ServerInfo({
                     </IconButton>
                 </Row>
             }
-            actions={actions}>
+            actions={[
+                {
+                    onClick: () => {
+                        modalController.push({
+                            type: "server_identity",
+                            member: server.member!,
+                        });
+                        return true;
+                    },
+                    children: "Edit Identity",
+                    palette: "primary",
+                },
+                {
+                    onClick: () => {
+                        modalController.push({
+                            type: "leave_server",
+                            target: server,
+                        });
+                        return true;
+                    },
+                    children: "Leave Server",
+                    palette: "error",
+                },
+                {
+                    onClick: () => {
+                        modalController.push({
+                            type: "report",
+                            target: server,
+                        });
+                        return true;
+                    },
+                    children: <Text id="app.special.modals.actions.report" />,
+                    palette: "error",
+                },
+            ]}>
             <Markdown content={server.description!} />
         </Modal>
     );

src/lib/ContextMenus.tsx

@@ -288,7 +288,11 @@ export default function ContextMenus() {
                         window.open(
                             // ! FIXME: do this from revolt.js
                             client
-                                .generateFileURL(data.attachment),
+                                .generateFileURL(data.attachment)
+                                ?.replace(
+                                    "attachments",
+                                    "attachments/download",
+                                ),
                             isFirefox || window.native ? "_blank" : "_self",
                         );
                     }