cswimr/revite
1
0
Fork 0
mirror of https://github.com/revoltchat/revite.git synced 2024-11-26 00:50:56 -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 (
channel.channel_type === "TextChannel"
) {
console.log(
`/server/${channel.server_id}/channel/${channel._id}/${message._id}`,
);
history.push(
`/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>;
}
// import aaa from "@fontsource/open-sans/300.css?raw";
// console.info(aaa);
export const FONTS: Record<Fonts, { name: string; load: () => void }> = {
"Open Sans": {
name: "Open Sans",

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

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

2
src/lib/ContextMenus.tsx
View file

@ -585,6 +585,7 @@ function ContextMenus(props: Props) {
}
if (user) {
if (!user.bot) {
let actions: Action["action"][];
switch (user.relationship) {
case RelationshipStatus.User:
@ -639,6 +640,7 @@ function ContextMenus(props: Props) {
} as unknown as Action);
}
}
}
if (contextualChannel) {
if (contextualChannel.channel_type === "Group" && uid) {

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

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