cswimr/revite
1
0
Fork 0
mirror of https://github.com/revoltchat/revite.git synced 2024-11-22 15:10:57 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/revoltchat/revite into pr-6

Browse source
This commit is contained in:
janderedev 2021-08-12 22:29:41 +02:00
commit 60947b71ed
No known key found for this signature in database
GPG key ID: 5D5E18ACB990F57A
5 changed files with 60 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/components/common/messaging/attachments/MessageReply.tsx
View file

@ -192,9 +192,6 @@ export const MessageReply = observer(({ index, channel, id }: Props) => {
if ( if (
channel.channel_type === "TextChannel" channel.channel_type === "TextChannel"
) { ) {
console.log(
`/server/${channel.server_id}/channel/${channel._id}/${message._id}`,
);
history.push( history.push(
`/server/${channel.server_id}/channel/${channel._id}/${message._id}`, `/server/${channel.server_id}/channel/${channel._id}/${message._id}`,
); );

3
src/context/Theme.tsx
View file

@ -77,9 +77,6 @@ export interface ThemeOptions {
custom?: Partial<Theme>; custom?: Partial<Theme>;
} }
// import aaa from "@fontsource/open-sans/300.css?raw";
// console.info(aaa);
export const FONTS: Record<Fonts, { name: string; load: () => void }> = { export const FONTS: Record<Fonts, { name: string; load: () => void }> = {
"Open Sans": { "Open Sans": {
name: "Open Sans", name: "Open Sans",

15
src/context/intermediate/popovers/UserProfile.tsx
View file

@ -195,12 +195,15 @@ export const UserProfile = observer(
<Edit size={28} /> <Edit size={28} />
</IconButton> </IconButton>
)} )}
{(user.relationship === RelationshipStatus.Incoming || {!user.bot &&
user.relationship === RelationshipStatus.None) && ( (user.relationship ===
<IconButton onClick={() => user.addFriend()}> RelationshipStatus.Incoming ||
<UserPlus size={28} /> user.relationship ===
</IconButton> RelationshipStatus.None) && (
)} <IconButton onClick={() => user.addFriend()}>
<UserPlus size={28} />
</IconButton>
)}
</div> </div>
<div className={styles.tabs}> <div className={styles.tabs}>
<div <div

100
src/lib/ContextMenus.tsx
View file

@ -585,58 +585,60 @@ function ContextMenus(props: Props) {
} }
if (user) { if (user) {
let actions: Action["action"][]; if (!user.bot) {
switch (user.relationship) { let actions: Action["action"][];
case RelationshipStatus.User: switch (user.relationship) {
actions = []; case RelationshipStatus.User:
break; actions = [];
case RelationshipStatus.Friend: break;
actions = ["remove_friend", "block_user"]; case RelationshipStatus.Friend:
break; actions = ["remove_friend", "block_user"];
case RelationshipStatus.Incoming: break;
actions = [ case RelationshipStatus.Incoming:
"add_friend", actions = [
"cancel_friend", "add_friend",
"block_user", "cancel_friend",
]; "block_user",
break; ];
case RelationshipStatus.Outgoing: break;
actions = ["cancel_friend", "block_user"]; case RelationshipStatus.Outgoing:
break; actions = ["cancel_friend", "block_user"];
case RelationshipStatus.Blocked: break;
actions = ["unblock_user"]; case RelationshipStatus.Blocked:
break; actions = ["unblock_user"];
case RelationshipStatus.BlockedOther: break;
actions = ["block_user"]; case RelationshipStatus.BlockedOther:
break; actions = ["block_user"];
case RelationshipStatus.None: break;
default: case RelationshipStatus.None:
actions = ["add_friend", "block_user"]; default:
} actions = ["add_friend", "block_user"];
}
if (userPermissions & UserPermission.ViewProfile) { if (userPermissions & UserPermission.ViewProfile) {
generateAction({ generateAction({
action: "view_profile", action: "view_profile",
user, user,
}); });
} }
if ( if (
user._id !== userId && user._id !== userId &&
userPermissions & UserPermission.SendMessage userPermissions & UserPermission.SendMessage
) { ) {
generateAction({ generateAction({
action: "message_user", action: "message_user",
user, user,
}); });
} }
for (let i = 0; i < actions.length; i++) { for (let i = 0; i < actions.length; i++) {
// Typescript can't determine that user the actions are linked together correctly // Typescript can't determine that user the actions are linked together correctly
generateAction({ generateAction({
action: actions[i], action: actions[i],
user, user,
} as unknown as Action); } as unknown as Action);
}
} }
} }

1
src/pages/channels/messaging/MessageArea.tsx
View file

@ -174,7 +174,6 @@ export const MessageArea = observer(({ channel }: Props) => {
if (renderer.state === "RENDER") { if (renderer.state === "RENDER") {
runInAction(() => (renderer.fetching = true)); runInAction(() => (renderer.fetching = true));
console.log(renderer.scrollAnchored);
if (renderer.scrollAnchored) { if (renderer.scrollAnchored) {
setScrollState({ type: "ScrollToBottom" }); setScrollState({ type: "ScrollToBottom" });
} else { } else {