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

Fix rendering discussion message

Browse Source 
Hide pinned close button in discussions
This commit is contained in:
Eduard Kuzmenko 2020-12-22 10:42:42 +02:00
parent 918e614e53
commit 7f8e9aa1bf
2 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/components/chat/bubbles.ts
View File

@ -2403,33 +2403,8 @@ export default class ChatBubbles {
public requestHistory(maxId: number, loadCount: number, backLimit: number) { public requestHistory(maxId: number, loadCount: number, backLimit: number) {
//const middleware = this.getMiddleware(); //const middleware = this.getMiddleware();
if(this.chat.type === 'chat') { if(this.chat.type === 'chat' || this.chat.type === 'discussion') {
return this.appMessagesManager.getHistory(this.peerId, maxId, loadCount, backLimit, this.chat.threadId); return this.appMessagesManager.getHistory(this.peerId, maxId, loadCount, backLimit, this.chat.threadId);
} else if(this.chat.type === 'discussion') {
const result = this.appMessagesManager.getHistory(this.peerId, maxId, loadCount, backLimit, this.chat.threadId);
const checkForStart = (historyResult: HistoryResult) => {
const topLoadCount = loadCount;
const isTopEnd = historyResult.offsetIdOffset >= (historyResult.count - topLoadCount);
this.log('discussion got history', loadCount, backLimit, historyResult, isTopEnd);
// * inject discussion start
if(isTopEnd) {
const serviceStartMessageId = this.appMessagesManager.threadsServiceMessagesIdsStorage[this.peerId + '_' + this.chat.threadId];
if(serviceStartMessageId) historyResult.history.push(serviceStartMessageId);
historyResult.history.push(this.chat.threadId);
this.scrolledAll = true;
}
};
if(result instanceof Promise) {
return result.then(result => {
checkForStart(result);
return result;
});
}
checkForStart(result);
return result;
} else if(this.chat.type === 'pinned') { } else if(this.chat.type === 'pinned') {
const promise = this.appMessagesManager.getSearch(this.peerId, '', {_: 'inputMessagesFilterPinned'}, maxId, loadCount, 0, backLimit) const promise = this.appMessagesManager.getSearch(this.peerId, '', {_: 'inputMessagesFilterPinned'}, maxId, loadCount, 0, backLimit)
.then(value => ({history: value.history.map(m => m.mid)})); .then(value => ({history: value.history.map(m => m.mid)}));
@ -2540,6 +2515,20 @@ export default class ChatBubbles {
return Promise.reject(); return Promise.reject();
} }
if(this.chat.type === 'discussion') {
const topLoadCount = loadCount;
const isTopEnd = result.offsetIdOffset >= (result.count - topLoadCount);
this.log('discussion got history', loadCount, backLimit, result, isTopEnd);
// * inject discussion start
if(isTopEnd) {
const serviceStartMessageId = this.appMessagesManager.threadsServiceMessagesIdsStorage[this.peerId + '_' + this.chat.threadId];
if(serviceStartMessageId) result.history.push(serviceStartMessageId);
result.history.push(this.chat.threadId);
this.scrolledAll = true;
}
}
////console.timeEnd('render history total'); ////console.timeEnd('render history total');
return this.performHistoryResult(result.history || [], reverse, isBackLimit, !isFirstMessageRender && additionMsgId); return this.performHistoryResult(result.history || [], reverse, isBackLimit, !isFirstMessageRender && additionMsgId);

6
src/scss/partials/_chatPinned.scss
View File

@ -393,6 +393,12 @@
display: none; display: none;
} }
} }
.chat.type-discussion & {
.pinned-container-close {
display: none !important;
}
}
} }
.pinned-audio { .pinned-audio {