Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fixes #1140 - postback messages showing up in webchat #1150

Merged
merged 2 commits into from
Dec 6, 2018
Merged

fixes #1140 - postback messages showing up in webchat #1150

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22199be
fixes #1140 - postback messages showing up in webchat
justinwilaby Dec 6, 2018
6d0e910
Merge branch 'master' into jwilaby/#1140-postback
Dec 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 0 additions & 3 deletions packages/app/client/src/ui/editor/emulator/chatPanel/chatPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,6 @@ interface ChatPanelProps {
}

export default class ChatPanel extends React.Component<ChatPanelProps, {}> {
constructor(props: ChatPanelProps, context: {}) {
super(props, context);
}

render() {
const { endpointUrl } = this.props.document || { endpointUrl: '' };
Expand Down
44 changes: 23 additions & 21 deletions packages/emulator/core/src/facility/conversation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,35 +35,35 @@ import { EventEmitter } from 'events';
import * as HttpStatus from 'http-status-codes';
import updateIn from 'simple-update-in';
import BotEmulator from '../botEmulator';
import BotEndpoint from './botEndpoint';
import createAPIException from '../utils/createResponse/apiException';
import createResourceResponse from '../utils/createResponse/resource';
import ErrorCodes from '../types/errorCodes';
import Activity from '../types/activity/activity';
import ContactRelationUpdateActivity from '../types/activity/contactRelationUpdate';
import ConversationUpdateActivity from '../types/activity/conversationUpdate';
import EventActivity from '../types/activity/event';
import GenericActivity from '../types/activity/generic';
import InvokeActivity from '../types/activity/invoke';
import EventActivity from '../types/activity/event';
import ResourceResponse from '../types/response/resource';
import isLocalhostUrl from '../utils/isLocalhostUrl';
import TranscriptRecord from '../types/transcriptRecord';
import User from '../types/user';
import PaymentEncoder from '../utils/paymentEncoder';
import OAuthClientEncoder from '../utils/oauthClientEncoder';
import uniqueId from '../utils/uniqueId';
import MessageActivity from '../types/activity/message';
import Attachment from '../types/attachment';
import ErrorCodes from '../types/errorCodes';
import LogLevel from '../types/log/level';
import { appSettingsItem, externalLinkItem, textItem } from '../types/log/util';
import PaymentAddress from '../types/payment/address';

import CheckoutConversationSession from '../types/payment/checkoutConversationSession';
import PaymentAddress from '../types/payment/address';
import PaymentOperations from '../types/payment/operations';
import PaymentRequest from '../types/payment/request';
import PaymentRequestComplete from '../types/payment/requestComplete';
import PaymentRequestUpdate from '../types/payment/requestUpdate';
import PaymentOperations from '../types/payment/operations';
import ResourceResponse from '../types/response/resource';
import TranscriptRecord from '../types/transcriptRecord';
import User from '../types/user';
import { TokenCache } from '../userToken/tokenCache';
import MessageActivity from '../types/activity/message';
import Attachment from '../types/attachment';
import { appSettingsItem, externalLinkItem, textItem } from '../types/log/util';
import LogLevel from '../types/log/level';
import createAPIException from '../utils/createResponse/apiException';
import createResourceResponse from '../utils/createResponse/resource';
import isLocalhostUrl from '../utils/isLocalhostUrl';
import OAuthClientEncoder from '../utils/oauthClientEncoder';
import PaymentEncoder from '../utils/paymentEncoder';
import uniqueId from '../utils/uniqueId';
import BotEndpoint from './botEndpoint';

// moment currently does not export callable function
const moment = require('moment');
Expand Down Expand Up @@ -283,7 +283,7 @@ export default class Conversation extends EventEmitter {
}

public async addMember(id: string, name: string): Promise<User> {
name = name || `user-${uniqueId()}`;
name = name || `user-${ uniqueId() }`;
id = id || uniqueId();

const user = { name, id };
Expand Down Expand Up @@ -673,8 +673,10 @@ export default class Conversation extends EventEmitter {
}

private addActivityToQueue(activity: Activity) {
this.activities = [...this.activities, { activity, watermark: this.nextWatermark++ }];
this.emit('addactivity', { activity });
if (!(activity.channelData || {}).postback) {
this.activities = [...this.activities, { activity, watermark: this.nextWatermark++ }];
this.emit('addactivity', { activity });
}

const genericActivity = activity as GenericActivity;

Expand Down