Skip to content
This repository has been archived by the owner on Aug 16, 2021. It is now read-only.

fix: Don't send all avatar events #1462

Merged
merged 2 commits into from
Oct 19, 2020
Merged

fix: Don't send all avatar events #1462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f826faf
Changed Avatar Events tracking so it only tracks the specified events…
pablitar Oct 19, 2020
6d65a45
Merge branch 'master' into fix/dont-send-all-avatar-events
pablitar Oct 19, 2020
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
14 changes: 13 additions & 1 deletion kernel/packages/shared/analytics.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,21 @@ function track({ name, data }: SegmentEvent) {
})
}

const TRACEABLE_AVATAR_EVENTS = [
AvatarMessageType.ADD_FRIEND,
AvatarMessageType.USER_DATA,
AvatarMessageType.USER_EXPRESSION,
AvatarMessageType.USER_REMOVED,
AvatarMessageType.SET_LOCAL_UUID,
AvatarMessageType.USER_MUTED,
AvatarMessageType.USER_UNMUTED,
AvatarMessageType.USER_BLOCKED,
AvatarMessageType.USER_UNBLOCKED
]

function hookObservables() {
avatarMessageObservable.add(({ type, ...data }) => {
if (type === AvatarMessageType.USER_VISIBLE || type === AvatarMessageType.USER_POSE) {
if (!TRACEABLE_AVATAR_EVENTS.includes(type)) {
return
}

Expand Down
4 changes: 1 addition & 3 deletions kernel/packages/shared/comms/interface/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ export enum AvatarMessageType {
USER_BLOCKED = 'USER_BLOCKED',
USER_UNBLOCKED = 'USER_UNBLOCKED',

ADD_FRIEND = 'ADD_FRIEND',
SHOW_WINDOW = 'SHOW_WINDOW'
ADD_FRIEND = 'ADD_FRIEND'
}

export type ReceiveUserExpressionMessage = {
Expand Down Expand Up @@ -64,7 +63,6 @@ export type UserMessage = {
| AvatarMessageType.USER_UNBLOCKED
| AvatarMessageType.USER_MUTED
| AvatarMessageType.USER_UNMUTED
| AvatarMessageType.SHOW_WINDOW
| AvatarMessageType.USER_TALKING
uuid: string
}
Expand Down
7 changes: 0 additions & 7 deletions kernel/packages/ui/avatar/avatarSystem.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import {
ReceiveUserTalkingMessage,
ReceiveUserVisibleMessage,
UserInformation,
UserMessage,
UserRemovedMessage,
UUID
} from 'shared/comms/interface/types'
Expand Down Expand Up @@ -195,10 +194,6 @@ function handleUserRemoved({ uuid }: UserRemovedMessage): void {
}
}

function handleShowWindow({ uuid }: UserMessage): void {
// noop
}

avatarMessageObservable.add((evt) => {
if (evt.type === AvatarMessageType.USER_DATA) {
handleUserData(evt)
Expand All @@ -212,7 +207,5 @@ avatarMessageObservable.add((evt) => {
handleUserRemoved(evt)
} else if (evt.type === AvatarMessageType.USER_TALKING) {
handleUserTalkingUpdate(evt as ReceiveUserTalkingMessage)
} else if (evt.type === AvatarMessageType.SHOW_WINDOW) {
handleShowWindow(evt)
}
})