Skip to content

Commit 2e0fe69

Browse files
author
Wrench
committed
fix(projects): address review feedback
Co-authored-by: Wrench <0eabe6ea5758c1e4c5b68cea4ac42b32c479072883cb28da8110b4a47c32b9a1@buzz.block.builderlab.xyz> Signed-off-by: Wrench <0eabe6ea5758c1e4c5b68cea4ac42b32c479072883cb28da8110b4a47c32b9a1@buzz.block.builderlab.xyz>
1 parent 7d6c4ab commit 2e0fe69

4 files changed

Lines changed: 49 additions & 19 deletions

File tree

‎crates/buzz-cli/src/commands/project_channel.rs‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,11 +248,17 @@ pub(crate) fn repo_id_from_project_slug(slug: &str) -> Result<String, CliError>
248248
Ok(out)
249249
}
250250

251-
fn truncate_repo_name(name: &str) -> String {
251+
pub(crate) fn truncate_repo_name(name: &str) -> String {
252252
if name.len() <= 128 {
253253
return name.to_string();
254254
}
255-
name.chars().take(128).collect()
255+
let end = name
256+
.char_indices()
257+
.map(|(index, _)| index)
258+
.take_while(|index| *index <= 128)
259+
.last()
260+
.unwrap_or(0);
261+
name[..end].to_string()
256262
}
257263

258264
#[cfg(test)]
@@ -286,6 +292,15 @@ mod tests {
286292
nostr::Tag::parse(parts.iter().copied()).unwrap()
287293
}
288294

295+
#[test]
296+
fn truncate_repo_name_respects_utf8_byte_limit() {
297+
let name = "界".repeat(100);
298+
let truncated = truncate_repo_name(&name);
299+
assert_eq!(truncated, "界".repeat(42));
300+
assert_eq!(truncated.len(), 126);
301+
assert!(truncated.len() <= 128);
302+
}
303+
289304
#[test]
290305
fn authoritative_project_requires_repo_owner_consent() {
291306
let owner = nostr::Keys::generate();

‎crates/buzz-cli/src/commands/projects.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ use nostr::{Event, EventBuilder, Tag, Timestamp};
2525

2626
use crate::client::BuzzClient;
2727
use crate::commands::parse_write_response;
28-
use crate::commands::project_channel::repo_id_from_project_slug;
28+
use crate::commands::project_channel::{repo_id_from_project_slug, truncate_repo_name};
2929
use crate::commands::repos::{build_create_announcement, fetch_own_repo_announcement};
3030
use crate::error::CliError;
3131

@@ -670,7 +670,7 @@ async fn ensure_default_create_repo(
670670
return Ok(repo_id);
671671
}
672672
let raw_name = name.unwrap_or(slug);
673-
let display_name: String = raw_name.chars().take(128).collect();
673+
let display_name = truncate_repo_name(raw_name);
674674
let builder = build_create_announcement(
675675
&repo_id,
676676
Some(&display_name),

‎desktop/src/features/projects/ui/ProjectAgentChatPanel.tsx‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,10 @@ export function ProjectAgentChatPanel({
155155
// `submitProjectAgentMessage` binds every relay side effect to the
156156
// scope captured here (fail closed), and threads follow-ups onto the
157157
// opener so a same-second follow-up cannot be hidden by id ordering.
158-
if (homeChannel) {
158+
if (
159+
homeChannel &&
160+
(!conversation || conversation.channel.id === homeChannel.id)
161+
) {
159162
const alreadyMember = homeChannel.memberPubkeys.some(
160163
(pubkey) =>
161164
normalizePubkey(pubkey) === normalizePubkey(selectedAgent.pubkey),

‎desktop/src/features/projects/ui/ProjectChannelHome.tsx‎

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -175,20 +175,32 @@ export function ProjectChannelHome({
175175
},
176176
[goProject, project.id, workspaceRepository],
177177
);
178-
const workspaceSheet =
179-
workspaceSheetOpen && workspaceSheetTab && workspaceRepository ? (
180-
<ProjectHomeWorkspaceSheet
181-
key={`${workspaceSheetTab}:${workspaceRepository.id}`}
182-
identityPubkey={identityQuery.data?.pubkey}
183-
onOpenCommit={handleOpenCommit}
184-
onRepositoryAdded={handleFilesAdded}
185-
onSelectRepository={setWorkspaceRepositoryId}
186-
project={project}
187-
projects={projects}
188-
repository={workspaceRepository}
189-
tab={workspaceSheetTab}
190-
/>
191-
) : null;
178+
const workspaceSheet = React.useMemo(
179+
() =>
180+
workspaceSheetOpen && workspaceSheetTab && workspaceRepository ? (
181+
<ProjectHomeWorkspaceSheet
182+
key={`${workspaceSheetTab}:${workspaceRepository.id}`}
183+
identityPubkey={identityQuery.data?.pubkey}
184+
onOpenCommit={handleOpenCommit}
185+
onRepositoryAdded={handleFilesAdded}
186+
onSelectRepository={setWorkspaceRepositoryId}
187+
project={project}
188+
projects={projects}
189+
repository={workspaceRepository}
190+
tab={workspaceSheetTab}
191+
/>
192+
) : null,
193+
[
194+
handleFilesAdded,
195+
handleOpenCommit,
196+
identityQuery.data?.pubkey,
197+
project,
198+
projects,
199+
workspaceRepository,
200+
workspaceSheetOpen,
201+
workspaceSheetTab,
202+
],
203+
);
192204

193205
return (
194206
<div

0 commit comments

Comments
 (0)