Rename interfaces and variables

This commit is contained in:
R. Richard
2019-08-08 14:44:40 +02:00
parent 6b25416973
commit 6e22e7efe9
19 changed files with 90 additions and 130 deletions

View File

@ -2,7 +2,7 @@
// All Rights Reserved. See LICENSE file for details.
import { ChangeDetectorRef, Component, OnInit, EventEmitter, Output } from '@angular/core';
import { MessageConfig, MessageData, MessagesMessage, MessageQueueMessage } from '../message-types/bot-messages';
import { MessageConfig, MessageData, Message, MessageQueue } from '../message-types/bot-messages';
import { MarkdownService } from '../services/markdown.service';
import { WebSocketService } from '../services/websocket.service';
@ -42,40 +42,40 @@ export class MessagesComponent implements OnInit {
);
this.websocketService.connect();
this.websocketService.observeKey<MessagesMessage>('message.send').subscribe(
(event) => this.newMessage.next(event)
this.websocketService.observeKey<Message>('message.send').subscribe(
(message) => this.newMessage.next(message)
);
this.websocketService.observeKey<MessageQueueMessage>('message.queue').subscribe(
(event) => this.handleQueueMessage(event)
this.websocketService.observeKey<MessageQueue>('message.queue').subscribe(
(message) => this.handleQueueMessage(message)
);
this.websocketService.observeKey<MessageConfig>('message.config').subscribe(
(event) => this.configureMessages(event)
(message) => this.configureMessages(message)
);
}
writeMessage(data: MessageData) {
this.transformMessage(data);
this.messages.push(data);
writeMessage(message: MessageData) {
this.transformMessage(message);
this.messages.push(message);
this.changeDetectorRef.detectChanges();
}
transformMessage(data: MessageData) {
data.message = this.convertMarkdownToHTML(data.message);
if (!data.originator) {
data.originator = this.originator;
transformMessage(message: MessageData) {
message.message = this.convertMarkdownToHTML(message.message);
if (!message.originator) {
message.originator = this.originator;
}
if (!data.timestamp) {
data.timestamp = new Date();
if (!message.timestamp) {
message.timestamp = new Date();
}
}
handleQueueMessage(data: MessageQueueMessage) {
this.messageQueueAttender.queueMessages(data.value);
handleQueueMessage(message: MessageQueue) {
this.messageQueueAttender.queueMessages(message.value);
}
configureMessages(data: MessageConfig) {
if (data.originator) {
this.originator = data.originator;
configureMessages(message: MessageConfig) {
if (message.originator) {
this.originator = message.originator;
}
}