Merge branch 'develop' of github.com:thecodingmachine/workadventure

This commit is contained in:
_Bastler
2021-09-06 18:49:47 +02:00
66 changed files with 953 additions and 822 deletions
+10 -10
View File
@@ -1,15 +1,15 @@
import {Subject} from "rxjs";
import type {BanUserMessage, SendUserMessage} from "../Messages/generated/messages_pb";
import { Subject } from "rxjs";
import type { BanUserMessage, SendUserMessage } from "../Messages/generated/messages_pb";
export enum AdminMessageEventTypes {
admin = 'message',
audio = 'audio',
ban = 'ban',
banned = 'banned',
admin = "message",
audio = "audio",
ban = "ban",
banned = "banned",
}
interface AdminMessageEvent {
type: AdminMessageEventTypes,
type: AdminMessageEventTypes;
text: string;
//todo add optional properties for other event types
}
@@ -21,14 +21,14 @@ class AdminMessagesService {
public messageStream = this._messageStream.asObservable();
constructor() {
this.messageStream.subscribe((event) => console.log('message', event))
this.messageStream.subscribe((event) => console.log("message", event));
}
onSendusermessage(message: SendUserMessage|BanUserMessage) {
onSendusermessage(message: SendUserMessage | BanUserMessage) {
this._messageStream.next({
type: message.getType() as unknown as AdminMessageEventTypes,
text: message.getMessage(),
})
});
}
}
+7 -8
View File
@@ -1,19 +1,18 @@
import {Subject} from "rxjs";
import { Subject } from "rxjs";
interface EmoteEvent {
userId: number,
emote: string,
userId: number;
emote: string;
}
class EmoteEventStream {
private _stream:Subject<EmoteEvent> = new Subject();
private _stream: Subject<EmoteEvent> = new Subject();
public stream = this._stream.asObservable();
fire(userId: number, emote:string) {
this._stream.next({userId, emote});
fire(userId: number, emote: string) {
this._stream.next({ userId, emote });
}
}
export const emoteEventStream = new EmoteEventStream();
export const emoteEventStream = new EmoteEventStream();
@@ -1,14 +1,12 @@
import {Subject} from "rxjs";
import { Subject } from "rxjs";
class WorldFullMessageStream {
private _stream:Subject<string|null> = new Subject<string|null>();
private _stream: Subject<string | null> = new Subject<string | null>();
public stream = this._stream.asObservable();
onMessage(message? :string) {
onMessage(message?: string) {
this._stream.next(message);
}
}
export const worldFullMessageStream = new WorldFullMessageStream();
export const worldFullMessageStream = new WorldFullMessageStream();