Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion apps/backend/src/__tests__/users.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,9 @@ describe('GET /users/search', () => {
{ id: 'u1', username: 'nowallet', avatarUrl: null, wallets: [] },
] as any); // eslint-disable-line

const res = await request(app).get('/users/search?q=no').set('Authorization', AUTH_HEADER);
const res = await request(app)
.get('/users/search?q=nowallet')
.set('Authorization', AUTH_HEADER);

expect(res.status).toBe(200);
expect(res.body[0].primaryWalletAddress).toBeNull();
Expand Down
2 changes: 1 addition & 1 deletion apps/backend/src/db/schema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ export const messageEnvelopes = pgTable(
],
);

// ─── Devices & prekeys (issues #158, #159, #162, #305, #302) ─────────────────
// ─── Devices & prekeys (issues #158, #159, #162) ─────────────────────────────
//
// Each user may register multiple devices. Each device has an Ed25519 identity
// key pair; the public key is stored here for fingerprint derivation and prekey
Expand Down
4 changes: 2 additions & 2 deletions apps/backend/src/lib/messages.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
type MessageLike = {
export type MessageLike = {
id: string;
senderId: string;
senderDeviceId?: string | null;
Expand All @@ -11,7 +11,7 @@ type MessageLike = {
[key: string]: any;
};

export function serializeMessage<T extends MessageLike>(
export function serializeMessage<T extends MessageWithEnvelopes>(
message: T,
): Omit<T, 'deletedAt' | 'envelopes' | 'ciphertext'> & {
ciphertext: string | null;
Expand Down
4 changes: 3 additions & 1 deletion apps/backend/src/routes/conversations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,9 @@ conversationsRouter.get('/:id/members', async (req: AuthRequest, res) => {
with: {
user: {
columns: { id: true, username: true, avatarUrl: true },
with: { wallets: { columns: { address: true, isPrimary: true } } },
with: {
wallets: { columns: { address: true, isPrimary: true } },
},
},
},
})) as ConversationMemberPayload[];
Expand Down
6 changes: 5 additions & 1 deletion apps/backend/src/socket/messaging.ts
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,11 @@ export function registerMessagingHandlers(io: Server, socket: AuthSocket): void
: eq(messages.conversationId, conversationId),
orderBy: desc(messages.createdAt),
limit: PAGE_SIZE,
with: { sender: { columns: { id: true, username: true, avatarUrl: true } } },
with: {
envelopes: true,
senderDevice: true,
sender: { columns: { id: true, username: true, avatarUrl: true } },
},
});

socket.emit('message_history', {
Expand Down
Loading