Merge pull request #154 from luminous-devs/next

v3.0.1

apps/desktop/package.json

@@ -10,11 +10,14 @@
 		"@columns/antenas": "workspace:^",
 		"@columns/default": "workspace:^",
 		"@columns/foryou": "workspace:^",
+		"@columns/global": "workspace:^",
 		"@columns/group": "workspace:^",
 		"@columns/hashtag": "workspace:^",
 		"@columns/thread": "workspace:^",
 		"@columns/timeline": "workspace:^",
+		"@columns/trending-notes": "workspace:^",
 		"@columns/user": "workspace:^",
+		"@columns/waifu": "workspace:^",
 		"@getalby/sdk": "^3.2.3",
 		"@lume/ark": "workspace:^",
 		"@lume/icons": "workspace:^",
@@ -35,8 +38,8 @@
 		"@radix-ui/react-switch": "^1.0.3",
 		"@radix-ui/react-tooltip": "^1.0.7",
 		"@tanstack/react-query": "^5.17.19",
-		"framer-motion": "^10.18.0",
-		"i18next": "^23.8.0",
+		"framer-motion": "^11.0.3",
+		"i18next": "^23.8.1",
 		"i18next-resources-to-backend": "^1.2.0",
 		"jotai": "^2.6.3",
 		"minidenticons": "^4.2.0",
@@ -50,14 +53,14 @@
 		"react-i18next": "^14.0.1",
 		"react-router-dom": "^6.21.3",
 		"smol-toml": "^1.1.4",
