Port upstream commits into lavender #9

tulpenkiste · 2024-12-19T14:15:09Z

TODO

Ensure everything works
Revert unwanted changes (idk if all of them are gone'd)
Fix friend requests

catuhana · 2024-12-19T14:24:59Z

I was going to create a review but there are so many changes so it's better to comment - in many (probably every) files, branding, URLs, terms (space vs server) seems to be reverted.

tulpenkiste · 2024-12-19T14:26:50Z

I was going to create a review but there are so many changes so it's better to comment - in many (probably every) files, branding, URLs, terms (space vs server) seems to be reverted.

Yeah I'm working on it

tulpenkiste · 2024-12-19T15:07:59Z

Added a friend request fix but needs an additional patch on upryzing.js

tulpenkiste · 2024-12-19T16:01:44Z

Coauthor list to add when squash merging:

Revolt CI <[email protected]>
Paul Makles <[email protected]>
Mikhail Kobik <[email protected]>
JackDotJS <[email protected]>
Kirill Mironov <[email protected]>
Rizon <[email protected]>
2t34lth <[email protected]>

tulpenkiste · 2024-12-27T00:18:22Z

Just to note, this will be manually merged (as to add coauthors in a squash commit)

tulpenkiste · 2024-12-27T15:04:34Z

Just to note, this will be manually merged (as to add coauthors in a squash commit)

Nevermind, turns out I can squash and add coauthors inside of GitHub. Not sure why this isn't documented but ok github

amycatgirl

Review full of nits

Although I am noticing a bunch of changes that override existing commits, so those need to be fixed before we merge these.

amycatgirl · 2024-12-27T16:20:42Z

README.md

@@ -23,7 +23,7 @@ cd lavender
 # git submodule init && git submodule update

 # install all packages
-pnpm i
+pnpm i --frozen-lockfile


Why is --frozen-lockfile here?

When developing, it's important that we keep the lockfile up to date, --frozen-lockfile should only be used in CI/CD environments (imo)

I have 0 clue, ask the guy who put it on upstream

Although I think its less for developers and more for users that just want newer commits

Hm, maybe.

Might add a disclaimer on the README then

amycatgirl · 2024-12-27T16:21:15Z

README.md

@@ -55,7 +55,7 @@ Any edits to the `uprzying.js` codebase will immediately be reflected while deve

 ```bash
 # install packages
-pnpm i
+pnpm i --frozen-lockfile


Refer to my previous comment

amycatgirl · 2024-12-27T16:24:43Z

packages/client/components/app/interface/settings/server/Overview.tsx

@@ -109,7 +109,7 @@ export default function ServerOverview(props: ServerSettingsProps) {
            </FormGroup>
            <FormGroup>
              <CategoryButton
-                description="Server can be joined from Discover"
+                description="Space can be joined from Discover"


amycatgirl · 2024-12-27T16:26:04Z

packages/client/components/app/interface/settings/server/index.tsx

@@ -28,7 +28,7 @@ const Config: SettingsConfiguration<Server> = {
  title(key) {
    const t = useTranslation();
    return t(
-      `app.settings.server_pages.${key.replaceAll("/", ".")}.title`,
+      `app.settings.server_pages.${key.replaceAll("/", ".")}.title` as any,


Um, doesn't eslint complain about using any here?

Either way, the proper type here should be string

Its either eslint warning or TS error

amycatgirl · 2024-12-27T16:28:18Z

packages/client/components/app/interface/settings/user/Keybinds.tsx

@@ -62,7 +62,9 @@ export default function Keybinds() {

  const translateCombo = (combo: KeyCombo, short: boolean) =>
    combo
-      .map((key) => t(`keys.${key}.${short ? "short" : "full"}`, {}, key))
+      .map((key) =>
+        t(`keys.${key}.${short ? "short" : "full"}` as any, {}, key)


Again, string type instead of any.

amycatgirl · 2024-12-27T16:35:45Z

packages/client/components/auth/src/flows/FlowHome.tsx

+            })
+          }
+        >
+          OK


amycatgirl · 2024-12-27T16:50:29Z

packages/client/components/ui/components/design/atoms/indicators/ConversationStart.tsx

@@ -29,7 +29,8 @@ export function ConversationStart(props: Props) {
      </Show>
      <Typography variant="conversation-start">
        {t(
-          `app.main.channel.start.${props.channel.type === "SavedMessages" ? "saved" : "group"
+          `app.main.channel.start.${


oh and HERE it doesn't cast to any

awesome
so cool /s

amycatgirl · 2024-12-27T17:27:57Z

packages/client/components/ui/components/design/layout/Column.stories.tsx

@@ -48,7 +48,7 @@ export default {
        grow: true,
      },
      decorators: [
-        (props) => (
+        (props: any) => (


Im going to let this slide just because i have no clue what type props should be

I don't think it has a type

huh

i guess i'll check it later

amycatgirl · 2024-12-27T17:29:59Z

packages/client/components/ui/components/floating/UserCard.tsx

These are going to be replaced again anyway so 🥴

amycatgirl · 2024-12-27T17:36:05Z

packages/client/scripts/assets_fallback/wordmark_wide_500px.svg

Don't look at me, I've got no clue

amycatgirl

yay

tulpenkiste · 2024-12-27T18:52:08Z

yay

amycatgirl · 2024-12-27T18:59:50Z

😭😭😭😭😭😭😭😭😭😭😭😭😭😭😭

Rexogamer

I didn't get around to reviewing the whole thing, apologies, but this is what I did spot. GitHub is lagging severely, blocking me from checking each file, so apologies if you already fixed these

Rexogamer · 2024-12-21T07:48:25Z

packages/client/components/app/interface/channels/text/Message.tsx

-          <Match when={props.message.member?.timeout}>
-            <Tooltip content={`User has been timed out for ${dayjs(props.message.member?.timeout).toNow(true)}`} placement="top">
-              <MdSchedule {...iconSize(16)} />
-            </Tooltip>
-          </Match>


you seem to have accidentally removed the timeout indicator

packages/client/components/app/interface/settings/user/Feedback.tsx

Rexogamer · 2024-12-21T07:51:23Z

packages/client/components/app/interface/settings/user/index.tsx

-              icon: <MdSmartToy fill={theme!.colours.foreground} {...iconSize(20)} />,
+              icon: <MdSmartToy {...iconSize(20)} />,
              title: t("app.settings.pages.bots.title"),
            },
            {
              id: "feedback",
-              icon: <MdRateReview fill={theme!.colours.foreground} {...iconSize(20)} />,
+              icon: <MdRateReview {...iconSize(20)} />,


this needs to be re-added for dark mode support

Rexogamer · 2024-12-21T07:51:35Z

packages/client/components/app/interface/settings/user/index.tsx

-              icon: <MdMemory fill={theme!.colours.foreground} {...iconSize(20)} />,
+              icon: <MdMemory {...iconSize(20)} />,


Rexogamer · 2024-12-21T07:53:46Z

packages/client/components/app/menus/UserContextMenu.tsx

@@ -18,8 +18,6 @@ import MdFace from "@material-design-icons/svg/outlined/face.svg?component-solid
 import MdPersonAddAlt from "@material-design-icons/svg/outlined/person_add_alt.svg?component-solid";


re-add timeout stuff in this file (see below removals)

Rexogamer · 2024-12-27T10:12:27Z

packages/client/components/auth/src/flows/FlowHome.tsx

-            <span>your way.</span>
-          </b>
-          <span style={{ "text-align": "center", opacity: "0.5" }}>
-            Connect with Upryzing.


the text was here

Rexogamer · 2024-12-27T10:12:49Z

packages/client/components/auth/src/flows/FlowHome.tsx

+                }}
+              >
+                <span>Your conversations,</span>
+                <br />


this was removed for leaving a weird gap

Rexogamer · 2024-12-27T10:18:16Z

packages/client/components/i18n/index.tsx


 /**
- * Load and set a language by the given key
+ * set a language by the given key


Suggested change

* set a language by the given key

* Set a language by the given key

tulpenkiste added 2 commits December 19, 2024 10:24

Apparently revolt uses this now

828a5e4

WIP yoinking of upstream commits into Upryzing

e682b69

tulpenkiste added 3 commits December 19, 2024 15:55

Remove unwanted branding changes

f37901f

Add theme to Home.tsx

23e0d5e

Fix friend requests

78797bc

Dark theme enforcement

3c3453b

tulpenkiste added 4 commits December 19, 2024 17:25

Revert term change for stillOwnSpaces

c598e35

Update upryzing.js submodule

64ac702

Update it again

897dd86

ourple,,,

8f36f3d

tulpenkiste marked this pull request as ready for review December 27, 2024 00:16

tulpenkiste requested review from amycatgirl and Rexogamer December 27, 2024 00:16

tulpenkiste changed the title ~~WIP: Port upstream commits into lavender~~ Port upstream commits into lavender Dec 27, 2024

Pull forth newer commits

8499fd6

Fix client sending invalid empty messages (causing http err 422)

c32e281

amycatgirl reviewed Dec 27, 2024

View reviewed changes

What the twitter

a698d3f

amycatgirl reviewed Dec 27, 2024

View reviewed changes

tulpenkiste merged commit 1b59e71 into main Dec 27, 2024
3 checks passed

tulpenkiste deleted the mygodwhatareyoudoing branch December 27, 2024 19:05

Rexogamer reviewed Dec 30, 2024

View reviewed changes

amycatgirl added a commit that referenced this pull request Jan 2, 2025

chore: re-apply patches/fixes removed by #9

ff7bec2

amycatgirl mentioned this pull request Jan 2, 2025

Fix build and reintroduce changes #10

Draft

		icon: <MdMemory fill={theme!.colours.foreground} {...iconSize(20)} />,
		icon: <MdMemory {...iconSize(20)} />,

		@@ -18,8 +18,6 @@ import MdFace from "@material-design-icons/svg/outlined/face.svg?component-solid
		import MdPersonAddAlt from "@material-design-icons/svg/outlined/person_add_alt.svg?component-solid";

	* set a language by the given key
	* Set a language by the given key

Port upstream commits into lavender #9

Port upstream commits into lavender #9

Conversation

tulpenkiste commented Dec 19, 2024 • edited Loading

TODO

catuhana commented Dec 19, 2024

tulpenkiste commented Dec 19, 2024

tulpenkiste commented Dec 19, 2024

tulpenkiste commented Dec 19, 2024 • edited Loading

tulpenkiste commented Dec 27, 2024

tulpenkiste commented Dec 27, 2024

amycatgirl left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

amycatgirl left a comment

Choose a reason for hiding this comment

tulpenkiste commented Dec 27, 2024

amycatgirl commented Dec 27, 2024

Rexogamer left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tulpenkiste commented Dec 19, 2024 •

edited

Loading

tulpenkiste commented Dec 19, 2024 •

edited

Loading

Rexogamer left a comment •

edited

Loading