Skip to content

Commit

Permalink
fix typo in acknowledge
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexNi245 committed Jul 17, 2024
1 parent 8294442 commit c502aa5
Show file tree
Hide file tree
Showing 9 changed files with 25 additions and 28 deletions.
4 changes: 2 additions & 2 deletions packages/delivery-service/src/delivery.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Acknoledgment, getMessages, schema } from '@dm3-org/dm3-lib-delivery';
import { Acknowledgment, getMessages, schema } from '@dm3-org/dm3-lib-delivery';
import { auth } from '@dm3-org/dm3-lib-server-side';
import { validateSchema } from '@dm3-org/dm3-lib-shared';
import { getConversationId } from '@dm3-org/dm3-lib-delivery';
Expand Down Expand Up @@ -118,7 +118,7 @@ export default (

await Promise.all(
req.body.acknowledgements.map(
async (ack: Acknoledgment) => {
async (ack: Acknowledgment) => {
const contactEnsName = await db.getIdEnsName(
ack.contactAddress,
);
Expand Down
6 changes: 3 additions & 3 deletions packages/lib/delivery-api/src/messaging-http.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
getDeliveryServiceClient,
normalizeEnsName,
} from '@dm3-org/dm3-lib-profile';
import { Acknoledgment } from '@dm3-org/dm3-lib-delivery';
import { Acknowledgment } from '@dm3-org/dm3-lib-delivery';
import { EncryptionEnvelop } from '@dm3-org/dm3-lib-messaging';
import { ethers } from 'ethers';
import { checkAccount, getAxiosConfig } from './utils';
Expand All @@ -15,7 +15,7 @@ const DELIVERY_PATH = process.env.REACT_APP_BACKEND + '/delivery';
export async function syncAcknoledgment(
provider: ethers.providers.JsonRpcProvider,
account: Account,
acknoledgments: Acknoledgment[],
acknoledgments: Acknowledgment[],
token: string,
lastMessagePull: number,
): Promise<void> {
Expand Down Expand Up @@ -45,7 +45,7 @@ export type SyncAcknoledgment = typeof syncAcknoledgment;
export async function syncAcknowledgment(
provider: ethers.providers.JsonRpcProvider,
account: Account,
acknoledgments: Acknoledgment[],
acknoledgments: Acknowledgment[],
token: string,
lastSyncTime: number,
): Promise<void> {
Expand Down
2 changes: 1 addition & 1 deletion packages/lib/delivery/src/schema/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import DeliveryServicePropertiesSchema from './DeliveryServiceProperties.schema.
import SessionSchema from './Session.schema.json';
import NotificationChannelSchema from './NotificationChannel.schema.json';

export const Acknowledgment = AcknowledgmentSchema.definitions.Acknoledgment;
export const Acknowledgment = AcknowledgmentSchema.definitions.Acknowledgment;
export const DeliveryServiceProperties = DeliveryServicePropertiesSchema;
export const Session = SessionSchema;
export const NotificationChannel = NotificationChannelSchema;
6 changes: 3 additions & 3 deletions packages/lib/storage/src/Storage.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { decrypt, encrypt, EncryptedPayload } from '@dm3-org/dm3-lib-crypto';
import { Acknoledgment } from '@dm3-org/dm3-lib-delivery';
import { Acknowledgment } from '@dm3-org/dm3-lib-delivery';
import { Envelop, MessageState } from '@dm3-org/dm3-lib-messaging';
import { Account, ProfileKeys } from '@dm3-org/dm3-lib-profile';
import { logInfo, stringify } from '@dm3-org/dm3-lib-shared';
Expand Down Expand Up @@ -176,13 +176,13 @@ export async function sync(
deliveryServiceToken: string,
): Promise<{
userStorage: UserStorage;
acknoledgments: Acknoledgment[];
acknoledgments: Acknowledgment[];
}> {
if (!userDb) {
throw Error(`User db hasn't been create`);
}

const acknoledgments: Acknoledgment[] = Array.from(
const acknoledgments: Acknowledgment[] = Array.from(
userDb.conversations.keys(),
)
// get newest delivery service query timestamp
Expand Down
11 changes: 4 additions & 7 deletions packages/messenger-widget/src/context/DeliveryServiceContext.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
import { NotificationChannelType } from '@dm3-org/dm3-lib-shared';
import React from 'react';
import { useDeliveryService } from '../hooks/server-side/useDeliveryService';
import {
Acknoledgment,
DeliveryServiceProperties,
} from '@dm3-org/dm3-lib-delivery';
import { NotificationChannelType } from '@dm3-org/dm3-lib-shared';
import { Acknowledgment } from '@dm3-org/dm3-lib-delivery';

export type DeliveryServiceContextType = {
getDeliveryServiceProperties: () => Promise<any[]>;
Expand All @@ -27,7 +24,7 @@ export type DeliveryServiceContextType = {
fetchIncommingMessages: (ensName: string) => any;
syncAcknowledgment: (
ensName: string,
acknoledgments: Acknoledgment[],
acknowledgments: Acknowledgment[],
lastSyncTime: number,
) => void;
getGlobalNotification: (ensName: string) => any;
Expand Down Expand Up @@ -68,7 +65,7 @@ export const DeliveryServiceContext =
fetchIncommingMessages: (ensName: string) => {},
syncAcknowledgment: (
ensName: string,
acknoledgments: Acknoledgment[],
acknowledgments: Acknowledgment[],
lastSyncTime: number,
) => {},
getGlobalNotification: (ensName: string) => {},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Acknoledgment } from '@dm3-org/dm3-lib-delivery';
import { Acknowledgment } from '@dm3-org/dm3-lib-delivery';
import { NotificationChannelType } from '@dm3-org/dm3-lib-shared';
import { DeliveryServiceContextType } from '../DeliveryServiceContext';

Expand All @@ -20,7 +20,7 @@ export const getMockedDeliveryServiceContext = (
},
syncAcknowledgment: function (
ensName: string,
acknoledgments: Acknoledgment[],
acknowledgments: Acknowledgment[],
lastSyncTime: number,
): void {
throw new Error('Function not implemented.');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
import { MessageModel, MessageSource } from '../useMessage';
import { Account, ProfileKeys } from '@dm3-org/dm3-lib-profile';
import { AddConversation, StoreMessageBatch } from '../../storage/useStorage';
import { Acknoledgment } from '@dm3-org/dm3-lib-delivery';
import { Acknowledgment } from '@dm3-org/dm3-lib-delivery';

export const handleMessagesFromDeliveryService = async (
account: Account,
Expand All @@ -18,7 +18,7 @@ export const handleMessagesFromDeliveryService = async (
fetchNewMessages: (ensName: string, contactAddress: string) => any,
syncAcknowledgment: (
ensName: string,
acknoledgments: Acknoledgment[],
acknoledgments: Acknowledgment[],
lastSyncTime: number,
) => void,
updateConversationList: (conversation: string, updatedAt: number) => void,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Acknoledgment } from '@dm3-org/dm3-lib-delivery';
import { Acknowledgment } from '@dm3-org/dm3-lib-delivery';
import { ServerSideConnector } from './ServerSideConnector';
import { normalizeEnsName } from '@dm3-org/dm3-lib-profile';
import { NotificationChannelType } from '@dm3-org/dm3-lib-shared';
Expand All @@ -16,15 +16,15 @@ export class DeliveryServiceConnector extends ServerSideConnector {

public async syncAcknowledgement(
ensName: string,
acknoledgments: Acknoledgment[],
acknowledgments: Acknowledgment[],
lastSyncTime: number,
) {
const url = `/delivery/messages/${normalizeEnsName(
ensName,
)}/syncAcknowledgment/${lastSyncTime}`;

return await this.getAuthenticatedAxiosClient().post(url, {
acknoledgments,
acknowledgments,
});
}

Expand Down Expand Up @@ -94,14 +94,14 @@ export class DeliveryServiceConnector extends ServerSideConnector {

public async syncAcknowledgment(
ensName: string,
acknoledgments: Acknoledgment[],
acknowledgments: Acknowledgment[],
lastSyncTime: number,
) {
const url = `/delivery/messages/${normalizeEnsName(
ensName,
)}/syncAcknowledgment/${lastSyncTime}`;
const { data } = await this.getAuthenticatedAxiosClient().post(url, {
acknoledgments,
acknowledgments,
});
return data;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Acknoledgment } from '@dm3-org/dm3-lib-delivery';
import { Acknowledgment } from '@dm3-org/dm3-lib-delivery';
import { EncryptionEnvelop } from '@dm3-org/dm3-lib-messaging';
import { getDeliveryServiceProfile } from '@dm3-org/dm3-lib-profile';
import { NotificationChannelType } from '@dm3-org/dm3-lib-shared';
Expand Down Expand Up @@ -177,15 +177,15 @@ export const useDeliveryService = () => {
},
syncAcknowledgment: (
ensName: string,
acknoledgments: Acknoledgment[],
acknowledgments: Acknowledgment[],
lastSyncTime: number,
) => {
const connectors = _getConnectors();
return Promise.all(
connectors.map((c) =>
c.syncAcknowledgement(
ensName,
acknoledgments,
acknowledgments,
lastSyncTime,
),
),
Expand Down

0 comments on commit c502aa5

Please sign in to comment.