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

Fix forwarded name from main channel

Browse Source 
Fix peer subtitle in chat list
This commit is contained in:
morethanwords 2020-10-15 12:37:03 +03:00
parent d91b97bc02
commit 1d668b3d1b
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/lib/appManagers/appDialogsManager.ts
View File

@ -693,15 +693,16 @@ export class AppDialogsManager {
/* if(lastMessage.from_id == auth.id) { // You: */
if(peer._ != 'peerUser' && peerID != lastMessage.fromID) {
let sender = appUsersManager.getUser(lastMessage.fromID);
const sender = appPeersManager.getPeer(lastMessage.fromID);
if(sender && sender.id) {
let senderBold = document.createElement('b');
const senderBold = document.createElement('b');
let str = '';
if(sender.id == $rootScope.myID) {
str = 'You';
} else {
str = sender.first_name || sender.last_name || sender.username;
//str = sender.first_name || sender.last_name || sender.username;
str = appPeersManager.getPeerTitle(lastMessage.fromID, true, true);
}
//senderBold.innerText = str + ': ';

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

@ -2168,7 +2168,7 @@ export class AppImManager {
if((this.peerID < 0 && !our) || message.fwd_from || message.reply_to_mid) { // chat
let title = appPeersManager.getPeerTitle(message.fwdFromID || message.fromID);
const isForwardFromChannel = !message.fromID && message.fwd_from;
const isForwardFromChannel = message.from_id && message.from_id._ == 'peerChannel' && message.fromID == message.fwdFromID;
let isHidden = message.fwd_from && !message.fwd_from.from_id && !message.fwd_from.channel_id;
if(isHidden) {
@ -2181,7 +2181,7 @@ export class AppImManager {
//this.log(title);
if((message.fwdFromID || message.fwd_from)) {
if(this.peerID != this.myID) {
if(this.peerID != this.myID && !isForwardFromChannel) {
bubble.classList.add('forwarded');
}

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

@ -2243,7 +2243,7 @@ export class AppMessagesManager {
const fwdHeader = apiMessage.fwd_from;
if(fwdHeader) {
if(peerID == myID) {
//if(peerID == myID) {
if(fwdHeader.saved_from_peer && fwdHeader.saved_from_msg_id) {
const savedFromPeerID = appPeersManager.getPeerID(fwdHeader.saved_from_peer);
const savedFromMid = appMessagesIDsManager.getFullMessageID(fwdHeader.saved_from_msg_id,
@ -2252,9 +2252,9 @@ export class AppMessagesManager {
}
apiMessage.fromID = fwdHeader.channel_id ? -fwdHeader.channel_id : appPeersManager.getPeerID(fwdHeader.from_id);
} else {
/* } else {
apiMessage.fwdPostID = fwdHeader.channel_post;
}
} */
apiMessage.fwdFromID = fwdHeader.channel_id ? -fwdHeader.channel_id : appPeersManager.getPeerID(fwdHeader.from_id);