From 4f7bb6459ef9d653982f8d10738e664b4fb8143a Mon Sep 17 00:00:00 2001 From: hzrd149 Date: Sun, 3 Nov 2024 14:39:16 +0000 Subject: [PATCH] use next version of applesauce --- package.json | 14 +- pnpm-lock.yaml | 125 +++++++++++++----- .../components/repost-notification.tsx | 4 +- 3 files changed, 104 insertions(+), 39 deletions(-) diff --git a/package.json b/package.json index 33d69487c..cf2322c81 100644 --- a/package.json +++ b/package.json @@ -43,13 +43,13 @@ "@uiw/codemirror-theme-github": "^4.23.0", "@uiw/react-codemirror": "^4.23.0", "@webscopeio/react-textarea-autocomplete": "^4.9.2", - "applesauce-channel": "^0.8.0", - "applesauce-content": "^0.8.0", - "applesauce-core": "^0.8.0", - "applesauce-net": "^0.8.0", - "applesauce-react": "^0.8.0", - "applesauce-lists": "^0.8.0", - "applesauce-signer": "^0.8.0", + "applesauce-channel": "next", + "applesauce-content": "next", + "applesauce-core": "next", + "applesauce-net": "next", + "applesauce-react": "next", + "applesauce-lists": "next", + "applesauce-signer": "next", "bech32": "^2.0.0", "blossom-client-sdk": "^0.7.0", "blossom-drive-sdk": "^0.4.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2e444e572..4f8441f8e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -94,26 +94,26 @@ importers: specifier: ^4.9.2 version: 4.9.2(prop-types@15.8.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) applesauce-channel: - specifier: ^0.8.0 - version: link:../applesauce/packages/channel + specifier: next + version: 0.0.0-next-20241103143210(typescript@5.6.2) applesauce-content: - specifier: ^0.8.0 - version: link:../applesauce/packages/content + specifier: next + version: 0.0.0-next-20241103143210(typescript@5.6.2) applesauce-core: - specifier: ^0.8.0 - version: link:../applesauce/packages/core + specifier: next + version: 0.0.0-next-20241103143210(typescript@5.6.2) applesauce-lists: - specifier: ^0.8.0 - version: 0.8.0(typescript@5.6.2) + specifier: next + version: 0.0.0-next-20241103143210(typescript@5.6.2) applesauce-net: - specifier: ^0.8.0 - version: 0.8.0(typescript@5.6.2) + specifier: next + version: 0.0.0-next-20241103143210(typescript@5.6.2) applesauce-react: - specifier: ^0.8.0 - version: link:../applesauce/packages/react + specifier: next + version: 0.0.0-next-20241103143210(typescript@5.6.2) applesauce-signer: - specifier: ^0.8.0 - version: 0.8.0(typescript@5.6.2) + specifier: next + version: 0.0.0-next-20241103143210(typescript@5.6.2) bech32: specifier: ^2.0.0 version: 2.0.0 @@ -2310,17 +2310,26 @@ packages: resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==} engines: {node: '>=8'} - applesauce-core@0.8.0: - resolution: {integrity: sha512-ezH0ufSZMSS4EZlEcKSciLeq9bY2vv07pLBWLUrwZX3uCij3hcR8UtN7W78+XdWGNs0PIpSUPiWu3sEvVWFtFA==} + applesauce-channel@0.0.0-next-20241103143210: + resolution: {integrity: sha512-6SLWKV/mlhDfH9002fln+eMHzSJPiNgUpislvrX1yaFbPUxvs+BD47T2IjPT7JJXA7K18J1WGVaQ0NYyXmbn9g==} - applesauce-lists@0.8.0: - resolution: {integrity: sha512-3ITd1y3frDIsVCr0pk/7Nd9NMIqM/JB8Mp3UqBjjphdUBOUHc31WkZhcGxQgSJnt7x0rv9FVbmjsS3Q2I4cKnw==} + applesauce-content@0.0.0-next-20241103143210: + resolution: {integrity: sha512-LnplM9g1qsr9P60wJpFb25fvjlXQz2KpD3TnjqymFzaeZrxa0aOiagpJ3lTA4aJhDROyD15/T3wdNCumMrr7Lg==} - applesauce-net@0.8.0: - resolution: {integrity: sha512-yT9q6Z2slFlUP52/IqR4jWfOOfrSulCUnH3svSqwtmNGEupBEkdvMD64fbKqTGKWhyT3KkydbfTiOFDzMWv4/w==} + applesauce-core@0.0.0-next-20241103143210: + resolution: {integrity: sha512-8v1zZbXEwksNIuYD5qCvUHyNJ+goz8kg7mVRB1u1uLwNdAsG5eWCcxUOV28G39odfMmpM325oqoGC0fzPgGAww==} - applesauce-signer@0.8.0: - resolution: {integrity: sha512-TunYBkFDXA4Kc6kOhuI0zCJ/+CCGzb98jZ+RXojvVmKxOb1/JJwf103R1mY6223EqhMJtvbwrRQE66n2CdPxCw==} + applesauce-lists@0.0.0-next-20241103143210: + resolution: {integrity: sha512-1DOCrd36Nq9dQzFiNq0jWYc0tgkjkRZfNOP+nSCmn2PFo1v0Sid3mGucSWAmC9Cc2TgzypTrSei+nXkgEAiAJg==} + + applesauce-net@0.0.0-next-20241103143210: + resolution: {integrity: sha512-7rXEKPnSjahadKDwCBWFILl5dgF6MqH2P/LqiaraN4zrFVv9LCOa/Nz9EsTNFdhe1tD2e9QOU5+esU2VKtqSpw==} + + applesauce-react@0.0.0-next-20241103143210: + resolution: {integrity: sha512-T2GchMiAVtHjxmbR3HNDgBrZafatx18/gUPpUzg9lAFwC+jdhEDiBbI9HVi02V/VOsj1MlZBE8tTVlk3bI/H4A==} + + applesauce-signer@0.0.0-next-20241103143210: + resolution: {integrity: sha512-oltPW/6aDvFFQDSvf/FDcg3fs4rVc0EJGsLE9HEUz83QJzlupijemSRVi3ym7fGPPm0BWm74eAmMmlEsTDknbA==} argparse@1.0.10: resolution: {integrity: sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==} @@ -3377,6 +3386,9 @@ packages: lines-and-columns@1.2.4: resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==} + linkifyjs@4.1.3: + resolution: {integrity: sha512-auMesunaJ8yfkHvK4gfg1K0SaKX/6Wn9g2Aac/NwX+l5VdmFZzo/hdPGxEOETj+ryRa4/fiOPjeeKURSAJx1sg==} + locate-path@5.0.0: resolution: {integrity: sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==} engines: {node: '>=8'} @@ -4133,6 +4145,9 @@ packages: remark-wiki-link@2.0.1: resolution: {integrity: sha512-F8Eut1E7GWfFm4ZDTI6/4ejeZEHZgnVk6E933Yqd/ssYsc4AyI32aGakxwsGcEzbbE7dkWi1EfLlGAdGgOZOsA==} + remark@15.0.1: + resolution: {integrity: sha512-Eht5w30ruCXgFmxVUSlNWQ9iiimq07URKeFS3hNc8cUWy1llX4KDWfyEDZRycMc+znsN9Ux5/tJ/BFdgdOwA3A==} + remove-accents@0.5.0: resolution: {integrity: sha512-8g3/Otx1eJaVD12e31UbJj1YzdtVvzH85HV7t+9MJYk/u3XmkOUJ5Ys9wQrf9PCPK8+xn4ymzqYCiZl6QWKn+A==} @@ -7250,10 +7265,38 @@ snapshots: dependencies: color-convert: 2.0.1 - applesauce-core@0.8.0(typescript@5.6.2): + applesauce-channel@0.0.0-next-20241103143210(typescript@5.6.2): + dependencies: + applesauce-core: 0.0.0-next-20241103143210(typescript@5.6.2) + nostr-tools: 2.7.2(typescript@5.6.2) + rxjs: 7.8.1 + transitivePeerDependencies: + - supports-color + - typescript + + applesauce-content@0.0.0-next-20241103143210(typescript@5.6.2): + dependencies: + '@cashu/cashu-ts': 1.1.0 + '@types/hast': 3.0.4 + '@types/mdast': 4.0.4 + '@types/unist': 3.0.3 + applesauce-core: 0.0.0-next-20241103143210(typescript@5.6.2) + linkifyjs: 4.1.3 + mdast-util-find-and-replace: 3.0.1 + nostr-tools: 2.7.2(typescript@5.6.2) + remark: 15.0.1 + remark-parse: 11.0.0 + unified: 11.0.5 + unist-util-visit-parents: 6.0.1 + transitivePeerDependencies: + - supports-color + - typescript + + applesauce-core@0.0.0-next-20241103143210(typescript@5.6.2): dependencies: debug: 4.3.7 json-stringify-deterministic: 1.0.12 + light-bolt11-decoder: 3.2.0 nanoid: 5.0.7 nostr-tools: 2.7.2(typescript@5.6.2) rxjs: 7.8.1 @@ -7261,13 +7304,13 @@ snapshots: - supports-color - typescript - applesauce-lists@0.8.0(typescript@5.6.2): + applesauce-lists@0.0.0-next-20241103143210(typescript@5.6.2): dependencies: '@noble/hashes': 1.5.0 '@noble/secp256k1': 1.7.1 '@scure/base': 1.1.9 '@types/dom-serial': 1.0.6 - applesauce-core: 0.8.0(typescript@5.6.2) + applesauce-core: 0.0.0-next-20241103143210(typescript@5.6.2) debug: 4.3.7 nostr-tools: 2.7.2(typescript@5.6.2) rxjs: 7.8.1 @@ -7275,9 +7318,9 @@ snapshots: - supports-color - typescript - applesauce-net@0.8.0(typescript@5.6.2): + applesauce-net@0.0.0-next-20241103143210(typescript@5.6.2): dependencies: - applesauce-core: 0.8.0(typescript@5.6.2) + applesauce-core: 0.0.0-next-20241103143210(typescript@5.6.2) nanoid: 5.0.7 nostr-tools: 2.7.2(typescript@5.6.2) rxjs: 7.8.1 @@ -7286,14 +7329,25 @@ snapshots: - supports-color - typescript - applesauce-signer@0.8.0(typescript@5.6.2): + applesauce-react@0.0.0-next-20241103143210(typescript@5.6.2): + dependencies: + applesauce-content: 0.0.0-next-20241103143210(typescript@5.6.2) + applesauce-core: 0.0.0-next-20241103143210(typescript@5.6.2) + nostr-tools: 2.7.2(typescript@5.6.2) + react: 18.3.1 + rxjs: 7.8.1 + transitivePeerDependencies: + - supports-color + - typescript + + applesauce-signer@0.0.0-next-20241103143210(typescript@5.6.2): dependencies: '@noble/hashes': 1.5.0 '@noble/secp256k1': 1.7.1 '@scure/base': 1.1.9 '@types/dom-serial': 1.0.6 - applesauce-core: 0.8.0(typescript@5.6.2) - applesauce-net: 0.8.0(typescript@5.6.2) + applesauce-core: 0.0.0-next-20241103143210(typescript@5.6.2) + applesauce-net: 0.0.0-next-20241103143210(typescript@5.6.2) debug: 4.3.7 nanoid: 5.0.7 nostr-tools: 2.7.2(typescript@5.6.2) @@ -8468,6 +8522,8 @@ snapshots: lines-and-columns@1.2.4: {} + linkifyjs@4.1.3: {} + locate-path@5.0.0: dependencies: p-locate: 4.1.0 @@ -9494,6 +9550,15 @@ snapshots: mdast-util-wiki-link: 0.1.2 micromark-extension-wiki-link: 0.0.4 + remark@15.0.1: + dependencies: + '@types/mdast': 4.0.4 + remark-parse: 11.0.0 + remark-stringify: 11.0.0 + unified: 11.0.5 + transitivePeerDependencies: + - supports-color + remove-accents@0.5.0: {} repeat-string@1.6.1: {} diff --git a/src/views/notifications/components/repost-notification.tsx b/src/views/notifications/components/repost-notification.tsx index a0d2df8c1..8637ee2aa 100644 --- a/src/views/notifications/components/repost-notification.tsx +++ b/src/views/notifications/components/repost-notification.tsx @@ -6,8 +6,8 @@ import { EmbedEventPointer } from "../../../components/embed-event"; import { RepostIcon } from "../../../components/icons"; import NotificationIconEntry from "./notification-icon-entry"; import UserAvatar from "../../../components/user/user-avatar"; -import UserName from "../../../components/user/user-name"; import { truncateId } from "../../../helpers/string"; +import UserLink from "../../../components/user/user-link"; const RepostNotification = forwardRef void }>( ({ event, onClick }, ref) => { @@ -25,7 +25,7 @@ const RepostNotification = forwardRef - reposted: + reposted: