diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 41456656..af6b3b39 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -407,14 +407,14 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: false - /@floating-ui/core@1.3.0: - resolution: {integrity: sha512-vX1WVAdPjZg9DkDkC+zEx/tKtnST6/qcNpwcjeBgco3XRNHz5PUA+ivi/yr6G3o0kMR60uKBJcfOdfzOFI7PMQ==} + /@floating-ui/core@1.3.1: + resolution: {integrity: sha512-Bu+AMaXNjrpjh41znzHqaz3r2Nr8hHuHZT6V2LBKMhyMl0FgKA62PNYbqnfgmzOhoWZj70Zecisbo4H1rotP5g==} dev: false - /@floating-ui/dom@1.3.0: - resolution: {integrity: sha512-qIAwejE3r6NeA107u4ELDKkH8+VtgRKdXqtSPaKflL2S2V+doyN+Wt9s5oHKXPDo4E8TaVXaHT3+6BbagH31xw==} + /@floating-ui/dom@1.4.0: + resolution: {integrity: sha512-b4F0iWffLiqb/TpP2PWVOixrZqE6ni+6VT64AmFH7sJIF3SFPLbe6/h3jQ5Cwffs+HaC9A8V0TQzCPBwVvziIA==} dependencies: - '@floating-ui/core': 1.3.0 + '@floating-ui/core': 1.3.1 dev: false /@floating-ui/react-dom@1.3.0(react-dom@18.2.0)(react@18.2.0): @@ -423,7 +423,7 @@ packages: react: '>=16.8.0' react-dom: '>=16.8.0' dependencies: - '@floating-ui/dom': 1.3.0 + '@floating-ui/dom': 1.4.0 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) dev: false @@ -1370,7 +1370,7 @@ packages: postcss: ^8.1.0 dependencies: browserslist: 4.21.9 - caniuse-lite: 1.0.30001503 + caniuse-lite: 1.0.30001504 fraction.js: 4.2.0 normalize-range: 0.1.2 picocolors: 1.0.0 @@ -1414,7 +1414,7 @@ packages: engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true dependencies: - caniuse-lite: 1.0.30001503 + caniuse-lite: 1.0.30001504 electron-to-chromium: 1.4.433 node-releases: 2.0.12 update-browserslist-db: 1.0.11(browserslist@4.21.9) @@ -1482,8 +1482,8 @@ packages: engines: {node: '>=6'} dev: false - /caniuse-lite@1.0.30001503: - resolution: {integrity: sha512-Sf9NiF+wZxPfzv8Z3iS0rXM1Do+iOy2Lxvib38glFX+08TCYYYGR5fRJXk4d77C4AYwhUjgYgMsMudbh2TqCKw==} + /caniuse-lite@1.0.30001504: + resolution: {integrity: sha512-5uo7eoOp2mKbWyfMXnGO9rJWOGU8duvzEiYITW+wivukL7yHH4gX9yuRaobu6El4jPxo6jKZfG+N6fB621GD/Q==} dev: true /chalk@2.4.2: diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 8bceed65..4a7729e8 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,133 +1,141 @@ { - "build": { - "beforeDevCommand": "pnpm dev", - "beforeBuildCommand": "pnpm build", - "devPath": "http://localhost:3000", - "distDir": "../dist/client", - "withGlobalTauri": true - }, - "package": { - "productName": "Lume", - "version": "1.0.0" - }, - "tauri": { - "allowlist": { - "all": false, - "app": { - "all": false - }, - "os": { - "all": true - }, - "http": { - "all": true, - "request": true, - "scope": ["https://void.cat/*", "https://skrape.dev/*"] - }, - "fs": { - "all": false, - "readFile": true, - "readDir": true, - "scope": [ - "$APPDATA/*", - "$DATA/*", - "$LOCALDATA/*", - "$DESKTOP/*", - "$DOCUMENT/*", - "$DOWNLOAD/*", - "$HOME/*", - "$PICTURE/*", - "$PUBLIC/*", - "$VIDEO/*" - ] - }, - "shell": { - "all": false, - "open": true - }, - "clipboard": { - "all": false, - "writeText": true, - "readText": true - }, - "dialog": { - "all": false, - "open": true - }, - "notification": { - "all": true - }, - "window": { - "startDragging": true, - "close": true - }, - "process": { - "all": false, - "exit": false, - "relaunch": true, - "relaunchDangerousAllowSymlinkMacos": false - } - }, - "bundle": { - "active": true, - "category": "SocialNetworking", - "copyright": "", - "appimage": { - "bundleMediaFramework": true - }, - "deb": { - "depends": [] - }, - "externalBin": [], - "icon": ["icons/32x32.png", "icons/128x128.png", "icons/128x128@2x.png", "icons/icon.icns", "icons/icon.ico"], - "identifier": "com.lume.nu", - "longDescription": "", - "macOS": { - "entitlements": null, - "exceptionDomain": "", - "frameworks": [], - "providerShortName": null, - "signingIdentity": null - }, - "resources": [], - "shortDescription": "", - "targets": "all", - "windows": { - "certificateThumbprint": null, - "digestAlgorithm": "sha256", - "timestampUrl": "" - } - }, - "security": { - "csp": "upgrade-insecure-requests" - }, - "updater": { - "active": true, - "endpoints": ["https://releases.lume.nu/{{target}}/{{arch}}/{{current_version}}"], - "dialog": true, - "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDIyOUI0Qjc1MTBCOUNGNUEKUldSYXo3a1FkVXViSWxYTlhhS0E4UjRIcEkzd04yN1Y0dys4QWY5WjRybEF5eElLcGFXZmJnRzQK", - "windows": { - "installMode": "passive" - } - }, - "systemTray": { - "iconPath": "icons/icon.png", - "iconAsTemplate": true - }, - "windows": [ - { - "title": "Lume", - "theme": "Dark", - "titleBarStyle": "Overlay", - "hiddenTitle": true, - "transparent": false, - "fullscreen": false, - "resizable": true, - "width": 1100, - "height": 800, - "minWidth": 800, - "minHeight": 700 - } - ] - } + "build": { + "beforeDevCommand": "pnpm dev", + "beforeBuildCommand": "pnpm build", + "devPath": "http://localhost:3000", + "distDir": "../dist/client", + "withGlobalTauri": true + }, + "package": { + "productName": "Lume", + "version": "1.0.0" + }, + "tauri": { + "allowlist": { + "all": false, + "app": { + "all": false + }, + "os": { + "all": true + }, + "http": { + "all": true, + "request": true, + "scope": ["https://void.cat/*", "https://skrape.dev/*"] + }, + "fs": { + "all": false, + "readFile": true, + "readDir": true, + "scope": [ + "$APPDATA/*", + "$DATA/*", + "$LOCALDATA/*", + "$DESKTOP/*", + "$DOCUMENT/*", + "$DOWNLOAD/*", + "$HOME/*", + "$PICTURE/*", + "$PUBLIC/*", + "$VIDEO/*" + ] + }, + "shell": { + "all": false, + "open": true + }, + "clipboard": { + "all": false, + "writeText": true, + "readText": true + }, + "dialog": { + "all": false, + "open": true + }, + "notification": { + "all": true + }, + "window": { + "startDragging": true, + "close": true + }, + "process": { + "all": false, + "exit": false, + "relaunch": true, + "relaunchDangerousAllowSymlinkMacos": false + } + }, + "bundle": { + "active": true, + "category": "SocialNetworking", + "copyright": "", + "appimage": { + "bundleMediaFramework": true + }, + "deb": { + "depends": [] + }, + "externalBin": [], + "icon": [ + "icons/32x32.png", + "icons/128x128.png", + "icons/128x128@2x.png", + "icons/icon.icns", + "icons/icon.ico" + ], + "identifier": "com.lume.nu", + "longDescription": "", + "macOS": { + "entitlements": null, + "exceptionDomain": "", + "frameworks": [], + "providerShortName": null, + "signingIdentity": null + }, + "resources": [], + "shortDescription": "", + "targets": "all", + "windows": { + "certificateThumbprint": null, + "digestAlgorithm": "sha256", + "timestampUrl": "" + } + }, + "security": { + "csp": "upgrade-insecure-requests" + }, + "updater": { + "active": true, + "endpoints": [ + "https://releases.lume.nu/{{target}}/{{arch}}/{{current_version}}" + ], + "dialog": true, + "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDIyOUI0Qjc1MTBCOUNGNUEKUldSYXo3a1FkVXViSWxYTlhhS0E4UjRIcEkzd04yN1Y0dys4QWY5WjRybEF5eElLcGFXZmJnRzQK", + "windows": { + "installMode": "passive" + } + }, + "systemTray": { + "iconPath": "icons/icon.png", + "iconAsTemplate": true + }, + "windows": [ + { + "title": "Lume", + "theme": "Dark", + "titleBarStyle": "Overlay", + "hiddenTitle": true, + "transparent": false, + "fullscreen": false, + "resizable": true, + "width": 1080, + "height": 800, + "minWidth": 1080, + "minHeight": 720 + } + ] + } } diff --git a/src/app/auth/pages/index.page.tsx b/src/app/auth/pages/index.page.tsx index 6f9b9c8c..4a867302 100644 --- a/src/app/auth/pages/index.page.tsx +++ b/src/app/auth/pages/index.page.tsx @@ -2,7 +2,7 @@ export function Page() { return (
-

+

Preserve your freedom

diff --git a/src/app/prefetch/pages/index.page.tsx b/src/app/prefetch/pages/index.page.tsx index ca4328f9..89cd906d 100644 --- a/src/app/prefetch/pages/index.page.tsx +++ b/src/app/prefetch/pages/index.page.tsx @@ -107,7 +107,7 @@ export function Page() { async function fetchChannelMessages() { try { const ids = []; - const channels: any = await getChannels(10, 0); + const channels: any = await getChannels(); channels.forEach((channel) => { ids.push(channel.event_id); }); diff --git a/src/app/space/components/blocks/feed.tsx b/src/app/space/components/blocks/feed.tsx index 8551b124..b6bc92fb 100644 --- a/src/app/space/components/blocks/feed.tsx +++ b/src/app/space/components/blocks/feed.tsx @@ -56,7 +56,7 @@ export function FeedBlock({ params }: { params: any }) { }, [notes.length, rowVirtualizer.getVirtualItems()]); return ( -
+
+
+
+
- {truncate ? truncateContent(content.parsed, 120) : content.parsed} + {truncate ? truncateContent(content.original, 100) : content.parsed}
{Array.isArray(content.images) && content.images.length ? ( diff --git a/src/shared/notes/preview/link.tsx b/src/shared/notes/preview/link.tsx index bf6818a9..87532ab6 100644 --- a/src/shared/notes/preview/link.tsx +++ b/src/shared/notes/preview/link.tsx @@ -28,7 +28,7 @@ export function LinkPreview({ urls }: { urls: string[] }) { {urls[0]} )}
diff --git a/src/shared/user.tsx b/src/shared/user.tsx index e80605f0..104db9bb 100644 --- a/src/shared/user.tsx +++ b/src/shared/user.tsx @@ -21,7 +21,11 @@ export function User({ const avatarHeight = size === "small" ? "h-6" : "h-11"; return ( - + @@ -32,7 +36,11 @@ export function User({ />
-
+
{user?.nip05 || user?.name || shortenKey(pubkey)}
{repost && ( diff --git a/src/stores/channels.tsx b/src/stores/channels.tsx index e974f9c0..f9704d6f 100644 --- a/src/stores/channels.tsx +++ b/src/stores/channels.tsx @@ -11,7 +11,7 @@ export const useChannels = create( immer((set) => ({ channels: [], fetch: async () => { - const response = await getChannels(10, 0); + const response = await getChannels(); set({ channels: response }); }, add: (event) => { diff --git a/src/stores/constants.tsx b/src/stores/constants.tsx index dfbda84c..58ac036d 100644 --- a/src/stores/constants.tsx +++ b/src/stores/constants.tsx @@ -1,16 +1,12 @@ export const APP_VERSION = "1.0.0"; -export const DEFAULT_AVATAR = "https://void.cat/d/KmypFh2fBdYCEvyJrPiN89.webp"; - -export const DEFAULT_CHANNEL_BANNER = - "https://bafybeiacwit7hjmdefqggxqtgh6ht5dhth7ndptwn2msl5kpkodudsr7py.ipfs.w3s.link/banner-1.jpg"; +export const DEFAULT_AVATAR = "https://void.cat/d/PZcdCxNc24rCCxV8QXbdFQ"; export const OPENGRAPH_KEY = "9EJG4SY-19Q4M5J-H8R29C9-091XPCC"; export const FULL_RELAYS = [ - "wss://welcome.nostr.wine", - "wss://relay.nostr.band", "wss://relay.damus.io", + "wss://relay.nostr.band/all", "wss://relay.nostrich.land", - "wss://nostr.mutinywallet.com", + "wss://relay.nostrgraph.net", ]; diff --git a/src/utils/transform.tsx b/src/utils/transform.tsx index ac8fed55..a256d126 100644 --- a/src/utils/transform.tsx +++ b/src/utils/transform.tsx @@ -3,7 +3,7 @@ import destr from "destr"; import { nip19 } from "nostr-tools"; export function truncateContent(str, n) { - return str.length > n ? `${str.slice(0, n - 1)}…` : str; + return str.length > n ? `${str.slice(0, n - 1)}...` : str; } export function setToArray(tags: any) {