feat: fast search

Author: FedoseevSM

src/lib/forum.ts

@@ -1,5 +1,5 @@
 import { getFile, putFile, listFiles } from './github';
-import { parseFrontmatter, stringifyFrontmatter, generateId, transliterate } from './utils';
+import { parseFrontmatter, stringifyFrontmatter, generateId, transliterate, normalizeText } from './utils';
 
 export interface Forum {
   slug: string;
@@ -28,6 +28,22 @@ export interface Post {
   body: string;
 }
 
+function matchesSearch(item: { author: string; body: string }, options?: { author?: string; text?: string }): boolean {
+  if (!options) return true;
+  const { author: authorQuery, text: textQuery } = options;
+  if (authorQuery) {
+    const normalizedAuthor = normalizeText(item.author);
+    const normalizedQuery = normalizeText(authorQuery);
+    if (!normalizedAuthor.includes(normalizedQuery)) return false;
+  }
+  if (textQuery) {
+    const normalizedBody = normalizeText(item.body);
+    const normalizedQuery = normalizeText(textQuery);
+    if (!normalizedBody.includes(normalizedQuery)) return false;
+  }
+  return true;
+}
+
 export async function listForums(): Promise<Forum[]> {
   const files = await listFiles('forums');
   const forums: Forum[] = [];
@@ -66,7 +82,7 @@ export async function createForum(data: Omit<Forum, 'slug'> & {slug: string}): P
   };
 }
 
-export async function listTopics(forumSlug: string): Promise<Topic[]> {
+export async function listTopics(forumSlug: string, options?: { author?: string; text?: string }): Promise<Topic[]> {
   const files = await listFiles('topics');
   const topics: Topic[] = [];
 
@@ -76,11 +92,14 @@ export async function listTopics(forumSlug: string): Promise<Topic[]> {
       if (fileData) {
         const { data, content } = parseFrontmatter<Topic>(fileData.content);
         if (data.forumSlug === forumSlug) {
-          topics.push({
+          const topic = {
             ...data,
             id: file.name.replace('.md', ''),
             body: content
-          });
+          };
+          if (matchesSearch(topic, options)) {
+            topics.push(topic);
+          }
         }
       }
     }
@@ -123,7 +142,7 @@ export async function createTopic(data: Omit<Topic, 'id' | 'createdAt' | 'titleT
   };
 }
 
-export async function listPosts(topicId: string): Promise<Post[]> {
+export async function listPosts(topicId: string, options?: { author?: string; text?: string }): Promise<Post[]> {
   const files = await listFiles('posts');
   const posts: Post[] = [];
 
@@ -133,11 +152,14 @@ export async function listPosts(topicId: string): Promise<Post[]> {
       if (fileData) {
         const { data, content } = parseFrontmatter<Post>(fileData.content);
         if (data.topicId === topicId) {
-          posts.push({
+          const post = {
             ...data,
             id: file.name.replace('.md', ''),
             body: content
-          });
+          };
+          if (matchesSearch(post, options)) {
+            posts.push(post);
+          }
         }
       }
     }

src/lib/utils.ts

@@ -59,4 +59,8 @@ export function transliterate(text: string): string {
     .replace(/[^a-z0-9-]/g, '')
     .replace(/-+/g, '-')
     .replace(/^-+|-+$/g, '');
+}
+
+export function normalizeText(text: string): string {
+  return transliterate(text).toLowerCase();
 }

src/pages/ForumPage.tsx

@@ -34,8 +34,8 @@ export function ForumPage() {
     try {
       const [forumData, topicsData] = await Promise.all([
       getForum(slug),
-      listTopics(slug)]
-      );
+      listTopics(slug, { author: authorSearch || undefined, text: textSearch || undefined })
+      ]);
       setForum(forumData);
       setTopics(topicsData);
     } catch (err: any) {
@@ -47,11 +47,7 @@ export function ForumPage() {
   };
   useEffect(() => {
     loadData();
-  }, [slug]);
-  const filteredTopics = topics.filter(topic =>
-    (authorSearch === '' || topic.author.toLowerCase().includes(authorSearch.toLowerCase())) &&
-    (textSearch === '' || topic.body.toLowerCase().includes(textSearch.toLowerCase()))
-  );
+  }, [slug, authorSearch, textSearch]);
   const handleCreateTopic = async (e: React.FormEvent) => {
     e.preventDefault();
     if (!user || !slug) return;
@@ -149,7 +145,7 @@ export function ForumPage() {
           </div> :
 
         <div className="divide-y divide-gray-200 dark:divide-gray-700">
-            {filteredTopics.map((topic) =>
+            {topics.map((topic) =>
           <Link
             key={topic.id}
             to={`/topic/${topic.id}`}

src/pages/TopicPage.tsx

@@ -6,6 +6,7 @@ import { useTranslation } from '../lib/i18n';
 import { useAuth } from '../lib/auth';
 import { MarkdownContent } from '../components/MarkdownContent';
 import { MarkdownEditor } from '../components/MarkdownEditor';
+import { normalizeText } from '../lib/utils';
 export function TopicPage() {
   const { id } = useParams<{
     id: string;
@@ -27,8 +28,8 @@ export function TopicPage() {
     try {
       const [topicData, postsData] = await Promise.all([
       getTopic(id),
-      listPosts(id)]
-      );
+      listPosts(id, { author: authorSearch || undefined, text: textSearch || undefined })
+      ]);
       setTopic(topicData);
       setPosts(postsData);
     } catch (err: any) {
@@ -40,14 +41,14 @@ export function TopicPage() {
   };
   useEffect(() => {
     loadData();
-  }, [id]);
+  }, [id, authorSearch, textSearch]);
   const allMessages = topic ? [
     { id: 'original', author: topic.author, body: topic.body, createdAt: topic.createdAt },
     ...posts
   ] : [];
   const filteredMessages = allMessages.filter(message =>
-    (authorSearch === '' || message.author.toLowerCase().includes(authorSearch.toLowerCase())) &&
-    (textSearch === '' || message.body.toLowerCase().includes(textSearch.toLowerCase()))
+    (authorSearch === '' || normalizeText(message.author).includes(normalizeText(authorSearch))) &&
+    (textSearch === '' || normalizeText(message.body).includes(normalizeText(textSearch)))
   );
   const handleReply = async (e: React.FormEvent) => {
     e.preventDefault();