mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-20 21:35:50 +00:00
improve
This commit is contained in:
@@ -172,14 +172,13 @@ export class RoomService {
|
|||||||
this.id,
|
this.id,
|
||||||
"stream-room-messages",
|
"stream-room-messages",
|
||||||
async (IncomingChatMessage:IncomingChatMessage) => {
|
async (IncomingChatMessage:IncomingChatMessage) => {
|
||||||
// console.log('recivemessage========', JSON.stringify(IncomingChatMessage))
|
|
||||||
|
|
||||||
let IncomingChatMessageArgs = IncomingChatMessage.fields.args[0]
|
let IncomingChatMessageArgs = IncomingChatMessage.fields.args[0]
|
||||||
let ChatMessage : ChatMessageInterface = this.fix_updatedAt(IncomingChatMessageArgs)
|
let ChatMessage : ChatMessageInterface = this.fix_updatedAt(IncomingChatMessageArgs)
|
||||||
|
|
||||||
if(!this.messagesLocalReference.includes(ChatMessage.localReference)) {
|
if(!this.messagesLocalReference.includes(ChatMessage.localReference)) {
|
||||||
|
|
||||||
const message = await this.prepareMessage({message: ChatMessage, save: true})
|
const message = await this.prepareCreate({message: ChatMessage, save: true})
|
||||||
message.messageSend = true
|
message.messageSend = true
|
||||||
|
|
||||||
this.lastMessage = message
|
this.lastMessage = message
|
||||||
@@ -659,11 +658,6 @@ export class RoomService {
|
|||||||
wewMessage.setData(message)
|
wewMessage.setData(message)
|
||||||
wewMessage.loadHistory = this.hasLoadHistory
|
wewMessage.loadHistory = this.hasLoadHistory
|
||||||
|
|
||||||
if(!message?._id && environment.chatOffline && save) {
|
|
||||||
this.messages.push(wewMessage)
|
|
||||||
return wewMessage
|
|
||||||
}
|
|
||||||
|
|
||||||
let foundIndex;
|
let foundIndex;
|
||||||
|
|
||||||
const found = this.messages.find((MessageService, index) => {
|
const found = this.messages.find((MessageService, index) => {
|
||||||
@@ -723,17 +717,8 @@ export class RoomService {
|
|||||||
wewMessage.setData(message)
|
wewMessage.setData(message)
|
||||||
wewMessage.loadHistory = this.hasLoadHistory
|
wewMessage.loadHistory = this.hasLoadHistory
|
||||||
|
|
||||||
console.log(message?._id, environment.chatOffline, save)
|
|
||||||
|
|
||||||
if(!message?._id && environment.chatOffline && save) {
|
|
||||||
|
|
||||||
this.messages.push(wewMessage)
|
this.messages.push(wewMessage)
|
||||||
// console.log('add to view')
|
|
||||||
return wewMessage
|
return wewMessage
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -120,10 +120,9 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
|
|||||||
private fileToBase64Service: FileToBase64Service,
|
private fileToBase64Service: FileToBase64Service,
|
||||||
private sanitiser: DomSanitizer,
|
private sanitiser: DomSanitizer,
|
||||||
) {
|
) {
|
||||||
|
|
||||||
this.loggedUser = authService.ValidatedUserChat['data'];
|
this.loggedUser = authService.ValidatedUserChat['data'];
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ngOnChanges(changes: SimpleChanges): void {
|
ngOnChanges(changes: SimpleChanges): void {
|
||||||
this.wsChatMethodsService.getDmRoom(this.roomId).loadHistory({})
|
this.wsChatMethodsService.getDmRoom(this.roomId).loadHistory({})
|
||||||
|
|
||||||
@@ -743,6 +742,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
|
|||||||
const roomId = this.roomId
|
const roomId = this.roomId
|
||||||
|
|
||||||
const file: any = await this.fileService.getFileFromDevice(types);
|
const file: any = await this.fileService.getFileFromDevice(types);
|
||||||
|
|
||||||
console.log('Add file', file)
|
console.log('Add file', file)
|
||||||
/* const imageData = await this.fileToBase64Service.convert(file).then((filee) => {
|
/* const imageData = await this.fileToBase64Service.convert(file).then((filee) => {
|
||||||
console.log('Add file', filee)
|
console.log('Add file', filee)
|
||||||
|
|||||||
Reference in New Issue
Block a user