chore: updates
This commit is contained in:
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "vocechat-web",
|
||||
"version": "0.7.32",
|
||||
"version": "0.7.33",
|
||||
"homepage": "https://voce.chat",
|
||||
"dependencies": {
|
||||
"@metamask/onboarding": "^1.0.1",
|
||||
|
||||
@@ -44,7 +44,7 @@
|
||||
"add_friend": "Add friend",
|
||||
"dm_to_member": "DM to Member",
|
||||
"show_email": "Show Email",
|
||||
"only_owner": "Only Owner Send Message"
|
||||
"only_owner": "Only Owner Can Send Message"
|
||||
},
|
||||
"dm": {
|
||||
"delete": "Delete User",
|
||||
@@ -62,16 +62,16 @@
|
||||
"invite": "Invitation Link Only"
|
||||
},
|
||||
"admin_create_group": {
|
||||
"title": "Only Admins create group",
|
||||
"title": "Only Admins Can Create Group",
|
||||
"desc": "If enabled, only admins can create group.",
|
||||
"enable": "Enable",
|
||||
"disable": "Disabled"
|
||||
"disable": "Disable"
|
||||
},
|
||||
"guest_mode": {
|
||||
"title": "Guest Mode",
|
||||
"desc": "If enabled, visitors will see public channels on this server.",
|
||||
"enable": "Enable",
|
||||
"disable": "Disabled"
|
||||
"disable": "Disable"
|
||||
},
|
||||
"url": {
|
||||
"title": "Update Frontend URL",
|
||||
|
||||
@@ -56,7 +56,7 @@
|
||||
"title": "Guest Mode",
|
||||
"desc": "If enabled, visitors will see public channels on this server.",
|
||||
"enable": "Enable",
|
||||
"disable": "Disabled"
|
||||
"disable": "Disable"
|
||||
},
|
||||
"url": {
|
||||
"title": "Update Frontend URL",
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
import { createSlice, PayloadAction } from "@reduxjs/toolkit";
|
||||
import { isNull, omitBy } from "lodash";
|
||||
import { omitBy } from "lodash";
|
||||
|
||||
import { Channel, UpdateChannelDTO, UpdatePinnedMessageDTO } from "@/types/channel";
|
||||
import BASE_URL from "../config";
|
||||
import { isUndefinedOrNull } from "@udecode/plate-common";
|
||||
|
||||
// import { updateVoicingInfo } from "./voice";
|
||||
|
||||
@@ -74,8 +75,13 @@ const channelsSlice = createSlice({
|
||||
break;
|
||||
}
|
||||
default:
|
||||
{
|
||||
const wtf = omitBy(rest, isUndefinedOrNull);
|
||||
console.log("rrrr", wtf);
|
||||
|
||||
// old code: state.byId[gid] = { ...state.byId[gid]!, ...getNonNullValues(rest) };
|
||||
state.byId[gid] = { ...state.byId[gid]!, ...omitBy(rest, isNull) };
|
||||
state.byId[gid] = { ...state.byId[gid]!, ...wtf };
|
||||
}
|
||||
break;
|
||||
}
|
||||
},
|
||||
|
||||
@@ -146,13 +146,9 @@ const Send: FC<IProps> = ({
|
||||
const onlyOwnerCanSend = !!(context == "channel"
|
||||
? channelsData[id]?.only_owner_can_send_msg
|
||||
: false);
|
||||
const canSendMessageInChannel = !isChannelOwner && onlyOwnerCanSend;
|
||||
if (canSendMessageInChannel) {
|
||||
return (
|
||||
<div className="p-5 uppercase bg-gray-200 rounded-lg w-fit dark:bg-gray-600 text-red-300">
|
||||
only Channel owner can send message!
|
||||
</div>
|
||||
);
|
||||
const canNotSendMessageInChannel = !isChannelOwner && onlyOwnerCanSend;
|
||||
if (canNotSendMessageInChannel) {
|
||||
return null;
|
||||
}
|
||||
if (context == "dm" && blocked) {
|
||||
return (
|
||||
|
||||
Reference in New Issue
Block a user