Skip to content

Commit

Permalink
fix: timestamp type to number
Browse files Browse the repository at this point in the history
  • Loading branch information
@ankur12-1610
ankur12-1610 committed Apr 22, 2024
1 parent 4e5bacb commit c70d66a
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 35 deletions.
59 changes: 30 additions & 29 deletions packages/restapi/src/lib/pushstream/DataModifier.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import {
VideoEventType,
MessageOrigin,
VideoEvent,
GroupEventBase
} from './pushStreamTypes';
import { VideoCallStatus, VideoPeerInfo } from '../types';
import { VideoDataType } from '../video';
Expand Down Expand Up @@ -57,7 +58,7 @@ export class DataModifier {
): JoinGroupEvent {
const baseEventData: JoinGroupEvent = {
origin: data.messageOrigin,
timestamp: data.timestamp.toString(),
timestamp: data.timestamp,
chatId: data.chatId,
from: data.from,
to: data.to,
Expand All @@ -78,7 +79,7 @@ export class DataModifier {
): LeaveGroupEvent {
const baseEventData: LeaveGroupEvent = {
origin: data.messageOrigin,
timestamp: data.timestamp.toString(),
timestamp: data.timestamp,
chatId: data.chatId,
from: data.from,
to: data.to,
Expand All @@ -96,7 +97,7 @@ export class DataModifier {
private static mapToRequestEvent(data: any, includeRaw: boolean): any {
const eventData: RequestEvent = {
origin: data.messageOrigin,
timestamp: data.timestamp.toString(),
timestamp: data.timestamp,
chatId: data.chatId,
from: data.from,
to: data.to,
Expand All @@ -116,7 +117,7 @@ export class DataModifier {
// Whatever the structure of your RemoveEvent, modify accordingly
const eventData: RemoveEvent = {
origin: data.messageOrigin,
timestamp: data.timestamp.toString(),
timestamp: data.timestamp,
chatId: data.chatId,
from: data.from,
to: data.to,
Expand All @@ -133,7 +134,7 @@ export class DataModifier {
// Whatever the structure of your RemoveEvent, modify accordingly
const eventData: RoleEvent = {
origin: data.messageOrigin,
timestamp: data.timestamp.toString(),
timestamp: data.timestamp,
chatId: data.chatId,
from: data.from,
to: data.to,
Expand Down Expand Up @@ -183,10 +184,10 @@ export class DataModifier {
includeRaw
);

const groupEvent: any = {
const groupEvent: GroupEventBase = {
event: eventType,
origin: incomingData.messageOrigin,
timestamp: incomingData.timestamp.toString(),
timestamp: incomingData.timestamp,
chatId: incomingData.chatId,
from: incomingData.from,
meta,
Expand Down Expand Up @@ -233,7 +234,7 @@ export class DataModifier {
const messageEvent: MessageEvent = {
event: eventType,
origin: data.messageOrigin,
timestamp: data.timestamp.toString(),
timestamp: data.timestamp,
chatId: data.chatId, // TODO: ChatId not working for w2w
from: data.fromCAIP10,
to: [data.toCAIP10], // TODO: Assuming 'to' is an array in MessageEvent. Update as necessary.
Expand Down Expand Up @@ -330,7 +331,7 @@ export class DataModifier {
const notificationEvent: NotificationEvent = {
event: notificationEventType,
origin: origin,
timestamp: data.epoch.toString(),
timestamp: data.epoch,
from: data.sender,
to: recipients,
notifID: data.payload_id.toString(),
Expand Down Expand Up @@ -496,7 +497,7 @@ export class DataModifier {
type BaseEventData = {
event: string;
origin: string;
timestamp: string;
timestamp: number;
spaceId: string;
from: string;
meta: {
Expand All @@ -515,7 +516,7 @@ export class DataModifier {
const baseEventData: BaseEventData = {
event: data.eventType,
origin: data.messageOrigin,
timestamp: data.timestamp.toString(),
timestamp: data.timestamp,
spaceId: data.spaceId,
from: data.spaceCreator,
meta: {
Expand All @@ -541,7 +542,7 @@ export class DataModifier {
type BaseEventData = {
event: string;
origin: string;
timestamp: string;
timestamp: number;
spaceId: string;
from: string;
meta: {
Expand All @@ -560,7 +561,7 @@ export class DataModifier {
const baseEventData: BaseEventData = {
event: data.eventType,
origin: data.messageOrigin,
timestamp: data.timestamp.toString(),
timestamp: data.timestamp,
spaceId: data.spaceId,
from: data.spaceCreator,
meta: {
Expand All @@ -585,7 +586,7 @@ export class DataModifier {
private static mapToRequestSpaceEvent(data: any, includeRaw: boolean): any {
const eventData: SpaceRequestEvent = {
origin: data.messageOrigin,
timestamp: data.timestamp.toString(),
timestamp: data.timestamp,
spaceId: data.spaceId,
from: data.from,
to: data.to,
Expand All @@ -602,7 +603,7 @@ export class DataModifier {
type BaseEventData = {
event: string;
origin: string;
timestamp: any;
timestamp: number;
spaceId: any;
from: any;
to: any[];
Expand All @@ -614,7 +615,7 @@ export class DataModifier {
const baseEventData: BaseEventData = {
event: 'request',
origin: data.messageOrigin === 'other' ? 'self' : 'other',
timestamp: data.timestamp.toString(),
timestamp: data.timestamp,
spaceId: data.chatId,
from: data.fromCAIP10,
to: [data.toCAIP10],
Expand All @@ -633,7 +634,7 @@ export class DataModifier {
type BaseEventData = {
event: string;
origin: string;
timestamp: string;
timestamp: number;
spaceId: string;
from: string;
to: null;
Expand All @@ -645,7 +646,7 @@ export class DataModifier {
const baseEventData: BaseEventData = {
event: 'reject',
origin: data.messageOrigin === 'other' ? 'other' : 'self',
timestamp: data.timestamp.toString(),
timestamp: data.timestamp,
spaceId: data.chatId,
from: data.fromCAIP10,
to: null,
Expand All @@ -664,7 +665,7 @@ export class DataModifier {
type BaseEventData = {
event: string;
origin: string;
timestamp: string;
timestamp: number;
spaceId: string;
from: string;
to: null;
Expand All @@ -675,7 +676,7 @@ export class DataModifier {

const eventData: BaseEventData = {
origin: data.messageOrigin,
timestamp: data.timestamp.toString(),
timestamp: data.timestamp,
spaceId: data.spaceId,
from: data.from,
to: data.to,
Expand All @@ -692,7 +693,7 @@ export class DataModifier {
type BaseEventData = {
event: string;
origin: string;
timestamp: string;
timestamp: number;
spaceId: string;
from: string;
to: null;
Expand All @@ -703,7 +704,7 @@ export class DataModifier {

const eventData: BaseEventData = {
origin: data.messageOrigin,
timestamp: data.timestamp.toString(),
timestamp: data.timestamp,
spaceId: data.spaceId,
from: data.from,
to: data.to,
Expand All @@ -720,7 +721,7 @@ export class DataModifier {
type BaseEventData = {
event: string;
origin: string;
timestamp: string;
timestamp: number;
spaceId: string;
from: string;
to: null;
Expand All @@ -731,7 +732,7 @@ export class DataModifier {

const eventData: BaseEventData = {
origin: data.messageOrigin,
timestamp: data.timestamp.toString(),
timestamp: data.timestamp,
spaceId: data.spaceId,
from: data.from,
to: data.to,
Expand All @@ -748,7 +749,7 @@ export class DataModifier {
type BaseEventData = {
event: string;
origin: string;
timestamp: string;
timestamp: number;
spaceId: string;
from: string;
to: null;
Expand All @@ -759,7 +760,7 @@ export class DataModifier {

const eventData: BaseEventData = {
origin: data.messageOrigin,
timestamp: data.timestamp.toString(),
timestamp: data.timestamp,
spaceId: data.spaceId,
from: data.from,
to: null,
Expand All @@ -776,7 +777,7 @@ export class DataModifier {
type BaseEventData = {
event: string;
origin: string;
timestamp: string;
timestamp: number;
spaceId: string;
from: string;
to: null;
Expand All @@ -787,7 +788,7 @@ export class DataModifier {

const eventData: BaseEventData = {
origin: data.messageOrigin,
timestamp: data.timestamp.toString(),
timestamp: data.timestamp,
spaceId: data.spaceId,
from: data.from,
to: null,
Expand Down Expand Up @@ -856,7 +857,7 @@ export class DataModifier {
const videoEvent: VideoEvent = {
event: videoEventType,
origin: origin,
timestamp: data.epoch.toString(),
timestamp: data.epoch,
peerInfo,
};

Expand Down
12 changes: 6 additions & 6 deletions packages/restapi/src/lib/pushstream/pushStreamTypes.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ export interface GroupEventRawData {

export interface GroupEventBase {
origin: MessageOrigin;
timestamp: string;
timestamp: number
chatId: string;
from: string;
meta: GroupMeta;
Expand All @@ -151,7 +151,7 @@ export interface UpdateGroupEvent extends GroupEventBase {
export interface GroupMemberEventBase {
event: GroupEventType | MessageEventType;
origin: MessageOrigin;
timestamp: string;
timestamp: number
chatId: string;
from: string;
to: string[];
Expand Down Expand Up @@ -185,7 +185,7 @@ export interface RoleEvent extends GroupMemberEventBase {
export interface SpaceMemberEventBase {
event: SpaceEventType | MessageEventType;
origin: MessageOrigin;
timestamp: string;
timestamp: number
spaceId: string;
from: string;
to: string[];
Expand All @@ -211,7 +211,7 @@ export interface SpaceRemoveEvent extends SpaceMemberEventBase {
export interface MessageEvent {
event: MessageEventType;
origin: MessageOrigin;
timestamp: string;
timestamp: number
chatId: string;
from: string;
to: string[];
Expand Down Expand Up @@ -239,7 +239,7 @@ export type NotificationType = keyof typeof NOTIFICATION.TYPE;
export interface NotificationEvent {
event: NotificationEventType;
origin: 'other' | 'self';
timestamp: string;
timestamp: number
from: string;
to: string[];
notifID: string;
Expand Down Expand Up @@ -298,7 +298,7 @@ export interface MessageRawData {
export interface VideoEvent {
event: VideoEventType;
origin: MessageOrigin;
timestamp: string;
timestamp: number
peerInfo: VideoPeerInfo;
raw?: GroupEventRawData;
}
Expand Down

0 comments on commit c70d66a

Please sign in to comment.