mirror of
https://github.com/luminous-devs/lume.git
synced 2024-09-19 11:43:30 +00:00
prefetch user metadata and other fixes
This commit is contained in:
parent
6590ea29e2
commit
b64ac38b8d
@ -20,7 +20,10 @@
|
|||||||
"@nostr-dev-kit/ndk": "0.6.0",
|
"@nostr-dev-kit/ndk": "0.6.0",
|
||||||
"@radix-ui/react-popover": "^1.0.6",
|
"@radix-ui/react-popover": "^1.0.6",
|
||||||
"@radix-ui/react-tooltip": "^1.0.6",
|
"@radix-ui/react-tooltip": "^1.0.6",
|
||||||
|
"@tanstack/query-sync-storage-persister": "^4.29.19",
|
||||||
"@tanstack/react-query": "^4.29.19",
|
"@tanstack/react-query": "^4.29.19",
|
||||||
|
"@tanstack/react-query-devtools": "^4.29.19",
|
||||||
|
"@tanstack/react-query-persist-client": "^4.29.19",
|
||||||
"@tanstack/react-virtual": "3.0.0-beta.54",
|
"@tanstack/react-virtual": "3.0.0-beta.54",
|
||||||
"@tauri-apps/api": "^1.4.0",
|
"@tauri-apps/api": "^1.4.0",
|
||||||
"cheerio": "1.0.0-rc.12",
|
"cheerio": "1.0.0-rc.12",
|
||||||
|
@ -13,9 +13,18 @@ dependencies:
|
|||||||
'@radix-ui/react-tooltip':
|
'@radix-ui/react-tooltip':
|
||||||
specifier: ^1.0.6
|
specifier: ^1.0.6
|
||||||
version: 1.0.6(@types/react-dom@18.2.6)(@types/react@18.2.14)(react-dom@18.2.0)(react@18.2.0)
|
version: 1.0.6(@types/react-dom@18.2.6)(@types/react@18.2.14)(react-dom@18.2.0)(react@18.2.0)
|
||||||
|
'@tanstack/query-sync-storage-persister':
|
||||||
|
specifier: ^4.29.19
|
||||||
|
version: 4.29.19
|
||||||
'@tanstack/react-query':
|
'@tanstack/react-query':
|
||||||
specifier: ^4.29.19
|
specifier: ^4.29.19
|
||||||
version: 4.29.19(react-dom@18.2.0)(react@18.2.0)
|
version: 4.29.19(react-dom@18.2.0)(react@18.2.0)
|
||||||
|
'@tanstack/react-query-devtools':
|
||||||
|
specifier: ^4.29.19
|
||||||
|
version: 4.29.19(@tanstack/react-query@4.29.19)(react-dom@18.2.0)(react@18.2.0)
|
||||||
|
'@tanstack/react-query-persist-client':
|
||||||
|
specifier: ^4.29.19
|
||||||
|
version: 4.29.19(@tanstack/react-query@4.29.19)
|
||||||
'@tanstack/react-virtual':
|
'@tanstack/react-virtual':
|
||||||
specifier: 3.0.0-beta.54
|
specifier: 3.0.0-beta.54
|
||||||
version: 3.0.0-beta.54(react@18.2.0)
|
version: 3.0.0-beta.54(react@18.2.0)
|
||||||
@ -1306,10 +1315,53 @@ packages:
|
|||||||
tailwindcss: 3.3.2
|
tailwindcss: 3.3.2
|
||||||
dev: true
|
dev: true
|
||||||
|
|
||||||
|
/@tanstack/match-sorter-utils@8.8.4:
|
||||||
|
resolution: {integrity: sha512-rKH8LjZiszWEvmi01NR72QWZ8m4xmXre0OOwlRGnjU01Eqz/QnN+cqpty2PJ0efHblq09+KilvyR7lsbzmXVEw==}
|
||||||
|
engines: {node: '>=12'}
|
||||||
|
dependencies:
|
||||||
|
remove-accents: 0.4.2
|
||||||
|
dev: false
|
||||||
|
|
||||||
/@tanstack/query-core@4.29.19:
|
/@tanstack/query-core@4.29.19:
|
||||||
resolution: {integrity: sha512-uPe1DukeIpIHpQi6UzIgBcXsjjsDaLnc7hF+zLBKnaUlh7jFE/A+P8t4cU4VzKPMFB/C970n/9SxtpO5hmIRgw==}
|
resolution: {integrity: sha512-uPe1DukeIpIHpQi6UzIgBcXsjjsDaLnc7hF+zLBKnaUlh7jFE/A+P8t4cU4VzKPMFB/C970n/9SxtpO5hmIRgw==}
|
||||||
dev: false
|
dev: false
|
||||||
|
|
||||||
|
/@tanstack/query-persist-client-core@4.29.19:
|
||||||
|
resolution: {integrity: sha512-rr6p3xwEZCz3cEDZsj3QGePf6PG44WxRUGQVcm2JFPZOq9TkG/0i5+hQ3STiHm1Fj6qwCH8xIi62L8kG0zRj/Q==}
|
||||||
|
dependencies:
|
||||||
|
'@tanstack/query-core': 4.29.19
|
||||||
|
dev: false
|
||||||
|
|
||||||
|
/@tanstack/query-sync-storage-persister@4.29.19:
|
||||||
|
resolution: {integrity: sha512-B3wDl3D3YBFTlY2yeXecEh4NEG/8Hr8pqsxnWJijRwBqvOKlqD4bUgk5kl5nbn1mShD2vnQ+yvH900/11X29Zw==}
|
||||||
|
dependencies:
|
||||||
|
'@tanstack/query-persist-client-core': 4.29.19
|
||||||
|
dev: false
|
||||||
|
|
||||||
|
/@tanstack/react-query-devtools@4.29.19(@tanstack/react-query@4.29.19)(react-dom@18.2.0)(react@18.2.0):
|
||||||
|
resolution: {integrity: sha512-rL2xqTPr+7gJvVGwyq8E8CWqqw950N4lZ6ffJeNX0qqymKHxHW1FM6nZaYt7Aufs/bXH0m1L9Sj3kDGQbp0rwg==}
|
||||||
|
peerDependencies:
|
||||||
|
'@tanstack/react-query': 4.29.19
|
||||||
|
react: ^16.8.0 || ^17.0.0 || ^18.0.0
|
||||||
|
react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
|
||||||
|
dependencies:
|
||||||
|
'@tanstack/match-sorter-utils': 8.8.4
|
||||||
|
'@tanstack/react-query': 4.29.19(react-dom@18.2.0)(react@18.2.0)
|
||||||
|
react: 18.2.0
|
||||||
|
react-dom: 18.2.0(react@18.2.0)
|
||||||
|
superjson: 1.12.4
|
||||||
|
use-sync-external-store: 1.2.0(react@18.2.0)
|
||||||
|
dev: false
|
||||||
|
|
||||||
|
/@tanstack/react-query-persist-client@4.29.19(@tanstack/react-query@4.29.19):
|
||||||
|
resolution: {integrity: sha512-LfcasTosdnI9K66HTP0Rk72Ypza3tCgrcF9bc2qFlKsBleYOYo8bz7/GiiOHj1SQH4GRQlKB+P4+/it+qlJg4g==}
|
||||||
|
peerDependencies:
|
||||||
|
'@tanstack/react-query': 4.29.19
|
||||||
|
dependencies:
|
||||||
|
'@tanstack/query-persist-client-core': 4.29.19
|
||||||
|
'@tanstack/react-query': 4.29.19(react-dom@18.2.0)(react@18.2.0)
|
||||||
|
dev: false
|
||||||
|
|
||||||
/@tanstack/react-query@4.29.19(react-dom@18.2.0)(react@18.2.0):
|
/@tanstack/react-query@4.29.19(react-dom@18.2.0)(react@18.2.0):
|
||||||
resolution: {integrity: sha512-XiTIOHHQ5Cw1WUlHaD4fmVUMhoWjuNJlAeJGq7eM4BraI5z7y8WkZO+NR8PSuRnQGblpuVdjClQbDFtwxTtTUw==}
|
resolution: {integrity: sha512-XiTIOHHQ5Cw1WUlHaD4fmVUMhoWjuNJlAeJGq7eM4BraI5z7y8WkZO+NR8PSuRnQGblpuVdjClQbDFtwxTtTUw==}
|
||||||
peerDependencies:
|
peerDependencies:
|
||||||
@ -2143,6 +2195,13 @@ packages:
|
|||||||
resolution: {integrity: sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==}
|
resolution: {integrity: sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==}
|
||||||
dev: false
|
dev: false
|
||||||
|
|
||||||
|
/copy-anything@3.0.5:
|
||||||
|
resolution: {integrity: sha512-yCEafptTtb4bk7GLEQoM8KVJpxAfdBJYaXyzQEgQQQgYrZiDp8SJmGKlYza6CYjEDNstAdNdKA3UuoULlEbS6w==}
|
||||||
|
engines: {node: '>=12.13'}
|
||||||
|
dependencies:
|
||||||
|
is-what: 4.1.15
|
||||||
|
dev: false
|
||||||
|
|
||||||
/create-esm-loader@0.2.3:
|
/create-esm-loader@0.2.3:
|
||||||
resolution: {integrity: sha512-cllzD6IU/mzXBs5OdQVWL3+ne5Elpu3Wdm7h5OldMbGXk76yr9XzHlQXWJ4zfs0ZAibe26rkbs4KvMAJm7fIZA==}
|
resolution: {integrity: sha512-cllzD6IU/mzXBs5OdQVWL3+ne5Elpu3Wdm7h5OldMbGXk76yr9XzHlQXWJ4zfs0ZAibe26rkbs4KvMAJm7fIZA==}
|
||||||
engines: {node: '>=14.x'}
|
engines: {node: '>=14.x'}
|
||||||
@ -3451,6 +3510,11 @@ packages:
|
|||||||
dependencies:
|
dependencies:
|
||||||
call-bind: 1.0.2
|
call-bind: 1.0.2
|
||||||
|
|
||||||
|
/is-what@4.1.15:
|
||||||
|
resolution: {integrity: sha512-uKua1wfy3Yt+YqsD6mTUEa2zSi3G1oPlqTflgaPJ7z63vUGN5pxFpnQfeSLMFnJDEsdvOtkp1rUWkYjB4YfhgA==}
|
||||||
|
engines: {node: '>=12.13'}
|
||||||
|
dev: false
|
||||||
|
|
||||||
/isexe@2.0.0:
|
/isexe@2.0.0:
|
||||||
resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
|
resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
|
||||||
|
|
||||||
@ -4713,6 +4777,10 @@ packages:
|
|||||||
define-properties: 1.2.0
|
define-properties: 1.2.0
|
||||||
functions-have-names: 1.2.3
|
functions-have-names: 1.2.3
|
||||||
|
|
||||||
|
/remove-accents@0.4.2:
|
||||||
|
resolution: {integrity: sha512-7pXIJqJOq5tFgG1A2Zxti3Ht8jJF337m4sowbuHsW30ZnkQFnDzy9qBNhgzX8ZLW4+UBcXiiR7SwR6pokHsxiA==}
|
||||||
|
dev: false
|
||||||
|
|
||||||
/resolve-from@4.0.0:
|
/resolve-from@4.0.0:
|
||||||
resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==}
|
resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==}
|
||||||
engines: {node: '>=4'}
|
engines: {node: '>=4'}
|
||||||
@ -5116,6 +5184,13 @@ packages:
|
|||||||
ts-interface-checker: 0.1.13
|
ts-interface-checker: 0.1.13
|
||||||
dev: true
|
dev: true
|
||||||
|
|
||||||
|
/superjson@1.12.4:
|
||||||
|
resolution: {integrity: sha512-vkpPQAxdCg9SLfPv5GPC5fnGrui/WryktoN9O5+Zif/14QIMjw+RITf/5LbBh+9QpBFb3KNvJth+puz2H8o6GQ==}
|
||||||
|
engines: {node: '>=10'}
|
||||||
|
dependencies:
|
||||||
|
copy-anything: 3.0.5
|
||||||
|
dev: false
|
||||||
|
|
||||||
/supports-color@5.5.0:
|
/supports-color@5.5.0:
|
||||||
resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==}
|
resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==}
|
||||||
engines: {node: '>=4'}
|
engines: {node: '>=4'}
|
||||||
|
@ -1,14 +1,14 @@
|
|||||||
import { NDKFilter } from '@nostr-dev-kit/ndk';
|
import { NDKEvent, NDKFilter } from '@nostr-dev-kit/ndk';
|
||||||
|
import { useQueryClient } from '@tanstack/react-query';
|
||||||
import { useContext, useEffect, useRef } from 'react';
|
import { useContext, useEffect, useRef } from 'react';
|
||||||
import { useNavigate } from 'react-router-dom';
|
import { useNavigate } from 'react-router-dom';
|
||||||
|
|
||||||
import { prefetchEvents } from '@libs/ndk';
|
import { prefetchEvents } from '@libs/ndk';
|
||||||
import {
|
import {
|
||||||
countTotalNotes,
|
countTotalNotes,
|
||||||
createChannelMessage,
|
|
||||||
createChat,
|
createChat,
|
||||||
createNote,
|
createNote,
|
||||||
getChannels,
|
getAllPubkeys,
|
||||||
getLastLogin,
|
getLastLogin,
|
||||||
updateLastLogin,
|
updateLastLogin,
|
||||||
} from '@libs/storage';
|
} from '@libs/storage';
|
||||||
@ -21,10 +21,12 @@ import { useAccount } from '@utils/hooks/useAccount';
|
|||||||
|
|
||||||
const totalNotes = await countTotalNotes();
|
const totalNotes = await countTotalNotes();
|
||||||
const lastLogin = await getLastLogin();
|
const lastLogin = await getLastLogin();
|
||||||
|
const users = await getAllPubkeys();
|
||||||
|
|
||||||
export function Root() {
|
export function Root() {
|
||||||
const ndk = useContext(RelayContext);
|
const ndk = useContext(RelayContext);
|
||||||
const now = useRef(new Date());
|
const now = useRef(new Date());
|
||||||
|
const queryClient = useQueryClient();
|
||||||
const navigate = useNavigate();
|
const navigate = useNavigate();
|
||||||
|
|
||||||
const { status, account } = useAccount();
|
const { status, account } = useAccount();
|
||||||
@ -99,6 +101,34 @@ export function Root() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function fetchUsersProfile() {
|
||||||
|
const authors = [];
|
||||||
|
|
||||||
|
users.forEach((user) => {
|
||||||
|
if (user.sender_pubkey) {
|
||||||
|
authors.push(user.sender_pubkey);
|
||||||
|
} else {
|
||||||
|
authors.push(user.pubkey);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
const filter: NDKFilter = {
|
||||||
|
authors: authors,
|
||||||
|
kinds: [0],
|
||||||
|
};
|
||||||
|
|
||||||
|
const events = await ndk.fetchEvents(filter);
|
||||||
|
console.log('authors', events);
|
||||||
|
|
||||||
|
events.forEach((event: NDKEvent) => {
|
||||||
|
const profile = JSON.parse(event.content);
|
||||||
|
profile['image'] = profile.picture;
|
||||||
|
queryClient.setQueryData(['user', event.pubkey], profile);
|
||||||
|
});
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
async function fetchChannelMessages() {
|
async function fetchChannelMessages() {
|
||||||
try {
|
try {
|
||||||
@ -144,8 +174,9 @@ export function Root() {
|
|||||||
const notes = await fetchNotes();
|
const notes = await fetchNotes();
|
||||||
if (notes) {
|
if (notes) {
|
||||||
const chats = await fetchChats();
|
const chats = await fetchChats();
|
||||||
|
const users = await fetchUsersProfile();
|
||||||
// const channels = await fetchChannelMessages();
|
// const channels = await fetchChannelMessages();
|
||||||
if (chats) {
|
if (chats && users) {
|
||||||
const now = Math.floor(Date.now() / 1000);
|
const now = Math.floor(Date.now() / 1000);
|
||||||
await updateLastLogin(now);
|
await updateLastLogin(now);
|
||||||
navigate('/app/space', { replace: true });
|
navigate('/app/space', { replace: true });
|
||||||
|
@ -184,6 +184,15 @@ export async function createReplyNote(
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// get all pubkeys in db
|
||||||
|
export async function getAllPubkeys() {
|
||||||
|
const db = await connect();
|
||||||
|
const notes: any = await db.select('SELECT DISTINCT pubkey FROM notes');
|
||||||
|
const replies: any = await db.select('SELECT DISTINCT pubkey FROM replies');
|
||||||
|
const chats: any = await db.select('SELECT DISTINCT sender_pubkey FROM chats');
|
||||||
|
return [...notes, ...replies, ...chats];
|
||||||
|
}
|
||||||
|
|
||||||
// get all channels
|
// get all channels
|
||||||
export async function getChannels() {
|
export async function getChannels() {
|
||||||
const db = await connect();
|
const db = await connect();
|
||||||
|
14
src/main.tsx
14
src/main.tsx
@ -1,4 +1,7 @@
|
|||||||
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
|
import { createSyncStoragePersister } from '@tanstack/query-sync-storage-persister';
|
||||||
|
import { QueryClient } from '@tanstack/react-query';
|
||||||
|
import { ReactQueryDevtools } from '@tanstack/react-query-devtools';
|
||||||
|
import { PersistQueryClientProvider } from '@tanstack/react-query-persist-client';
|
||||||
import { createRoot } from 'react-dom/client';
|
import { createRoot } from 'react-dom/client';
|
||||||
|
|
||||||
import { getSetting } from '@libs/storage';
|
import { getSetting } from '@libs/storage';
|
||||||
@ -17,13 +20,18 @@ const queryClient = new QueryClient({
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const persister = createSyncStoragePersister({
|
||||||
|
storage: window.localStorage,
|
||||||
|
});
|
||||||
|
|
||||||
const container = document.getElementById('root');
|
const container = document.getElementById('root');
|
||||||
const root = createRoot(container);
|
const root = createRoot(container);
|
||||||
|
|
||||||
root.render(
|
root.render(
|
||||||
<QueryClientProvider client={queryClient}>
|
<PersistQueryClientProvider client={queryClient} persistOptions={{ persister }}>
|
||||||
<RelayProvider>
|
<RelayProvider>
|
||||||
<App />
|
<App />
|
||||||
</RelayProvider>
|
</RelayProvider>
|
||||||
</QueryClientProvider>
|
<ReactQueryDevtools initialIsOpen={false} position="top-right" />
|
||||||
|
</PersistQueryClientProvider>
|
||||||
);
|
);
|
||||||
|
@ -5,7 +5,7 @@ export function ImagePreview({ urls, truncate }: { urls: string[]; truncate?: bo
|
|||||||
<div className="mt-3 max-w-[420px] overflow-hidden">
|
<div className="mt-3 max-w-[420px] overflow-hidden">
|
||||||
<div className="flex flex-col gap-2">
|
<div className="flex flex-col gap-2">
|
||||||
{urls.map((url) => (
|
{urls.map((url) => (
|
||||||
<div key={url} className="min-w-0 shrink-0 grow-0 basis-full">
|
<div key={url} className="relative min-w-0 shrink-0 grow-0 basis-full">
|
||||||
<Image
|
<Image
|
||||||
src={url}
|
src={url}
|
||||||
fallback="https://void.cat/d/XTmrMkpid8DGLjv1AzdvcW"
|
fallback="https://void.cat/d/XTmrMkpid8DGLjv1AzdvcW"
|
||||||
|
@ -1,22 +1,22 @@
|
|||||||
import destr from 'destr';
|
import destr from 'destr';
|
||||||
import getUrls from 'get-urls';
|
import getUrls from 'get-urls';
|
||||||
import { parseReferences } from 'nostr-tools';
|
import { Event, parseReferences } from 'nostr-tools';
|
||||||
import { ReactNode } from 'react';
|
import { ReactNode } from 'react';
|
||||||
import { Link } from 'react-router-dom';
|
import { Link } from 'react-router-dom';
|
||||||
import reactStringReplace from 'react-string-replace';
|
import reactStringReplace from 'react-string-replace';
|
||||||
|
|
||||||
import { MentionUser } from '@shared/notes/mentions/user';
|
import { MentionUser } from '@shared/notes/mentions/user';
|
||||||
|
|
||||||
function isJsonString(str: string) {
|
function isJsonString(str: string[][] | string) {
|
||||||
try {
|
try {
|
||||||
JSON.parse(str);
|
if (typeof str === 'string') JSON.parse(str);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function parser(event: any) {
|
export function parser(event: Event) {
|
||||||
if (isJsonString(event.tags)) {
|
if (isJsonString(event.tags)) {
|
||||||
event['tags'] = destr(event.tags);
|
event['tags'] = destr(event.tags);
|
||||||
}
|
}
|
||||||
@ -26,7 +26,7 @@ export function parser(event: any) {
|
|||||||
|
|
||||||
const content: {
|
const content: {
|
||||||
original: string;
|
original: string;
|
||||||
parsed: ReactNode[];
|
parsed: string | ReactNode[];
|
||||||
notes: string[];
|
notes: string[];
|
||||||
images: string[];
|
images: string[];
|
||||||
videos: string[];
|
videos: string[];
|
||||||
@ -40,39 +40,30 @@ export function parser(event: any) {
|
|||||||
links: [],
|
links: [],
|
||||||
};
|
};
|
||||||
|
|
||||||
// remove unnecessary whitespaces
|
|
||||||
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
||||||
// @ts-ignore
|
|
||||||
content.parsed = content.parsed.replace(/\s{2,}/g, ' ');
|
|
||||||
|
|
||||||
// remove unnecessary linebreak
|
|
||||||
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
||||||
// @ts-ignore
|
|
||||||
content.parsed = content.parsed.replace(/(\r\n|\r|\n){2,}/g, '$1\n');
|
|
||||||
|
|
||||||
// parse urls
|
// parse urls
|
||||||
urls?.forEach((url: string) => {
|
urls?.forEach((url: string) => {
|
||||||
if (url.match(/\.(jpg|jpeg|gif|png|webp|avif)$/)) {
|
if (url.match(/\.(jpg|jpeg|gif|png|webp|avif)$/)) {
|
||||||
// image url
|
// image url
|
||||||
content.images.push(url);
|
content.images.push(url);
|
||||||
// remove url from original content
|
// remove url from original content
|
||||||
content.parsed = reactStringReplace(content.parsed, url, () => null);
|
content.parsed = reactStringReplace(content.parsed, url, () => '');
|
||||||
} else if (url.match(/\.(mp4|webm|mov|ogv|avi|mp3)$/)) {
|
} else if (url.match(/\.(mp4|webm|mov|ogv|avi|mp3)$/)) {
|
||||||
// video
|
// video
|
||||||
content.videos.push(url);
|
content.videos.push(url);
|
||||||
// remove url from original content
|
// remove url from original content
|
||||||
content.parsed = reactStringReplace(content.parsed, url, () => null);
|
content.parsed = reactStringReplace(content.parsed, url, () => '');
|
||||||
} else {
|
} else {
|
||||||
if (content.links.length < 1) {
|
if (content.links.length < 1) {
|
||||||
// push to store
|
// push to store
|
||||||
content.links.push(url);
|
content.links.push(url);
|
||||||
// remove url from original content
|
// remove url from original content
|
||||||
content.parsed = reactStringReplace(content.parsed, url, () => null);
|
content.parsed = reactStringReplace(content.parsed, url, () => '');
|
||||||
} else {
|
} else {
|
||||||
content.parsed = reactStringReplace(content.parsed, /#(\w+)/g, (match, i) => (
|
content.parsed = reactStringReplace(content.parsed, url, (match, i) => (
|
||||||
<Link
|
<Link
|
||||||
key={match + i}
|
key={match + i}
|
||||||
to={match}
|
to={match}
|
||||||
|
target="_blank"
|
||||||
className="font-normal text-fuchsia-500 no-underline hover:text-fuchsia-600"
|
className="font-normal text-fuchsia-500 no-underline hover:text-fuchsia-600"
|
||||||
>
|
>
|
||||||
{match}
|
{match}
|
||||||
@ -99,17 +90,18 @@ export function parser(event: any) {
|
|||||||
|
|
||||||
// parse hashtag
|
// parse hashtag
|
||||||
content.parsed = reactStringReplace(content.parsed, /#(\w+)/g, (match, i) => (
|
content.parsed = reactStringReplace(content.parsed, /#(\w+)/g, (match, i) => (
|
||||||
<Link
|
<span
|
||||||
key={match + i}
|
key={match + i}
|
||||||
to={`/search/${match}`}
|
|
||||||
className="font-normal text-fuchsia-500 no-underline hover:text-fuchsia-600"
|
className="font-normal text-fuchsia-500 no-underline hover:text-fuchsia-600"
|
||||||
>
|
>
|
||||||
#{match}
|
#{match}
|
||||||
</Link>
|
</span>
|
||||||
));
|
));
|
||||||
|
|
||||||
// clean array
|
// clean array
|
||||||
content.parsed = content.parsed.filter((el) => el !== '\n');
|
content.parsed = content.parsed.filter(
|
||||||
|
(el) => el !== '\n' && el !== '\n\n' && el !== '\n'
|
||||||
|
);
|
||||||
|
|
||||||
return content;
|
return content;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user