Skip to content

Commit 5765c4c

Browse files
committed
fix(check): repair latest command and stream type drift
1 parent 4d405ac commit 5765c4c

4 files changed

Lines changed: 16 additions & 4 deletions

File tree

extensions/discord/src/monitor/sender-identity.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ type DiscordWebhookMessageLike = {
2323

2424
type DiscordMemberLike = {
2525
nickname?: string | null;
26+
nick?: string | null;
2627
};
2728

2829
export function resolveDiscordWebhookId(message: DiscordWebhookMessageLike): string | null {
@@ -61,7 +62,10 @@ export function resolveDiscordSenderIdentity(params: {
6162

6263
const senderTag = formatDiscordUserTag(params.author);
6364
const senderDisplay =
64-
params.member?.nickname ?? params.author.globalName ?? params.author.username;
65+
params.member?.nickname ??
66+
params.member?.nick ??
67+
params.author.globalName ??
68+
params.author.username;
6569
const senderLabel =
6670
senderDisplay && senderTag && senderDisplay !== senderTag
6771
? `${senderDisplay} (${senderTag})`

extensions/tlon/src/urbit/sse-client.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { randomUUID } from "node:crypto";
22
import { Readable } from "node:stream";
3+
import type { ReadableStream as WebReadableStream } from "node:stream/web";
34
import type { LookupFn, SsrFPolicy } from "../../api.js";
45
import { ensureUrbitChannelOpen, pokeUrbitChannel, scryUrbitPath } from "./channel-ops.js";
56
import { getUrbitContext, normalizeUrbitCookie } from "./context.js";
@@ -206,7 +207,11 @@ export class UrbitSSEClient {
206207
if (!body) {
207208
return;
208209
}
209-
const stream = body instanceof ReadableStream ? Readable.fromWeb(body) : body;
210+
// Bridge DOM fetch stream types to Node's stream/web declaration on newer TS/node combos.
211+
const stream =
212+
body instanceof ReadableStream
213+
? Readable.fromWeb(body as unknown as WebReadableStream)
214+
: body;
210215
let buffer = "";
211216

212217
try {

src/cli/program/route-specs.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ function createParsedRoute(params: {
3535
if (!args) {
3636
return false;
3737
}
38-
await params.definition.runParsedArgs(args);
38+
await params.definition.runParsedArgs(args as never);
3939
return true;
4040
},
4141
};

src/cli/program/routed-command-definitions.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@ export type RoutedCommandDefinition<TParse extends RouteArgParser<unknown>> = {
2020
runParsedArgs: (args: ParsedRouteArgs<TParse>) => Promise<void>;
2121
};
2222

23-
export type AnyRoutedCommandDefinition = RoutedCommandDefinition<RouteArgParser<unknown>>;
23+
export type AnyRoutedCommandDefinition = {
24+
parseArgs: RouteArgParser<unknown>;
25+
runParsedArgs: (args: never) => Promise<void>;
26+
};
2427

2528
function defineRoutedCommand<TParse extends RouteArgParser<unknown>>(
2629
definition: RoutedCommandDefinition<TParse>,

0 commit comments

Comments
 (0)