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

Fix forward message fromID

Browse Source
This commit is contained in:
morethanwords 2020-10-17 00:08:16 +03:00
parent 69caa741e5
commit 1c6e90efa6
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2255,12 +2255,12 @@ export class AppMessagesManager {
apiMessage.savedFrom = savedFromPeerID + '_' + savedFromMid; apiMessage.savedFrom = savedFromPeerID + '_' + savedFromMid;
} }
apiMessage.fromID = fwdHeader.channel_id ? -fwdHeader.channel_id : appPeersManager.getPeerID(fwdHeader.from_id); apiMessage.fromID = appPeersManager.getPeerID(deepEqual(apiMessage.from_id, fwdHeader.from_id) ? fwdHeader.from_id : apiMessage.from_id);
/* } else { /* } else {
apiMessage.fwdPostID = fwdHeader.channel_post; apiMessage.fwdPostID = fwdHeader.channel_post;
} */ } */
apiMessage.fwdFromID = fwdHeader.channel_id ? -fwdHeader.channel_id : appPeersManager.getPeerID(fwdHeader.from_id); apiMessage.fwdFromID = appPeersManager.getPeerID(fwdHeader.from_id);
fwdHeader.date -= serverTimeManager.serverTimeOffset; fwdHeader.date -= serverTimeManager.serverTimeOffset;
} }

10
src/lib/richtextprocessor.ts
View File

@ -750,9 +750,9 @@ namespace RichTextProcessor {
var tgMeMatch; var tgMeMatch;
var telescoPeMatch; var telescoPeMatch;
if(unsafe == 2) { /* if(unsafe == 2) {
url = 'tg://unsafe_url?url=' + encodeURIComponent(url); url = 'tg://unsafe_url?url=' + encodeURIComponent(url);
} else if((tgMeMatch = url.match(/^https?:\/\/t(?:elegram)?\.me\/(.+)/))) { } else */if((tgMeMatch = url.match(/^https?:\/\/t(?:elegram)?\.me\/(.+)/))) {
var fullPath = tgMeMatch[1]; var fullPath = tgMeMatch[1];
var path = fullPath.split('/'); var path = fullPath.split('/');
switch(path[0]) { switch(path[0]) {
@ -788,9 +788,9 @@ namespace RichTextProcessor {
} }
} else if((telescoPeMatch = url.match(/^https?:\/\/telesco\.pe\/([^/?]+)\/(\d+)/))) { } else if((telescoPeMatch = url.match(/^https?:\/\/telesco\.pe\/([^/?]+)\/(\d+)/))) {
url = 'tg://resolve?domain=' + telescoPeMatch[1] + '&post=' + telescoPeMatch[2]; url = 'tg://resolve?domain=' + telescoPeMatch[1] + '&post=' + telescoPeMatch[2];
} else if(unsafe) { }/* else if(unsafe) {
//url = 'tg://unsafe_url?url=' + encodeURIComponent(url); url = 'tg://unsafe_url?url=' + encodeURIComponent(url);
} } */
return url; return url;
} }