ti.sil/sourcebot
1
0
Fork 0
mirror of https://github.com/sourcebot-dev/sourcebot.git synced 2025-12-12 04:15:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix: fix javascript btoa function can not handle Unicode strings issue (#38)

Browse source
This commit is contained in:
ttys3 2024-10-16 08:33:44 +08:00 committed by GitHub
parent e4b261a7f3
commit 825a5aa7f5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/app/search/components/codePreviewPanel/index.tsx
View file

@ -1,7 +1,7 @@
'use client'; 'use client';
import { fetchFileSource } from "@/app/api/(client)/client"; import { fetchFileSource } from "@/app/api/(client)/client";
import { getCodeHostFilePreviewLink } from "@/lib/utils"; import { getCodeHostFilePreviewLink, base64Decode } from "@/lib/utils";
import { useQuery } from "@tanstack/react-query"; import { useQuery } from "@tanstack/react-query";
import { CodePreview, CodePreviewFile } from "./codePreview"; import { CodePreview, CodePreviewFile } from "./codePreview";
import { SearchResultFile } from "@/lib/types"; import { SearchResultFile } from "@/lib/types";
@ -32,7 +32,7 @@ export const CodePreviewPanel = ({
// @todo : refector this to use the templates provided by zoekt. // @todo : refector this to use the templates provided by zoekt.
const link = getCodeHostFilePreviewLink(fileMatch.Repository, fileMatch.FileName) const link = getCodeHostFilePreviewLink(fileMatch.Repository, fileMatch.FileName)
const decodedSource = atob(source); const decodedSource = base64Decode(source);
// Filter out filename matches // Filter out filename matches
const filteredMatches = fileMatch.ChunkMatches.filter((match) => { const filteredMatches = fileMatch.ChunkMatches.filter((match) => {

3
src/app/search/components/searchResultsPanel/fileMatch.tsx
View file

@ -3,6 +3,7 @@
import { useMemo } from "react"; import { useMemo } from "react";
import { CodePreview } from "./codePreview"; import { CodePreview } from "./codePreview";
import { SearchResultFile, SearchResultFileMatch } from "@/lib/types"; import { SearchResultFile, SearchResultFileMatch } from "@/lib/types";
import { base64Decode } from "@/lib/utils";
interface FileMatchProps { interface FileMatchProps {
@ -17,7 +18,7 @@ export const FileMatch = ({
onOpen, onOpen,
}: FileMatchProps) => { }: FileMatchProps) => {
const content = useMemo(() => { const content = useMemo(() => {
return atob(match.Content); return base64Decode(match.Content);
}, [match.Content]); }, [match.Content]);
// If it's just the title, don't show a code preview // If it's just the title, don't show a code preview

8
src/lib/utils.ts
View file

@ -95,4 +95,10 @@ export const getEnvBoolean = (env: string | undefined, defaultValue: boolean) =>
return defaultValue; return defaultValue;
} }
return env === 'true' || env === '1'; return env === 'true' || env === '1';
} }
// From https://developer.mozilla.org/en-US/docs/Glossary/Base64#the_unicode_problem
export const base64Decode = (base64: string): string => {
const binString = atob(base64);
return Buffer.from(Uint8Array.from(binString, (m) => m.codePointAt(0)!).buffer).toString();
}