-		"sonner": "^1.3.1",
-		"virtua": "^0.21.1"
+		"sonner": "^1.4.0",
+		"virtua": "^0.23.0"
 	},
 	"devDependencies": {
 		"@lume/tailwindcss": "workspace:^",
 		"@lume/tsconfig": "workspace:^",
 		"@lume/types": "workspace:^",
-		"@types/node": "^20.11.6",
+		"@types/node": "^20.11.10",
 		"@types/react": "^18.2.48",
 		"@types/react-dom": "^18.2.18",
 		"@vitejs/plugin-react-swc": "^3.5.0",

apps/desktop/src/routes/auth/create.tsx

@@ -36,7 +36,9 @@ export function CreateAccountScreen() {
 						onClick={() => setMethod("self")}
 						className={cn(
 							"flex flex-col items-start px-4 py-3.5 bg-neutral-900 rounded-xl hover:bg-neutral-800",
-							method === "self" ? "ring-1 ring-teal-500" : "",
+							method === "self"
+								? "ring-1 ring-offset-4 ring-offset-black ring-blue-500"
+								: "",
 						)}
 					>
 						<p className="font-semibold">{t("signup.selfManageMethod")}</p>
@@ -49,25 +51,57 @@ export function CreateAccountScreen() {
 						onClick={() => setMethod("managed")}
 						className={cn(
 							"flex flex-col items-start px-4 py-3.5 bg-neutral-900 rounded-xl hover:bg-neutral-800",
-							method === "managed" ? "ring-1 ring-teal-500" : "",
+							method === "managed"
+								? "ring-1 ring-offset-4 ring-offset-black ring-blue-500"
+								: "",
 						)}
 					>
-						<p className="font-semibold">{t("signup.providerMethod")}</p>
+						<div className="inline-flex items-center gap-2">
+							<p className="font-semibold">{t("signup.providerMethod")}</p>
+							<span className="text-xs font-medium px-2.5 py-0.5 rounded-full bg-gradient-to-tr from-blue-300 via-sky-500 to-teal-200">
+								Beta
+							</span>
+						</div>
 						<p className="text-sm font-medium text-neutral-500">
 							{t("signup.providerMethodDescription")}
 						</p>
 					</button>
-					<button
-						type="button"
-						onClick={next}
-						className="inline-flex items-center justify-center w-full h-12 text-lg font-medium text-white bg-blue-500 rounded-xl hover:bg-blue-600"
-					>
-						{loading ? (
-							<LoaderIcon className="size-5 animate-spin" />
-						) : (
-							t("global.continue")
-						)}
-					</button>
+					<div className="flex flex-col gap-3">
+						<button
+							type="button"
+							onClick={next}
+							className="inline-flex items-center justify-center w-full h-12 text-lg font-medium text-white bg-blue-500 rounded-xl hover:bg-blue-600"
+						>
+							{loading ? (
+								<LoaderIcon className="size-5 animate-spin" />
+							) : (
+								t("global.continue")
+							)}
+						</button>
+						{method === "managed" ? (
+							<div className="flex flex-col gap-1 text-sm text-neutral-500">
+								<p className="text-sm font-semibold text-neutral-300">
+									Attention:
+								</p>
+								<p>
+									You're chosing Managed by Provider, this feature still in
+									"Beta".
+								</p>
+								<p>
+									Some functions still missing or not work as expected, you
+									shouldn't create your main account with this method
+								</p>
+								<a
+									href="https://github.com/kind-0/nsecbunkerd/blob/master/OAUTH-LIKE-FLOW.md"
+									target="_blank"
+									rel="noreferrer"
+									className="text-blue-500"
+								>
+									Learn more
+								</a>
+							</div>
+						) : null}
+					</div>
 				</div>
 			</div>
 		</div>

apps/desktop/src/routes/home/index.tsx

@@ -1,11 +1,14 @@
 import { Antenas } from "@columns/antenas";
 import { Default } from "@columns/default";
 import { ForYou } from "@columns/foryou";
+import { Global } from "@columns/global";
 import { Group } from "@columns/group";
 import { Hashtag } from "@columns/hashtag";
 import { Thread } from "@columns/thread";
 import { Timeline } from "@columns/timeline";
+import { TrendingNotes } from "@columns/trending-notes";
 import { User } from "@columns/user";
+import { Waifu } from "@columns/waifu";
 import { useColumnContext } from "@lume/ark";
 import {
 	ArrowLeftIcon,
@@ -45,6 +48,12 @@ export function HomeScreen() {
 				return <Group key={column.id} column={column} />;
 			case COL_TYPES.antenas:
 				return <Antenas key={column.id} column={column} />;
+			case COL_TYPES.global:
+				return <Global key={column.id} column={column} />;
+			case COL_TYPES.trendingNotes:
+				return <TrendingNotes key={column.id} column={column} />;
+			case COL_TYPES.waifu:
+				return <Waifu key={column.id} column={column} />;
 			default:
 				return <Default key={column.id} column={column} />;
 		}

apps/desktop/src/routes/settings/profile.tsx

@@ -51,11 +51,6 @@ export function ProfileSettingScreen() {
 
 		let content = {
 			...data,
-			username: data.name,
-			display_name: data.displayName,
-			bio: data.about,
-			image: picture,
-			cover: banner,
 			picture,
 			banner,
 		};
@@ -140,7 +135,7 @@ export function ProfileSettingScreen() {
 						</label>
 						<input
 							type={"text"}
-							{...register("displayName")}
+							{...register("display_name")}
 							spellCheck={false}
 							className="relative h-11 w-full rounded-lg border-transparent bg-neutral-100 px-3 py-1 text-neutral-900 !outline-none backdrop-blur-xl placeholder:text-neutral-500 focus:border-blue-500 focus:ring focus:ring-blue-200 dark:bg-neutral-900 dark:text-neutral-100"
 						/>

apps/web/package.json

@@ -13,7 +13,7 @@
 		"@astrojs/check": "^0.4.1",
 		"@astrojs/tailwind": "^5.1.0",
 		"@fontsource/geist-mono": "^5.0.1",
-		"astro": "^4.2.4",
+		"astro": "^4.2.6",
 		"astro-seo-meta": "^4.1.0",
 		"astro-seo-schema": "^4.0.0",
 		"schema-dts": "^1.1.2",

flatpak/Containerfile

@@ -35,15 +35,6 @@ RUN pnpm install --frozen-lockfile
 # Path for disable updater
 #ADD flatpak/0001-disable-tauri-updater.patch .
 #RUN patch -p1 -t -i flatpak/0001-disable-tauri-updater.patch
-#ADD flatpak/0002-depot-remove.patch .
-#RUN patch -p1 -t -i 0002-depot-remove.patch
-
-# compile depot
-
-#ADD flatpak/build-depot.sh build-depot.sh
-#RUN mv flatpak/build-depot.sh build-depot.sh
-#RUN sh build-depot.sh
-#RUN pnpm run build:depot
 
 #ENV VITE_FLATPAK_RESOURCE="/app/lib/lume/resources/config.toml"
 

flatpak/nu.lume.Lume.appdata.xml

@@ -1,50 +1,78 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop-application">
-  <id>nu.lume.Lume</id>
-  <launchable type="desktop-id">nu.lume.Lume.desktop</launchable>
-
-  <name>Lume</name>
-  <summary>A cross-platform desktop nostr client</summary>
-  <developer_name>Ren Amamiya</developer_name>
-
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>GPL-3.0-only</project_license>
-
-  <url type="homepage">https://lume.nu</url>
-  <url type="bugtracker">https://github.com/luminous-devs/lume/issues</url>
-  <url type="donation">https://nostree.me/npub1zfss807aer0j26mwp2la0ume0jqde3823rmu97ra6sgyyg956e0s6xw445</url>
-
-  <supports>
-    <control>pointing</control>
-    <control>keyboard</control>
-    <control>touch</control>
-  </supports>
-
-  <description>
-    <p>
-      Lume a cross-platform nostr client, supported nsbunker, chats and notifications
-    </p>
-  </description>
-
-  <custom>
-      <value key="Purism::form_factor">workstation</value>
-      <value key="Purism::form_factor">mobile</value>
-  </custom>
-  <screenshots>
-  <screenshot type="default">
-    <image> https://raw.githubusercontent.com/kogeletey/lume-nostr/feat/package-flatpak/flatpak/screenshoots/login-screen.png </image>
-  </screenshot>
-  <screenshot>
-    <image>https://raw.githubusercontent.com/kogeletey/lume-nostr/feat/package-flatpak/flatpak/screenshoots/collumns.png</image>
-  </screenshot>
-  <screenshot>
-    <image> https://raw.githubusercontent.com/kogeletey/lume-nostr/feat/package-flatpak/flatpak/screenshoots/home-screen.png </image>
-  </screenshot>
-  </screenshots>
-
-
-  <releases>
-      <release version="2.2.3" date="2023-12-07"/>
-  </releases>
-  <content_rating type="oars-1.1"/>
+	<id>
+		nu.lume.Lume
+	</id>
+	<launchable type="desktop-id">
+		nu.lume.Lume.desktop
+	</launchable>
+	<name>
+		Lume
+	</name>
+	<summary>
+		A cross-platform desktop nostr client
+	</summary>
+	<developer_name>
+		Ren Amamiya
+	</developer_name>
+	<metadata_license>
+		CC0-1.0
+	</metadata_license>
+	<project_license>
+		GPL-3.0-only
+	</project_license>
+	<url type="homepage">
+		https://lume.nu
+	</url>
+	<url type="bugtracker">
+		https://github.com/luminous-devs/lume/issues
+	</url>
+	<url type="donation">
+		https://nostree.me/npub1zfss807aer0j26mwp2la0ume0jqde3823rmu97ra6sgyyg956e0s6xw445
+	</url>
+	<supports>
+		<control>
+			pointing
+		</control>
+		<control>
+			keyboard
+		</control>
+		<control>
+			touch
+		</control>
+	</supports>
+	<description>
+		<p>
+			Lume a cross-platform nostr client, supported nsecbunker, chats and notifications
+		</p>
+	</description>
+	<custom>
+		<value key="Purism::form_factor">
+			workstation
+		</value>
+		<value key="Purism::form_factor">
+			mobile
+		</value>
+	</custom>
+	<screenshots>
+		<screenshot type="default">
+			<image>
+				https://raw.githubusercontent.com/luminous-devs/lume/flatpak/screenshots/login-screen.png
+			</image>
+		</screenshot>
+		<screenshot>
+			<image>
+				https://raw.githubusercontent.com/luminous-devs/lume/flatpak/screenshots/collumns.png
+			</image>
+		</screenshot>
+		<screenshot>
+			<image>
+				https://raw.githubusercontent.com/luminous-devs/lume/flatpak/screenshots/home-screen.png
+			</image>
+		</screenshot>
+	</screenshots>
+	<releases>
+		<release version="3.0.0" date="2024-15-01" />
+	</releases>
+	<content_rating type="oars-1.1" />
 </component>

flatpak/nu.lume.Lume.yml

@@ -32,9 +32,8 @@ modules:
     buildsystem: simple
     build-commands:
       - install -Dm755 bin/lume /app/bin/lume
-    #   - install -Dm755 bin/depot /app/bin/depot
-    #   - mkdir -p /app/lib/lume/resources
-    #  - cp -r lib/lume/resources /app/lib/lume/resources
+      - mkdir -p /app/lib/lume/resources
+      - cp -r lib/lume/resources /app/lib/lume/resources
       - mkdir -p /app/share/icons/hicolor/
       - cp -r share/icons/hicolor/ /app/share/icons/
       - install -Dm644 nu.lume.Lume.appdata.xml /app/share/metainfo/nu.lume.Lume.appdata.xml

packages/ark/package.json

@@ -35,11 +35,11 @@
 		"react-i18next": "^14.0.1",
 		"react-router-dom": "^6.21.3",
 		"react-string-replace": "^1.1.1",
-		"sonner": "^1.3.1",
+		"sonner": "^1.4.0",
 		"string-strip-html": "^13.4.5",
 		"tippy.js": "^6.3.7",
 		"use-context-selector": "^1.4.1",
-		"virtua": "^0.21.1"
+		"virtua": "^0.23.0"
 	},
 	"devDependencies": {
 		"@lume/tailwindcss": "workspace:^",

packages/ark/src/ark.ts

@@ -62,6 +62,10 @@ export class Ark {
 		return sub;
 	}
 
+	public getNDKEvent(event: NostrEvent) {
+		return new NDKEvent(this.ndk, event);
+	}
+
 	public async createEvent({
 		kind,
 		tags,