aux/mx-puppet-xmpp
1
0
Fork 0
mirror of https://github.com/plantroon/mx-puppet-xmpp.git synced 2024-11-15 07:51:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "room-namespace event ids"

Browse Source 
This reverts commit 179c6ca7dc.
This commit is contained in:
Sorunome 2020-04-25 17:06:56 +02:00
parent 179c6ca7dc
commit a9362adb24
No known key found for this signature in database
GPG Key ID: B19471D07FC9BE9C
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/skype.ts
View File

@ -105,11 +105,10 @@ export class Skype {
if (!contact || !conversation) { if (!contact || !conversation) {
return null; return null;
} }
const room = this.getRoomParams(puppetId, conversation);
return { return {
user: this.getUserParams(puppetId, contact), user: this.getUserParams(puppetId, contact),
room, room: this.getRoomParams(puppetId, conversation),
eventId: `${resource.id};${room.roomId}`, eventId: resource.id, // tslint:disable-line no-any
}; };
} }
@ -379,7 +378,7 @@ export class Skype {
const eventId = ret && ret.MessageId; const eventId = ret && ret.MessageId;
this.messageDeduplicator.unlock(dedupeKey, p.client.username, eventId); this.messageDeduplicator.unlock(dedupeKey, p.client.username, eventId);
if (eventId) { if (eventId) {
await this.puppet.eventSync.insert(room.puppetId, data.eventId!, `${eventId};${room.roomId}`); await this.puppet.eventSync.insert(room.puppetId, data.eventId!, eventId);
} }
} }
@ -402,11 +401,11 @@ export class Skype {
} }
const dedupeKey = `${room.puppetId};${room.roomId}`; const dedupeKey = `${room.puppetId};${room.roomId}`;
this.messageDeduplicator.lock(dedupeKey, p.client.username, msg); this.messageDeduplicator.lock(dedupeKey, p.client.username, msg);
await p.client.sendEdit(conversation.id, eventId.split(";")[0], msg); await p.client.sendEdit(conversation.id, eventId, msg);
const newEventId = ""; const newEventId = "";
this.messageDeduplicator.unlock(dedupeKey, p.client.username, newEventId); this.messageDeduplicator.unlock(dedupeKey, p.client.username, newEventId);
if (newEventId) { if (newEventId) {
await this.puppet.eventSync.insert(room.puppetId, data.eventId!, `${newEventId};${room.roomId}`); await this.puppet.eventSync.insert(room.puppetId, data.eventId!, newEventId);
} }
} }
@ -432,7 +431,7 @@ export class Skype {
const ownContact = await p.client.getContact(p.client.username); const ownContact = await p.client.getContact(p.client.username);
const authorname = escapeHtml(ownContact ? ownContact.displayName : p.client.username); const authorname = escapeHtml(ownContact ? ownContact.displayName : p.client.username);
const conversationId = escapeHtml(conversation.id); const conversationId = escapeHtml(conversation.id);
const timestamp = Math.round(Number(eventId.split(";")[0]) / 1000).toString(); const timestamp = Math.round(Number(eventId) / 1000).toString();
const origEventId = (await this.puppet.eventSync.getMatrix(room.puppetId, eventId))[0]; const origEventId = (await this.puppet.eventSync.getMatrix(room.puppetId, eventId))[0];
let contents = "blah"; let contents = "blah";
if (origEventId) { if (origEventId) {
@ -452,7 +451,7 @@ export class Skype {
} }
} }
const quote = `<quote author="${author}" authorname="${authorname}" timestamp="${timestamp}" ` + const quote = `<quote author="${author}" authorname="${authorname}" timestamp="${timestamp}" ` +
`conversation="${conversationId}" messageid="${escapeHtml(eventId.split(";")[0])}">` + `conversation="${conversationId}" messageid="${escapeHtml(eventId)}">` +
`<legacyquote>[${timestamp}] ${authorname}: </legacyquote>${contents}<legacyquote> `<legacyquote>[${timestamp}] ${authorname}: </legacyquote>${contents}<legacyquote>
&lt;&lt;&lt; </legacyquote></quote>`; &lt;&lt;&lt; </legacyquote></quote>`;
@ -463,7 +462,7 @@ export class Skype {
const newEventId = ret && ret.MessageId; const newEventId = ret && ret.MessageId;
this.messageDeduplicator.unlock(dedupeKey, p.client.username, newEventId); this.messageDeduplicator.unlock(dedupeKey, p.client.username, newEventId);
if (newEventId) { if (newEventId) {
await this.puppet.eventSync.insert(room.puppetId, data.eventId!, `${newEventId};${room.roomId}`); await this.puppet.eventSync.insert(room.puppetId, data.eventId!, newEventId);
} }
} }
@ -479,7 +478,7 @@ export class Skype {
return; return;
} }
p.deletedMessages.add(eventId); p.deletedMessages.add(eventId);
await p.client.sendDelete(conversation.id, eventId.split(";")[0]); await p.client.sendDelete(conversation.id, eventId);
} }
public async handleMatrixImage(room: IRemoteRoom, data: IFileEvent) { public async handleMatrixImage(room: IRemoteRoom, data: IFileEvent) {
@ -523,7 +522,7 @@ export class Skype {
const eventId = ret && ret.MessageId; const eventId = ret && ret.MessageId;
this.messageDeduplicator.unlock(dedupeKey, p.client.username, eventId); this.messageDeduplicator.unlock(dedupeKey, p.client.username, eventId);
if (eventId) { if (eventId) {
await this.puppet.eventSync.insert(room.puppetId, data.eventId!, `${eventId};${room.roomId}`); await this.puppet.eventSync.insert(room.puppetId, data.eventId!, eventId);
} }
} }
@ -579,7 +578,7 @@ export class Skype {
const messageid = quote.attr("messageid"); const messageid = quote.attr("messageid");
if (messageid) { if (messageid) {
const sendQuoteMsg = this.skypeMessageParser.parse(msg, { noQuotes: true }); const sendQuoteMsg = this.skypeMessageParser.parse(msg, { noQuotes: true });
await this.puppet.sendReply(params, `${messageid};${params.room.roomId}`, sendQuoteMsg); await this.puppet.sendReply(params, messageid, sendQuoteMsg);
return; return;
} }
} }
@ -636,12 +635,12 @@ export class Skype {
sendMsg.emote = true; sendMsg.emote = true;
} }
if (resource.content) { if (resource.content) {
await this.puppet.sendEdit(params, `${resource.id};${params.room.roomId}`, sendMsg); await this.puppet.sendEdit(params, resource.id, sendMsg);
} else if (p.deletedMessages.has(`${resource.id};${params.room.roomId}`)) { } else if (p.deletedMessages.has(resource.id)) {
log.silly("normal message redact dedupe"); log.silly("normal message redact dedupe");
return; return;
} else { } else {
await this.puppet.sendRedact(params, `${resource.id};${params.room.roomId}`); await this.puppet.sendRedact(params, resource.id);
} }
} }