From 45f54a2c84528e55165ec1f717f979e2142b3ba4 Mon Sep 17 00:00:00 2001 From: dawn Date: Sat, 1 Aug 2026 01:58:34 +0300 Subject: [PATCH] *: fmt Signed-off-by: dawn --- bobbin/crates/resolver/src/legacy_upgrade.rs | 14 ++++++-- bobbin/crates/resolver/src/lib.rs | 34 +++++++++++++++---- bobbin/crates/runtime/src/network.rs | 4 ++- bobbin/crates/xrpc/src/feed.rs | 6 ++-- web/src/app.css | 12 +++---- web/src/lib/api/rawdiff.ts | 2 +- web/src/lib/components/reaction/reactions.ts | 4 +-- web/src/lib/components/repo/fileDiff.ts | 4 +-- web/src/lib/server/repo.ts | 2 +- web/src/markup.css | 6 ++-- .../[repo]/commit/[spec=rawCommit]/+server.ts | 2 +- 11 files changed, 62 insertions(+), 28 deletions(-) diff --git a/bobbin/crates/resolver/src/legacy_upgrade.rs b/bobbin/crates/resolver/src/legacy_upgrade.rs index 73cc9ed7..d08a459c 100644 --- a/bobbin/crates/resolver/src/legacy_upgrade.rs +++ b/bobbin/crates/resolver/src/legacy_upgrade.rs @@ -784,7 +784,12 @@ mod tests { let owner = did("did:plc:nel"); let key = rkey("abcabcabcabcz"); resolver - .observe(owner.clone(), key.clone(), Some(did("did:plc:scallop")), None) + .observe( + owner.clone(), + key.clone(), + Some(did("did:plc:scallop")), + None, + ) .await; let json = br#"{"$type":"sh.tangled.repo.issue","repo":"at://did:plc:nel/sh.tangled.repo/abcabcabcabcz","title":"t","createdAt":"2026-05-01T00:00:00Z"}"#; let legacy = @@ -1036,7 +1041,12 @@ mod tests { let owner = did("did:plc:nel"); let key = rkey("abcabcabcabcz"); resolver - .observe(owner.clone(), key.clone(), Some(did("did:plc:scallop")), None) + .observe( + owner.clone(), + key.clone(), + Some(did("did:plc:scallop")), + None, + ) .await; let json = br#"{"$type":"sh.tangled.feed.star","createdAt":"2026-05-01T00:00:00Z","subject":"at://did:plc:nel/sh.tangled.repo/abcabcabcabcz"}"#; let legacy = diff --git a/bobbin/crates/resolver/src/lib.rs b/bobbin/crates/resolver/src/lib.rs index 2cbb38dd..cee8a4fc 100644 --- a/bobbin/crates/resolver/src/lib.rs +++ b/bobbin/crates/resolver/src/lib.rs @@ -494,7 +494,12 @@ mod tests { assert!(prior.is_none(), "first observation has no prior"); let prior = resolver - .observe(did("did:plc:nel"), rkey("core"), Some(did("did:plc:clam")), None) + .observe( + did("did:plc:nel"), + rkey("core"), + Some(did("did:plc:clam")), + None, + ) .await; assert_eq!( prior, @@ -503,7 +508,12 @@ mod tests { ); let prior = resolver - .observe(did("did:plc:nel"), rkey("core"), Some(did("did:plc:clam")), None) + .observe( + did("did:plc:nel"), + rkey("core"), + Some(did("did:plc:clam")), + None, + ) .await; assert!(prior.is_none(), "re-observing the same ident is a no-op"); } @@ -529,7 +539,12 @@ mod tests { ) .await; resolver - .observe(did("did:plc:nel"), rkey("core"), Some(did("did:plc:clam")), None) + .observe( + did("did:plc:nel"), + rkey("core"), + Some(did("did:plc:clam")), + None, + ) .await; resolver @@ -619,7 +634,10 @@ mod tests { ) .await; let got = resolver.lookup_by_name(&did("did:plc:olaren"), "ark").await; - assert_eq!(got, None, "one owner's repo name must not answer for another's"); + assert_eq!( + got, None, + "one owner's repo name must not answer for another's" + ); } #[tokio::test] @@ -810,7 +828,9 @@ mod tests { let resolver = RepoIdResolver::detached(RuntimeHasher::default()); let owner = did("did:plc:nel"); let key = rkey("abcabcabcabcz"); - resolver.observe(owner.clone(), key.clone(), None, None).await; + resolver + .observe(owner.clone(), key.clone(), None, None) + .await; resolver .fill_provisional( RepoIdent::new(owner.clone(), key.clone()), @@ -1150,7 +1170,9 @@ mod tests { Resolution::Mapped(did("did:plc:clam")), ) .await; - resolver.observe(owner.clone(), key.clone(), None, None).await; + resolver + .observe(owner.clone(), key.clone(), None, None) + .await; let got = resolver.resolve(&owner, &key).await; assert_eq!( got, diff --git a/bobbin/crates/runtime/src/network.rs b/bobbin/crates/runtime/src/network.rs index 90359f6b..ede0d91c 100644 --- a/bobbin/crates/runtime/src/network.rs +++ b/bobbin/crates/runtime/src/network.rs @@ -116,7 +116,9 @@ impl jacquard_common::http_client::HttpClient for ReqwestHttp { builder = builder.header(name, value); } let body = resp.bytes().await?.to_vec(); - Ok(builder.body(body).expect("response parts came from reqwest")) + Ok(builder + .body(body) + .expect("response parts came from reqwest")) } } diff --git a/bobbin/crates/xrpc/src/feed.rs b/bobbin/crates/xrpc/src/feed.rs index 4a78c416..27049e97 100644 --- a/bobbin/crates/xrpc/src/feed.rs +++ b/bobbin/crates/xrpc/src/feed.rs @@ -4,7 +4,7 @@ use futures::stream::{self, StreamExt}; use serde::Deserialize; use bobbin_edge_index::{EdgeItem, EdgePage, EdgeStore, PageCursor, PageLimit, PageToken, SortDir}; -use bobbin_types::ids::{nsid_static, owner_did_from_aturi, EdgeKey, SubjectRef}; +use bobbin_types::ids::{EdgeKey, SubjectRef, nsid_static, owner_did_from_aturi}; use bobbin_types::sh_tangled::actor::{ProfileViewBasic, ProfileViewDetailed, ViewerState}; use bobbin_types::sh_tangled::feed::get_timeline::{ FollowEvent, RepoEvent, StarEvent, TimelineItem, TimelineItemEvent, @@ -12,13 +12,13 @@ use bobbin_types::sh_tangled::feed::get_timeline::{ use bobbin_types::sh_tangled::feed::star::{Star, StarRecord, StarSubject}; use bobbin_types::sh_tangled::graph::follow::{Follow, FollowRecord}; use bobbin_types::sh_tangled::repo::{self, Repo, RepoRecord, RepoViewBasic}; +use jacquard_common::DefaultStr; use jacquard_common::types::string::{AtUri, Datetime, Did, Handle, UriValue}; use jacquard_common::xrpc::XrpcResp; -use jacquard_common::DefaultStr; use jacquard_identity::resolver::IdentityResolver; use crate::{ - fetch, json_stream, paged_tail, parse_cursor, parse_limit, AppState, XrpcError, XrpcQuery, + AppState, XrpcError, XrpcQuery, fetch, json_stream, paged_tail, parse_cursor, parse_limit, }; const REPO_NSID: &str = "sh.tangled.repo"; diff --git a/web/src/app.css b/web/src/app.css index 6e5644a2..04f2a14c 100644 --- a/web/src/app.css +++ b/web/src/app.css @@ -195,20 +195,20 @@ } @utility typography-monospace-large { - @apply font-mono; - font-size: 1rem; + @apply font-mono; + font-size: 1rem; line-height: 1.5rem; } @utility typography-monospace-regular { - @apply font-mono; - font-size: 0.875rem; + @apply font-mono; + font-size: 0.875rem; line-height: 1.375rem; } @utility typography-monospace-small { - @apply font-mono; - font-size: 0.75rem; + @apply font-mono; + font-size: 0.75rem; line-height: 1.25rem; } diff --git a/web/src/lib/api/rawdiff.ts b/web/src/lib/api/rawdiff.ts index 3e26aeea..3c8ed30e 100644 --- a/web/src/lib/api/rawdiff.ts +++ b/web/src/lib/api/rawdiff.ts @@ -87,7 +87,7 @@ const pad = (value: number): string => String(value).padStart(2, "0"); // RFC1123Z, always utc const formatPatchDate = (input: string): string => { const date = new Date(input); -// a missing When is go's zero time, formats to this exact string + // a missing When is go's zero time, formats to this exact string if (Number.isNaN(date.getTime())) return "Mon, 01 Jan 0001 00:00:00 +0000"; return ( `${WEEKDAYS[date.getUTCDay()]}, ${pad(date.getUTCDate())} ${MONTHS[date.getUTCMonth()]} ` + diff --git a/web/src/lib/components/reaction/reactions.ts b/web/src/lib/components/reaction/reactions.ts index 1187afe7..c19ad9c0 100644 --- a/web/src/lib/components/reaction/reactions.ts +++ b/web/src/lib/components/reaction/reactions.ts @@ -84,7 +84,7 @@ export function upsertViewerReaction( const next = exists ? groups.map((g) => (g.kind === kind ? withViewerReaction(g, viewerHandle, rkey) : g)) : [...groups, { kind, count: 1, users: [viewerHandle], isReacted: true, viewerRkey: rkey }]; - return ORDERED_REACTION_KINDS.filter((k) => next.some((g) => g.kind === k)).map((k) => - next.find((g) => g.kind === k)! + return ORDERED_REACTION_KINDS.filter((k) => next.some((g) => g.kind === k)).map( + (k) => next.find((g) => g.kind === k)! ); } diff --git a/web/src/lib/components/repo/fileDiff.ts b/web/src/lib/components/repo/fileDiff.ts index 68b712e9..7d3c71cd 100644 --- a/web/src/lib/components/repo/fileDiff.ts +++ b/web/src/lib/components/repo/fileDiff.ts @@ -87,8 +87,8 @@ export const toFileDiffMetadata = (file: DiffFile): FileDiffMetadata => { lastOp = op; } - // a line without a trailing newline is the patch's "\ No newline" - // marker, only possible at the end of the file + // a line without a trailing newline is the patch's "\ No newline" + // marker, only possible at the end of the file const last = fragment.Lines?.[fragment.Lines.length - 1]; if (last && !last.Line.endsWith("\n")) { if (last.Op === LineOp.Context) { diff --git a/web/src/lib/server/repo.ts b/web/src/lib/server/repo.ts index aa8b9816..0401580f 100644 --- a/web/src/lib/server/repo.ts +++ b/web/src/lib/server/repo.ts @@ -23,7 +23,7 @@ export const resolveRepoFromParams = async (event: { const identifier = event.params.handle ?? ""; const name = event.params.repo ?? ""; -// rejects bare words, unrelated paths must 404 instead of resolving as actors + // rejects bare words, unrelated paths must 404 instead of resolving as actors if (!identifier.startsWith("did:") && !identifier.includes(".")) { error(404, "Not found"); } diff --git a/web/src/markup.css b/web/src/markup.css index 6e6a335b..9594249f 100644 --- a/web/src/markup.css +++ b/web/src/markup.css @@ -106,7 +106,7 @@ } .markup code { - @apply rounded bg-background-inset px-1 py-0.5 font-mono typography-monospace-small; + @apply rounded bg-background-inset px-1 py-0.5 typography-monospace-small font-mono; } .markup pre { @@ -115,11 +115,11 @@ /* pre above already has the padding and background, inline code would double it */ .markup pre code { - @apply bg-transparent p-0 font-mono typography-monospace-small; + @apply bg-transparent p-0 typography-monospace-small font-mono; } .markup kbd { - @apply rounded border border-border-default bg-background-subtle px-1.5 py-0.5 font-mono typography-monospace-small; + @apply rounded border border-border-default bg-background-subtle px-1.5 py-0.5 typography-monospace-small font-mono; } .markup hr { diff --git a/web/src/routes/[handle]/[repo]/commit/[spec=rawCommit]/+server.ts b/web/src/routes/[handle]/[repo]/commit/[spec=rawCommit]/+server.ts index 0a57ea7a..72f018bf 100644 --- a/web/src/routes/[handle]/[repo]/commit/[spec=rawCommit]/+server.ts +++ b/web/src/routes/[handle]/[repo]/commit/[spec=rawCommit]/+server.ts @@ -10,7 +10,7 @@ export const GET: RequestHandler = async (event) => { // the rawCommit matcher already guarantees this shape const spec = parseRawCommit(event.params.spec); if (!spec) error(404, "Not found"); -// the knot compares hashes case-sensitively, normalize like go-git does + // the knot compares hashes case-sensitively, normalize like go-git does const ref = spec.ref.toLowerCase(); const { ctx, view } = await resolveRepoFromParams(event); -- 2.51.2