Merge branch 'main' into tristan/development

src/app/config.ts

@@ -4,19 +4,19 @@ export const CACHE_VERSION = `0.3.0`;
 export const ContentTypes = {
   text: "text/plain",
   markdown: "text/markdown",
-  file: "rustchat/file",
-  archive: "rustchat/archive",
+  file: "vocechat/file",
+  archive: "vocechat/archive",
   formData: "multipart/form-data",
   json: "application/json"
 };
 export const firebaseConfig = {
-  apiKey: "AIzaSyDyJ6B1Ouenoha_gdGkBwIkBNStlwhlbO0",
-  authDomain: "rustchat-develop.firebaseapp.com",
-  projectId: "rustchat-develop",
-  storageBucket: "rustchat-develop.appspot.com",
-  messagingSenderId: "418687074928",
-  appId: "1:418687074928:web:753286adbf239f5af9eab5",
-  measurementId: "G-XV476KEC8P"
+  apiKey: "AIzaSyCc3VuCJZgzQLIH2wrYdQzsUOc1DuZiIOA",
+  authDomain: "vocechatdev.firebaseapp.com",
+  projectId: "vocechatdev",
+  storageBucket: "vocechatdev.appspot.com",
+  messagingSenderId: "526613312184",
+  appId: "1:526613312184:web:d13c92582baf470d487a4d",
+  measurementId: "G-82RQ3YSCP7"
 };
 export const ChatPrefixs = {
   channel: "#",
@@ -27,15 +27,15 @@ export const vapidKey = `BGXCn-5YRXSFw38Q9lUKJ5bibL212-yIQn1pCvthGhp6_KwA29FO1Ax
 export const tokenHeader = "X-API-Key";
 export const FILE_SLICE_SIZE = 1000 * 200 * 8; //200kb
 export const FILE_IMAGE_SIZE = 1000 * 10000 * 8; //10mb
-export const KEY_TOKEN = "RUSTCHAT_TOKEN";
-export const KEY_EXPIRE = "RUSTCHAT_TOKEN_EXPIRE";
-export const KEY_REFRESH_TOKEN = "RUSTCHAT_REFRESH_TOKEN";
-export const KEY_UID = "RUSTCHAT_CURR_UID";
-export const KEY_DEVICE_KEY = "RUSTCHAT_DEVICE_KEY";
-export const KEY_USERS_VERSION = "RUSTCHAT_USERS_VERSION";
-export const KEY_AFTER_MID = "RUSTCHAT_AFTER_MID";
-export const KEY_PWA_INSTALLED = "RUSTCHAT_PWA_INSTALLED";
-export const KEY_LOCAL_MAGIC_TOKEN = "RUSTCHAT_LOCAL_MAGIC_TOKEN";
+export const KEY_TOKEN = "VOCECHAT_TOKEN";
+export const KEY_EXPIRE = "VOCECHAT_TOKEN_EXPIRE";
+export const KEY_REFRESH_TOKEN = "VOCECHAT_REFRESH_TOKEN";
+export const KEY_UID = "VOCECHAT_CURR_UID";
+export const KEY_DEVICE_KEY = "VOCECHAT_DEVICE_KEY";
+export const KEY_USERS_VERSION = "VOCECHAT_USERS_VERSION";
+export const KEY_AFTER_MID = "VOCECHAT_AFTER_MID";
+export const KEY_PWA_INSTALLED = "VOCECHAT_PWA_INSTALLED";
+export const KEY_LOCAL_MAGIC_TOKEN = "VOCECHAT_LOCAL_MAGIC_TOKEN";
 export const Emojis = ["👍", "❤️", "😄", "👀", "👎", "🎉", "🙁", "🚀"];
 export const Views = {
   item: "item",

src/assets/base.css

@@ -12,20 +12,20 @@
 :root {
   /* border radius */
   --br: 8px;
-  --rustchat-navs-bg: #e5e7eb;
-  --rustchat-body-bg: #f5f6f7;
-  --rustchat-chat-bg: #fff;
-  --rustchat-channel-text-color: #1c1c1e;
-  --rustchat-msg-text-color: #374151;
+  ---navs-bg: #e5e7eb;
+  ---body-bg: #f5f6f7;
+  ---chat-bg: #fff;
+  ---channel-text-color: #1c1c1e;
+  ---msg-text-color: #374151;
 }
 
 /* @media (prefers-color-scheme: dark) {
     :root{
         --br:8px;
-        --rustchat-navs-bg:#121926;
-        --rustchat-body-bg:#1F2A37;
-        --rustchat-chat-bg:#384250;
-        --rustchat-channel-text-color:#fff;
-        --rustchat-msg-text-color:#fff;
+        ---navs-bg:#121926;
+        ---body-bg:#1F2A37;
+        ---chat-bg:#384250;
+        ---channel-text-color:#fff;
+        ---msg-text-color:#fff;
     }
   } */

src/common/component/Manifest/manifest.json

@@ -1,5 +1,5 @@
 {
-  "name": "RustChat",
+  "name": "VoceChat",
   "short_name": "Your private chat APP",
   "icons": [
     {

src/common/component/MixedInput/index.tsx

@@ -31,7 +31,7 @@ import useUploadFile from "../../hook/useUploadFile";
 import Styled from "./styled";
 import { CONFIG } from "./config";
 import Contact from "../Contact";
-export const TEXT_EDITOR_PREFIX = "rustchat_text_editor";
+export const TEXT_EDITOR_PREFIX = "_text_editor";
 
 let components = createPlateUI({
   // [ELEMENT_IMAGE]: ImageElement,

src/common/hook/useMessageFeed.ts

@@ -65,7 +65,7 @@ export default function useMessageFeed({ context = "channel", id = null }) {
   }, [context, id]);
   useEffect(() => {
     if (items.length) {
-      containerRef.current = document.querySelector(`#RUSTCHAT_FEED_${context}_${id}`);
+      containerRef.current = document.querySelector(`#VOCECHAT_FEED_${context}_${id}`);
       if (containerRef.current) {
         const newScroll = containerRef.current.scrollHeight - containerRef.current.clientHeight;
         containerRef.current.scrollTop = curScrollPos + (newScroll - oldScroll);

src/common/hook/useUploadFile.ts

@@ -39,7 +39,7 @@ export default function useUploadFile(props = {}) {
     if (!file) return;
     setData(null);
     const {
-      name = `rustchat-${+new Date()}.${file.type.split("/")[1]}`,
+      name = `-${+new Date()}.${file.type.split("/")[1]}`,
       type: file_type,
       size: file_size
     } = file;

src/routes/chat/ChannelChat/index.tsx

@@ -215,7 +215,7 @@ export default function ChannelChat({ cid = "", dropFiles = [] }) {
       >
         <StyledChannelChat
           // ref={scrollObserveRef}
-          id={`RUSTCHAT_FEED_channel_${cid}`}
+          id={`VOCECHAT_FEED_channel_${cid}`}
         >
           {/* <div className="anchor"></div> */}
           {hasMore ? (

src/routes/chat/DMChat/index.tsx

@@ -85,7 +85,7 @@ export default function DMChat({ uid = "", dropFiles = [] }) {
         </StyledHeader>
       }
     >
-      <StyledDMChat id={`RUSTCHAT_FEED_user_${uid}`}>
+      <StyledDMChat id={`VOCECHAT_FEED_user_${uid}`}>
         {hasMore ? <LoadMore pullUp={pullUp} /> : null}
         {[...feeds].map((mid, idx) => {
           const curr = messageData[mid];

src/routes/home/styled.tsx

@@ -3,7 +3,7 @@ const StyledWrapper = styled.div`
   display: flex;
   width: 100vw;
   height: 100vh;
-  background-color: var(--rustchat-navs-bg);
+  background-color: var(---navs-bg);
   > .col {
     height: 100%;
     display: flex;

src/routes/invite/index.tsx

@@ -122,7 +122,7 @@ export default function InvitePage() {
       <div className="form animate__animated animate__fadeInDown animate__faster">
         <div className="tips">
           <img src={`${BASE_URL}/resource/organization/logo`} alt="logo" className="logo" />
-          <h2 className="title">Sign Up to Rustchat</h2>
+          <h2 className="title">Sign Up to VoceChat</h2>
           <span className="desc">Please enter your details.</span>
         </div>
         <form onSubmit={handleReg}>

src/routes/login/MetamaskLoginButton.tsx

@@ -58,7 +58,7 @@ export default function MetamaskLoginButton({ login }) {
     console.log("get sn");
     const signature = await ethereum.request({
       method: "personal_sign",
-      params: [nonce, address, "hello from rustchat"]
+      params: [nonce, address, "hello from "]
     });
     return signature;
   };

src/routes/login/index.tsx

@@ -134,7 +134,7 @@ export default function LoginPage() {
       <div className="form">
         <div className="tips">
           <img src={`${BASE_URL}/resource/organization/logo`} alt="logo" className="logo" />
-          <h2 className="title">Login to Rustchat</h2>
+          <h2 className="title">Login to VoceChat</h2>
           <span className="desc">Please enter your details.</span>
         </div>
         <form onSubmit={handleLogin}>

src/routes/onboarding/index.tsx

@@ -49,7 +49,7 @@ export default function OnboardingPage() {
   return (
     <>
       <Helmet>
-        <title>Rustchat Setup</title>
+        <title>VoceChat Setup</title>
       </Helmet>
       <StyledOnboardingPage>
         <Navigator {...serverSetup} />

src/routes/onboarding/steps/donePage.tsx

@@ -63,7 +63,7 @@ export default function DonePage({ serverName }) {
   return (
     <StyledWrapper>
       <span className="primaryText">Welcome to {serverName}</span>
-      <span className="secondaryText">Proudly presented by Rustchat</span>
+      <span className="secondaryText">Proudly presented by VoceChat</span>
       <span className="tip">
         More settings, including domain resolution, privileges, securities, and invites are
         available in <span className="strong">Settings</span>

src/routes/onboarding/steps/welcomePage.tsx

@@ -46,7 +46,7 @@ const StyledWrapper = styled.div`
 export default function WelcomePage({ nextStep }) {
   return (
     <StyledWrapper>
-      <span className="primaryText">Welcome to your Rustchat!</span>
+      <span className="primaryText">Welcome to your VoceChat!</span>
       <span className="secondaryText">
         Everything in this space is owned by you. Let’s set up your space!
       </span>

src/routes/reg/ExpiredTip.tsx

@@ -28,7 +28,7 @@ export default function ExpiredTip() {
   return (
     <Styled>
       <div className="title">Magic link expired</div>
-      <p className="desc">Go back to your original Rustchat tab and request a new magic link.</p>
+      <p className="desc">Go back to your original VoceChat tab and request a new magic link.</p>
       <p className="desc">You can close this window now.</p>
     </Styled>
   );

src/routes/reg/Register.tsx

@@ -102,7 +102,7 @@ export default function Reg() {
     <>
       <div className="tips">
         <img src={`${BASE_URL}/resource/organization/logo`} alt="logo" className="logo" />
-        <h2 className="title">Sign Up to Rustchat</h2>
+        <h2 className="title">Sign Up to VoceChat</h2>
         <span className="desc">Please enter your details.</span>
       </div>
 

src/routes/sendMagicLink/index.tsx

@@ -71,7 +71,7 @@ export default function SendMagicLinkPage() {
           <>
             <div className="tips">
               <img src={`${BASE_URL}/resource/organization/logo`} alt="logo" className="logo" />
-              <h2 className="title">Login to Rustchat</h2>
+              <h2 className="title">Login to VoceChat</h2>
               <span className="desc">Please enter your Email</span>
             </div>
             <form onSubmit={handleLogin}>

src/routes/setting/APIConfig.tsx

@@ -99,8 +99,8 @@ export default function APIConfig() {
         <Button>Update Secret</Button>
       </Tippy>
       <div className="tip">
-        Tip: The security key agreed between the rustchat server and the third-party app is used to
-        encrypt the communication data.{" "}
+        Tip: The security key agreed between the server and the third-party app is used to encrypt
+        the communication data.{" "}
       </div>
     </Styled>
   );

src/routes/setting/config/Logins.tsx

@@ -107,7 +107,7 @@ export default function Logins() {
             <div className="title">
               <div className="txt">
                 <Label>Google</Label>
-                <Tooltip link="https://doc.rustchat.com/en-us/login-google.html" />
+                <Tooltip link="https://doc.voce.chat/en-us/login-google.html" />
               </div>
               <span className="desc">Allows members login with Google.</span>
             </div>
@@ -130,7 +130,7 @@ export default function Logins() {
             <div className="title">
               <div className="txt">
                 <Label>Github</Label>
-                <Tooltip link="https://doc.rustchat.com/en-us/login-github.html" />
+                <Tooltip link="https://doc.voce.chat/en-us/login-github.html" />
               </div>
               <span className="desc">Allows members login with Github.</span>
             </div>
@@ -161,7 +161,7 @@ export default function Logins() {
             <div className="title">
               <div className="txt">
                 <Label>Metamask</Label>
-                <Tooltip link="https://doc.rustchat.com/en-us/login-metamask.html" />
+                <Tooltip link="https://doc.voce.chat/en-us/login-metamask.html" />
               </div>
               <span className="desc">Allows members login with Metamask.</span>
             </div>
@@ -176,7 +176,7 @@ export default function Logins() {
             <div className="title">
               <div className="txt">
                 <Label htmlFor="desc">OIDC</Label>
-                <Tooltip link="https://doc.rustchat.com/en-us/login-webid.html" />
+                <Tooltip link="https://doc.voce.chat/en-us/login-webid.html" />
               </div>
               <span className="desc">Save my login details for next time.</span>
             </div>

src/routes/setting/config/SMTP.tsx

@@ -125,7 +125,7 @@ export default function ConfigSMTP() {
       <div className="tip">
         <img src={iconQuestion} alt="question icon" />
         <a
-          href="https://rustchat.com/doc/smtp-setting"
+          href="https://voce.chat/doc/smtp-setting"
           target="_blank"
           className="link"
           rel="noreferrer"

src/types/channel.ts

@@ -2,7 +2,7 @@ export interface ChannelMember {}
 
 export interface Message {}
 
-export type ContentType = "text/plain" | "text/markdown" | "rustchat/file" | "rustchat/archive";
+export type ContentType = "text/plain" | "text/markdown" | "vocechat/file" | "vocechat/archive";
 
 export interface PinnedMessage {
   mid: number;