Skip to content

Search people fix #1195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yujonglee merged 4 commits into from
Jul 22, 2025
Merged

Search people fix #1195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
be455c0
search enhance temporaiily done
duckduckhero Jul 9, 2025
5f99a2f
merged main
duckduckhero Jul 10, 2025
bd59ee9
Merge branch 'main' of https://github.com/fastrepl/hyprnote into sear…
duckduckhero Jul 22, 2025
b30b5f3
ran tests
duckduckhero Jul 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
154 changes: 119 additions & 35 deletions apps/desktop/src/components/command-palette.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,117 @@ const sortSessionMatches = (matches: (SearchMatch & { type: "session" })[], sort
});
};

const extractParticipantSnippet = async (sessionId: string, query: string) => {
try {
const participants = await dbCommands.sessionListParticipants(sessionId);
const matchingParticipants = participants.filter(p =>
(p.full_name && p.full_name.toLowerCase().includes(query.toLowerCase()))
|| (p.email && p.email.toLowerCase().includes(query.toLowerCase()))
);

if (matchingParticipants.length > 0) {
const names = matchingParticipants
.map(p => p.full_name || p.email)
.filter(Boolean)
.slice(0, 3); // Limit to 3 names

const nameText = names.join(", ");
const extraCount = matchingParticipants.length - names.length;

return extraCount > 0
? `Meeting with ${nameText} and ${extraCount} other${extraCount > 1 ? "s" : ""}`
: `Meeting with ${nameText}`;
}
} catch (error) {
console.error("Error fetching participants:", error);
}
return null;
};

// Create a separate component for session items
function SessionItem({ match, query, onSelect }: {
match: SearchMatch & { type: "session" };
query: string;
onSelect: () => void;
}) {
const [participantSnippet, setParticipantSnippet] = useState<string | null>(null);
const titleMatches = (match.item.title || "").toLowerCase().includes(query.toLowerCase());

// Try content snippets first
const contentSnippet = !titleMatches
? (() => {
if (match.item.enhanced_memo_html) {
const enhancedSnippet = extractContentSnippet(match.item.enhanced_memo_html, query);
if (enhancedSnippet) {
return enhancedSnippet;
}
}

if (match.item.raw_memo_html) {
return extractContentSnippet(match.item.raw_memo_html, query);
}

return null;
})()
: null;

// Fetch participant snippet only if no content snippet
useEffect(() => {
if (!titleMatches && !contentSnippet) {
extractParticipantSnippet(match.item.id, query).then(setParticipantSnippet);
} else {
setParticipantSnippet(null);
}
}, [match.item.id, query, titleMatches, contentSnippet]);

const snippet = contentSnippet
? { type: "content" as const, text: contentSnippet }
: participantSnippet
? { type: "participants" as const, text: participantSnippet }
: null;

const formatDate = (dateString: string) => {
return new Date(dateString).toLocaleDateString();
};

return (
<CommandItem
key={`session-${match.item.id}`}
value={`session-${match.item.id}`}
className="flex items-start gap-3 py-3"
onSelect={onSelect}
>
<FileTextIcon className="h-4 w-4 text-neutral-500 mt-1" />
<div className="flex flex-col items-start flex-1">
<div className="flex items-center gap-2">
<span className="font-medium">
{highlightText(match.item.title || "Untitled Note", query)}
</span>
</div>
<span className="text-xs text-neutral-500 mt-1">
{formatDate(match.item.created_at)}
</span>
{snippet && (
<div
className={`text-xs mt-2 flex items-center gap-1 ${
snippet.type === "participants"
? "text-neutral-900"
: "text-neutral-600"
}`}
>
{snippet.type === "participants" && <UserIcon className="h-3 w-3 flex-shrink-0" />}
<span className={snippet.type === "participants" ? "" : ""}>
{snippet.type === "participants"
? snippet.text
: highlightText(snippet.text, query)}
</span>
</div>
)}
</div>
</CommandItem>
);
}

export function CommandPalette({ open, onOpenChange }: CommandPaletteProps) {
const inputRef = useRef<HTMLInputElement>(null);
const { userId } = useHypr();
Expand Down Expand Up @@ -262,41 +373,14 @@ export function CommandPalette({ open, onOpenChange }: CommandPaletteProps) {
{/* Notes Section with content snippets */}
{sessionMatches.length > 0 && (
<CommandGroup heading="Notes">
{sortSessionMatches(sessionMatches, sortBy).map((match) => {
const titleMatches = (match.item.title || "").toLowerCase().includes(query.toLowerCase());
const snippet = !titleMatches
? extractContentSnippet(
match.item.enhanced_memo_html || match.item.raw_memo_html || "",
query,
)
: null;

return (
<CommandItem
key={`session-${match.item.id}`}
value={`session-${match.item.id}`}
className="flex items-start gap-3 py-3"
onSelect={() => handleSelectItem(match)}
>
<FileTextIcon className="h-4 w-4 text-neutral-500 mt-1" />
<div className="flex flex-col items-start flex-1">
<div className="flex items-center gap-2">
<span className="font-medium">
{highlightText(match.item.title || "Untitled Note", query)}
</span>
</div>
<span className="text-xs text-neutral-500 mt-1">
{formatDate(match.item.created_at)}
</span>
{snippet && (
<div className="text-xs text-neutral-600 mt-2">
{highlightText(snippet, query)}
</div>
)}
</div>
</CommandItem>
);
})}
{sortSessionMatches(sessionMatches, sortBy).map((match) => (
<SessionItem
key={`session-${match.item.id}`}
match={match}
query={query}
onSelect={() => handleSelectItem(match)}
/>
))}
</CommandGroup>
)}

Expand Down
20 changes: 13 additions & 7 deletions crates/db-user/src/sessions_ops.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,21 +122,27 @@ impl UserDatabase {
specific: ListSessionFilterSpecific::Search { query },
}) => {
conn.query(
"SELECT * FROM sessions
WHERE user_id = ? AND (
title LIKE ? OR
REPLACE(REPLACE(REPLACE(enhanced_memo_html, '<', ' '), '>', ' '), '&nbsp;', ' ') LIKE ? OR
REPLACE(REPLACE(REPLACE(raw_memo_html, '<', ' '), '>', ' '), '&nbsp;', ' ') LIKE ?
"SELECT DISTINCT s.* FROM sessions s
LEFT JOIN session_participants sp ON s.id = sp.session_id
LEFT JOIN humans h ON sp.human_id = h.id
WHERE s.user_id = ? AND (
s.title LIKE ? OR
REPLACE(REPLACE(REPLACE(s.enhanced_memo_html, '<', ' '), '>', ' '), '&nbsp;', ' ') LIKE ? OR
REPLACE(REPLACE(REPLACE(s.raw_memo_html, '<', ' '), '>', ' '), '&nbsp;', ' ') LIKE ? OR
h.full_name LIKE ? OR
h.email LIKE ?
)
ORDER BY
CASE WHEN title LIKE ? THEN 0 ELSE 1 END,
created_at DESC
CASE WHEN s.title LIKE ? THEN 0 ELSE 1 END,
s.created_at DESC
LIMIT ?",
vec![
user_id,
format!("%{}%", query), // title search
format!("%{}%", query), // enhanced_memo search (HTML stripped)
format!("%{}%", query), // raw_memo search (HTML stripped)
format!("%{}%", query), // participant name search
format!("%{}%", query), // participant email search
format!("%{}%", query), // title priority check
limit.unwrap_or(100).to_string(),
],
Expand Down
Loading