diff --git a/.gitignore b/.gitignore index 2884ea598..5996509b7 100644 --- a/.gitignore +++ b/.gitignore @@ -76,4 +76,5 @@ _android/ _www/ www2020 android copy/ -report.* \ No newline at end of file +report.* +src/plugin/src/ \ No newline at end of file diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts index 8d758e4dc..6aa418cf1 100644 --- a/src/app/pages/chat/chat.page.ts +++ b/src/app/pages/chat/chat.page.ts @@ -115,7 +115,6 @@ export class ChatPage implements OnInit { public ChatSystemService: ChatSystemService, ) { - this.loggedUserChat = SessionStore.user.ChatData?.data; this.headers = new HttpHeaders(); window.onresize = (event) => { if (window.innerWidth > 701) { @@ -591,11 +590,8 @@ export class ChatPage implements OnInit { return dateB - dateA; }); // - }) - } - } @@ -617,7 +613,6 @@ export class ChatPage implements OnInit { _updatedAt: element._updatedAt } - groupsArray.push(roomList) }); @@ -636,7 +631,6 @@ export class ChatPage implements OnInit { updatedat: element._updatedAt } - this.sqlservice.addChatListRoom(roomList); }); } diff --git a/src/app/services/chat/message.service.ts b/src/app/services/chat/message.service.ts index 83255aa43..6e8231bce 100644 --- a/src/app/services/chat/message.service.ts +++ b/src/app/services/chat/message.service.ts @@ -446,9 +446,11 @@ export class MessageService { async delateDB() { - const message = await MessageModel.get({id: this.id}) - await message.delete() + if(!this.rowInstance) { + this.rowInstance = await this.getRowInstance() + } + await this.rowInstance.delete() } diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts index b67bfc32e..982ee860d 100644 --- a/src/app/services/chat/room.service.ts +++ b/src/app/services/chat/room.service.ts @@ -452,7 +452,13 @@ export class RoomService { "stream-notify-room", async (ChatMessage) => { const DeletedMessageId = ChatMessage.fields.args[0]._id; - this.deleteMessage(DeletedMessageId) + + const message = this.messages.find((e) => e._id == DeletedMessageId) + + if(message.delate == false) { + this.deleteMessage(DeletedMessageId) + } + } ) } diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts index b4add0860..4681e0123 100644 --- a/src/app/services/events.service.ts +++ b/src/app/services/events.service.ts @@ -4,7 +4,6 @@ import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http'; import { Observable, from } from 'rxjs'; import { environment } from 'src/environments/environment'; import { AuthService } from '../services/auth.service'; -import { UserSession } from '../models/user.model'; import { EventList } from '../models/agenda/AgendaEventList'; import { ChangeProfileService } from './change-profile.service'; import { OfflineManagerService } from 'src/app/services/offline-manager.service'; diff --git a/version/git-version.ts b/version/git-version.ts index 1a32d86b6..df796b55d 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "46296813b", - "SHA": "46296813b849aad1f6037fa09577a2ba04f4d2ca", + "shortSHA": "b890b58a8", + "SHA": "b890b58a86e4c459836236774015a1bc38ee0b1c", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Wed Jan 18 11:38:21 2023 +0100'", - "lastCommitMessage": "clear agenda cache", - "lastCommitNumber": "4651", + "lastCommitTime": "'Wed Jan 18 11:59:53 2023 +0100'", + "lastCommitMessage": "fix", + "lastCommitNumber": "4652", "change": "", - "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/services/attachments.service.ts\n\tmodified: src/app/services/auth.service.ts\n\tmodified: src/app/services/contacts.service.ts\n\tmodified: src/app/services/events.service.ts\n\tmodified: src/app/services/organic-entity.service.ts\n\tmodified: src/app/services/publications.service.ts\n\tmodified: src/app/services/search.service.ts", + "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: .gitignore\n\tmodified: src/app/pages/chat/chat.page.ts\n\tmodified: src/app/services/chat/message.service.ts\n\tmodified: src/app/services/chat/room.service.ts\n\tmodified: src/app/services/events.service.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file