r4sas/tweb-i2p
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Maybe fixed message fromID again

Browse Source
This commit is contained in:
morethanwords 2020-11-08 03:34:28 +02:00
parent 6a66f1b271
commit 56ce8020a9
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/lib/appManagers/appMessagesManager.ts
View File

@ -2285,8 +2285,8 @@ export class AppMessagesManager {
const myID = appUsersManager.getSelf().id; const myID = appUsersManager.getSelf().id;
message.peerID = peerID; message.peerID = peerID;
if(message.peerID == myID && !message.from_id && !message.fwd_from) { if(message.peerID == myID/* && !message.from_id && !message.fwd_from */) {
message.fromID = myID; message.fromID = message.fwd_from?.from_id ? appPeersManager.getPeerID(message.fwd_from.from_id) : myID;
} else { } else {
message.fromID = message.pFlags.post || (!message.pFlags.out && !message.from_id) ? peerID : appPeersManager.getPeerID(message.from_id); message.fromID = message.pFlags.post || (!message.pFlags.out && !message.from_id) ? peerID : appPeersManager.getPeerID(message.from_id);
} }
@ -2301,9 +2301,9 @@ export class AppMessagesManager {
message.savedFrom = savedFromPeerID + '_' + savedFromMid; message.savedFrom = savedFromPeerID + '_' + savedFromMid;
} }
if(peerID < 0 || peerID == myID) { /* if(peerID < 0 || peerID == myID) {
message.fromID = appPeersManager.getPeerID(!message.from_id || deepEqual(message.from_id, fwdHeader.from_id) ? fwdHeader.from_id : message.from_id); message.fromID = appPeersManager.getPeerID(!message.from_id || deepEqual(message.from_id, fwdHeader.from_id) ? fwdHeader.from_id : message.from_id);
} } */
/* } else { /* } else {
apiMessage.fwdPostID = fwdHeader.channel_post; apiMessage.fwdPostID = fwdHeader.channel_post;
} */ } */
@ -2466,10 +2466,10 @@ export class AppMessagesManager {
message.totalEntities = RichTextProcessor.mergeEntities(myEntities, apiEntities, !message.pending); message.totalEntities = RichTextProcessor.mergeEntities(myEntities, apiEntities, !message.pending);
} }
if(!options.isEdited) { //if(!options.isEdited) {
this.messagesStorage[mid] = message; this.messagesStorage[mid] = message;
(this.messagesStorageByPeerID[peerID] ?? (this.messagesStorageByPeerID[peerID] = {}))[mid] = message; (this.messagesStorageByPeerID[peerID] ?? (this.messagesStorageByPeerID[peerID] = {}))[mid] = message;
} //}
}); });
if(albums) { if(albums) {
@ -2543,11 +2543,11 @@ export class AppMessagesManager {
// * 80 for chatlist in landscape orientation // * 80 for chatlist in landscape orientation
text = limitSymbols(text, 75, 80); text = limitSymbols(text, 75, 80);
let entities = RichTextProcessor.parseEntities(text.replace(/\n/g, ' ')); const entities = RichTextProcessor.parseEntities(text.replace(/\n/g, ' '));
messageWrapped = RichTextProcessor.wrapRichText(text, { messageWrapped = RichTextProcessor.wrapRichText(text, {
noLinebreaks: true, noLinebreaks: true,
entities: entities, entities,
noLinks: true, noLinks: true,
noTextFormat: true noTextFormat: true
}); });
@ -3777,7 +3777,7 @@ export class AppMessagesManager {
} }
// console.trace(dT(), 'edit message', message) // console.trace(dT(), 'edit message', message)
this.saveMessages([message], {isEdited: true}); this.saveMessages([message]/* , {isEdited: true} */);
safeReplaceObject(this.messagesStorage[mid], message); safeReplaceObject(this.messagesStorage[mid], message);
const dialog = this.getDialogByPeerID(peerID)[0]; const dialog = this.getDialogByPeerID(peerID)[0];

4
src/scss/partials/_chatBubble.scss
View File

@ -813,8 +813,8 @@ $bubble-margin: .25rem;
font-size: 16px; font-size: 16px;
//padding: 0 .6rem .2675rem .6rem; //padding: 0 .6rem .2675rem .6rem;
padding: 0 .6rem 6px .6rem; padding: 0 .6rem 6px .6rem;
overflow: hidden; /* overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis; */
max-width: 100%; max-width: 100%;
color: #000; color: #000;
line-height: 21px; line-height: 21px;