Some fixes
This commit is contained in:
parent
f17e88cccb
commit
42285dde02
@ -781,41 +781,18 @@ export default class ChatTopbar {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
} else if(this.chat.type === 'scheduled') {
|
} else if(this.chat.type === 'scheduled') {
|
||||||
if(peerId === rootScope.myId) {
|
titleEl = i18n(peerId === rootScope.myId ? 'Reminders' : 'ScheduledMessages');
|
||||||
//title = [count > 1 ? count : false, 'Reminders'].filter(Boolean).join(' ');
|
|
||||||
titleEl = i18n('Reminders');
|
|
||||||
} else {
|
|
||||||
titleEl = i18n('ScheduledMessages');
|
|
||||||
//title = [count > 1 ? count : false, 'Scheduled Messages'].filter(Boolean).join(' ');
|
|
||||||
}
|
|
||||||
|
|
||||||
if(count === undefined) {
|
|
||||||
this.managers.appMessagesManager.getScheduledMessages(peerId).then((mids) => {
|
|
||||||
if(!middleware()) return;
|
|
||||||
this.setTitle(mids.length);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
} else if(this.chat.type === 'discussion') {
|
} else if(this.chat.type === 'discussion') {
|
||||||
|
if(count === undefined) {
|
||||||
|
const result = await this.managers.acknowledged.appMessagesManager.getHistory(peerId, 0, 1, 0, this.chat.threadId);
|
||||||
|
if(result.cached) {
|
||||||
|
const historyResult = await result.result;
|
||||||
|
count = historyResult.count;
|
||||||
|
} else result.result.then((historyResult) => this.setTitle(historyResult.count));
|
||||||
|
}
|
||||||
|
|
||||||
if(count === undefined) titleEl = i18n('Loading');
|
if(count === undefined) titleEl = i18n('Loading');
|
||||||
else titleEl = i18n('Chat.Title.Comments', [count]);
|
else titleEl = i18n('Chat.Title.Comments', [count]);
|
||||||
|
|
||||||
if(count === undefined) {
|
|
||||||
Promise.all([
|
|
||||||
this.managers.appMessagesManager.getHistory(peerId, 0, 1, 0, this.chat.threadId),
|
|
||||||
Promise.resolve()
|
|
||||||
]).then(([historyResult]) => {
|
|
||||||
if(!middleware()) return;
|
|
||||||
const count = historyResult?.count;
|
|
||||||
if(typeof(count) !== 'number') {
|
|
||||||
setTimeout(() => {
|
|
||||||
if(!middleware()) return;
|
|
||||||
this.setTitle();
|
|
||||||
}, 30);
|
|
||||||
} else {
|
|
||||||
this.setTitle(count);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
} else if(this.chat.type === 'chat') {
|
} else if(this.chat.type === 'chat') {
|
||||||
[titleEl, icons] = await Promise.all([
|
[titleEl, icons] = await Promise.all([
|
||||||
wrapPeerTitle({
|
wrapPeerTitle({
|
||||||
|
@ -1495,8 +1495,10 @@ export class AppDialogsManager {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const peerId = elem.dataset.peerId.toPeerId();
|
||||||
|
|
||||||
if(e.ctrlKey || e.metaKey) {
|
if(e.ctrlKey || e.metaKey) {
|
||||||
window.open((elem as HTMLAnchorElement).href, '_blank');
|
window.open((elem as HTMLAnchorElement).href || ('#' + peerId), '_blank');
|
||||||
cancelEvent(e);
|
cancelEvent(e);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -1517,7 +1519,6 @@ export class AppDialogsManager {
|
|||||||
if(elem) {
|
if(elem) {
|
||||||
if(onFound) onFound();
|
if(onFound) onFound();
|
||||||
|
|
||||||
const peerId = elem.dataset.peerId.toPeerId();
|
|
||||||
const lastMsgId = +elem.dataset.mid || undefined;
|
const lastMsgId = +elem.dataset.mid || undefined;
|
||||||
|
|
||||||
setPeerFunc({
|
setPeerFunc({
|
||||||
|
Loading…
x
Reference in New Issue
Block a user