Pass viewerPubkey to toStatus in more places
This commit is contained in:
parent
2ee29bf1e2
commit
9d714b6173
|
@ -13,7 +13,7 @@ const notificationsController: AppController = async (c) => {
|
|||
{ timeout: Time.seconds(3) },
|
||||
);
|
||||
|
||||
const statuses = await Promise.all(events.map(toNotification));
|
||||
const statuses = await Promise.all(events.map((event) => toNotification(event, pubkey)));
|
||||
return paginated(c, events, statuses);
|
||||
};
|
||||
|
||||
|
|
|
@ -29,7 +29,7 @@ const statusController: AppController = async (c) => {
|
|||
|
||||
const event = await getEvent(id, { kind: 1 });
|
||||
if (event) {
|
||||
return c.json(await toStatus(event));
|
||||
return c.json(await toStatus(event, c.get('pubkey')));
|
||||
}
|
||||
|
||||
return c.json({ error: 'Event not found.' }, 404);
|
||||
|
@ -74,7 +74,7 @@ const createStatusController: AppController = async (c) => {
|
|||
tags,
|
||||
}, c);
|
||||
|
||||
return c.json(await toStatus(event));
|
||||
return c.json(await toStatus(event, c.get('pubkey')));
|
||||
} else {
|
||||
return c.json({ error: 'Bad request', schema: result.error }, 400);
|
||||
}
|
||||
|
@ -115,7 +115,7 @@ const favouriteController: AppController = async (c) => {
|
|||
],
|
||||
}, c);
|
||||
|
||||
const status = await toStatus(target);
|
||||
const status = await toStatus(target, c.get('pubkey'));
|
||||
|
||||
if (status) {
|
||||
status.favourited = true;
|
||||
|
|
|
@ -63,7 +63,7 @@ const streamingController: AppController = (c) => {
|
|||
|
||||
if (filter) {
|
||||
for await (const event of Sub.sub(socket, '1', [filter])) {
|
||||
const status = await toStatus(event);
|
||||
const status = await toStatus(event, pubkey);
|
||||
if (status) {
|
||||
send('update', status);
|
||||
}
|
||||
|
|
|
@ -287,15 +287,15 @@ async function toRelationship(sourcePubkey: string, targetPubkey: string) {
|
|||
};
|
||||
}
|
||||
|
||||
function toNotification(event: Event) {
|
||||
function toNotification(event: Event, viewerPubkey?: string) {
|
||||
switch (event.kind) {
|
||||
case 1:
|
||||
return toNotificationMention(event as Event<1>);
|
||||
return toNotificationMention(event as Event<1>, viewerPubkey);
|
||||
}
|
||||
}
|
||||
|
||||
async function toNotificationMention(event: Event<1>) {
|
||||
const status = await toStatus(event);
|
||||
async function toNotificationMention(event: Event<1>, viewerPubkey?: string) {
|
||||
const status = await toStatus(event, viewerPubkey);
|
||||
if (!status) return;
|
||||
|
||||
return {
|
||||
|
|
Loading…
Reference in New Issue