From 58d9744fad1dbe6c695770c7e0acf3a1d92780f3 Mon Sep 17 00:00:00 2001
From: Paul <paulmakles@gmail.com>
Date: Sat, 31 Jul 2021 09:34:55 +0100
Subject: [PATCH] Update to revolt.js 5.0.0-alpha.10 Fix member sidebar not
showing on mobile.
---
package.json | 2 +-
src/components/navigation/right/MemberSidebar.tsx | 8 ++++++--
src/context/intermediate/modals/Prompt.tsx | 2 +-
src/lib/renderer/simple/SimpleRenderer.ts | 2 +-
src/pages/channels/messaging/MessageEditor.tsx | 2 +-
yarn.lock | 8 ++++----
6 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/package.json b/package.json
index cd703ac..6c92c72 100644
--- a/package.json
+++ b/package.json
@@ -97,7 +97,7 @@
"react-router-dom": "^5.2.0",
"react-scroll": "^1.8.2",
"redux": "^4.1.0",
- "revolt.js": "5.0.0-alpha.7",
+ "revolt.js": "5.0.0-alpha.10",
"rimraf": "^3.0.2",
"sass": "^1.35.1",
"shade-blend-color": "^1.0.0",
diff --git a/src/components/navigation/right/MemberSidebar.tsx b/src/components/navigation/right/MemberSidebar.tsx
index 1beedff..f129a39 100644
--- a/src/components/navigation/right/MemberSidebar.tsx
+++ b/src/components/navigation/right/MemberSidebar.tsx
@@ -1,5 +1,5 @@
import { observer } from "mobx-react-lite";
-import { Link } from "react-router-dom";
+import { Link, useParams } from "react-router-dom";
import { Presence } from "revolt-api/types/Users";
import { Channel } from "revolt.js/dist/maps/Channels";
import Members, { Member } from "revolt.js/dist/maps/Members";
@@ -31,7 +31,11 @@ import { GenericSidebarBase, GenericSidebarList } from "../SidebarBase";
import { UserButton } from "../items/ButtonItem";
import { ChannelDebugInfo } from "./ChannelDebugInfo";
-export default function MemberSidebar({ channel }: { channel?: Channel }) {
+export default function MemberSidebar({ channel: obj }: { channel?: Channel }) {
+ const { channel: channel_id } = useParams<{ channel: string }>();
+ const client = useClient();
+ const channel = obj ?? client.channels.get(channel_id);
+
switch (channel?.channel_type) {
case "Group":
return <GroupMemberSidebar channel={channel} />;
diff --git a/src/context/intermediate/modals/Prompt.tsx b/src/context/intermediate/modals/Prompt.tsx
index 07e56a7..707505d 100644
--- a/src/context/intermediate/modals/Prompt.tsx
+++ b/src/context/intermediate/modals/Prompt.tsx
@@ -193,7 +193,7 @@ export const SpecialPromptModal = observer((props: SpecialProps) => {
setProcessing(true);
try {
- props.target.deleteMessage();
+ props.target.delete();
onClose();
} catch (err) {
setError(takeError(err));
diff --git a/src/lib/renderer/simple/SimpleRenderer.ts b/src/lib/renderer/simple/SimpleRenderer.ts
index 87df4aa..8a82bff 100644
--- a/src/lib/renderer/simple/SimpleRenderer.ts
+++ b/src/lib/renderer/simple/SimpleRenderer.ts
@@ -43,7 +43,7 @@ export const SimpleRenderer: RendererRoutines = {
}
},
receive: async (renderer, message) => {
- if (message.channel !== renderer.channel) return;
+ if (message.channel_id !== renderer.channel) return;
if (renderer.state.type !== "RENDER") return;
if (renderer.state.messages.find((x) => x._id === message._id)) return;
if (!renderer.state.atBottom) return;
diff --git a/src/pages/channels/messaging/MessageEditor.tsx b/src/pages/channels/messaging/MessageEditor.tsx
index 19fdac9..eda99dd 100644
--- a/src/pages/channels/messaging/MessageEditor.tsx
+++ b/src/pages/channels/messaging/MessageEditor.tsx
@@ -63,7 +63,7 @@ export default function MessageEditor({ message, finish }: Props) {
target: message,
});
} else if (content !== message.content) {
- await message.editMessage({
+ await message.edit({
content,
});
}
diff --git a/yarn.lock b/yarn.lock
index 0b074cc..4b36651 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3570,10 +3570,10 @@ revolt-api@0.5.1-alpha.10-patch.0:
resolved "https://registry.yarnpkg.com/revolt-api/-/revolt-api-0.5.1-alpha.10-patch.0.tgz#97d31bec7dfa4573567097443acb059c4feaac20"
integrity sha512-UyM890HkGlYNQOxpHuEpUsJHLt8Ujnjg9/zPEDGpbvS4iy0jmHX23Hh8tOCfb/ewxbNrtT3G1HpSWKOneW/vYg==
-revolt.js@5.0.0-alpha.7:
- version "5.0.0-alpha.7"
- resolved "https://registry.yarnpkg.com/revolt.js/-/revolt.js-5.0.0-alpha.7.tgz#b84b424a20359b305a3d87627e82f6c7e7835c5b"
- integrity sha512-BH1px02kke5hDRvpnwEu7y09oYQxJm4ZKQdy8JRqBJ73LOQgYyEnmv0Jcumb9fwcGaBHZQKPErhlYDJtb37img==
+revolt.js@5.0.0-alpha.10:
+ version "5.0.0-alpha.10"
+ resolved "https://registry.yarnpkg.com/revolt.js/-/revolt.js-5.0.0-alpha.10.tgz#3fa1a8944a338134da09626278ee47b91f20ce2a"
+ integrity sha512-b5nCQDtLUei4mfXhZNkIfQiyG8WDHBnpOVRaRaJz2ZjcQtdBjxIPXxOWkBYL7N/dBJ7sn5xgLMqra9UzkwkewA==
dependencies:
axios "^0.19.2"
eventemitter3 "^4.0.7"
--
GitLab