diff --git a/backend/src/data/models/theme.ts b/backend/src/data/models/theme.ts index 8596b29b..48f4fcd7 100644 --- a/backend/src/data/models/theme.ts +++ b/backend/src/data/models/theme.ts @@ -17,7 +17,7 @@ export const Theme = model('theme', new Schema({ default: generateInvite, unique: [true, 'Code should be unique'], dropDups: true, - validate: [/(? { const selfUserId = ws.sessions.get(client.id); if (guild.ownerId === member.userId) - throw new TypeError('You cannot leave a guild you own'); + throw new TypeError('You cannot leave a guild you own, check guild settings to delete guild'); else if (selfUserId !== member.userId) await deps.wsGuard.validateCan(client, guildId, 'KICK_MEMBERS'); diff --git a/frontend/src/components/ctx-menus/guild-member/guild-member-menu.tsx b/frontend/src/components/ctx-menus/guild-member/guild-member-menu.tsx index 119359d2..caee20fe 100644 --- a/frontend/src/components/ctx-menus/guild-member/guild-member-menu.tsx +++ b/frontend/src/components/ctx-menus/guild-member/guild-member-menu.tsx @@ -50,7 +50,8 @@ const GuildMemberMenu: React.FunctionComponent = ({ user } - {user.id !== selfUser.id && (<> + {user.id !== selfUser.id && ( +

= ({ user } - )} +
+ + + Private messages + + + +
+ )} {(canKick || canManage) && (
diff --git a/frontend/src/components/modals/user-settings/user-settings-advanced.tsx b/frontend/src/components/modals/user-settings/user-settings-advanced.tsx index 6cd88f9e..06f83b84 100644 --- a/frontend/src/components/modals/user-settings/user-settings-advanced.tsx +++ b/frontend/src/components/modals/user-settings/user-settings-advanced.tsx @@ -13,9 +13,9 @@ const UserSettingsAdvanced: React.FunctionComponent = () => { const requestDelete = () => { const confirmation = window.prompt( `WARNING: You are about to delete account '${selfUser.username}'\n` + - `Type \'accord\' to confirm deletion.` + `Type \'confirm\' to confirm deletion.` ); - if (confirmation == 'accord') + if (confirmation == 'confirm') dispatch(deleteSelf()); }; diff --git a/frontend/src/components/pages/loading-page.tsx b/frontend/src/components/pages/loading-page.tsx index 815a5c81..b29a74ff 100644 --- a/frontend/src/components/pages/loading-page.tsx +++ b/frontend/src/components/pages/loading-page.tsx @@ -24,7 +24,7 @@ const LoadingPage: React.FunctionComponent = () => { 'TypeError: There may be bugs.', 'What is a Discord? :thinking:', 'Does anyone remember Skype?', - 'Started in 2020.', + 'Started in 2020, continued by PVTChat team in 2025.', 'Disclaimer: Not actually a Discord clone.', ]; const randomIndex = Math.floor(Math.random() * tips.length);