MrBesen/tweb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed travel by message id (search by date)

Browse Source
This commit is contained in:
morethanwords 2020-08-19 18:26:19 +03:00
parent f9e7fab227
commit 0406bd18e4
5 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -929,7 +929,7 @@ export class AppDialogsManager {
}
}
if(lastMessage._ == 'messageEmpty') {
if(lastMessage._ == 'messageEmpty' || (lastMessage._ == 'messageService' && !lastMessage.rReply)) {
dom.lastMessageSpan.innerHTML = '';
dom.lastTimeSpan.innerHTML = '';
delete dom.listEl.dataset.mid;

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

@ -1,6 +1,6 @@
//import apiManager from '../mtproto/apiManager';
import apiManager from '../mtproto/mtprotoworker';
import { $rootScope, numberWithCommas, findUpClassName, formatNumber, placeCaretAtEnd, findUpTag, langPack, whichChild, cancelEvent } from "../utils";
import { $rootScope, numberWithCommas, findUpClassName, formatNumber, placeCaretAtEnd, findUpTag, langPack, whichChild, cancelEvent, getObjectKeysAndSort } from "../utils";
import appUsersManager from "./appUsersManager";
import appMessagesManager, { Dialog } from "./appMessagesManager";
import appPeersManager from "./appPeersManager";
@ -44,8 +44,6 @@ appSidebarLeft; // just to include
const testScroll = false;
const IGNOREACTIONS = ['messageActionChannelMigrateFrom'];
class ChatContextMenu {
private element = document.getElementById('bubble-contextmenu') as HTMLDivElement;
private buttons: {
@ -671,7 +669,7 @@ export class AppImManager {
// set new mids to album items for mediaViewer
if(message.grouped_id) {
let items = bubble.querySelectorAll('.album-item');
let groupIDs = Object.keys(appMessagesManager.groupedMessagesStorage[message.grouped_id]).map(i => +i).sort((a, b) => a - b);
let groupIDs = getObjectKeysAndSort(appMessagesManager.groupedMessagesStorage[message.grouped_id]);
(Array.from(items) as HTMLElement[]).forEach((item, idx) => {
item.dataset.mid = '' + groupIDs[idx];
});
@ -1392,6 +1390,13 @@ export class AppImManager {
////console.timeEnd('appImManager cleanup');
}
private findMountedBubbleByMsgID(mid: number) {
return this.bubbles[getObjectKeysAndSort(this.bubbles).find(id => {
if(id < mid) return false;
return !!this.bubbles[id]?.parentElement;
})];
}
public setPeer(peerID: number, lastMsgID?: number) {
//console.time('appImManager setPeer');
@ -1434,8 +1439,9 @@ export class AppImManager {
if(samePeer) {
if(this.bubbles[lastMsgID]) {
if(isTarget) {
this.scrollable.scrollIntoView(this.bubbles[lastMsgID]);
this.highlightBubble(this.bubbles[lastMsgID]);
const bubble = this.findMountedBubbleByMsgID(lastMsgID);
this.scrollable.scrollIntoView(bubble);
this.highlightBubble(bubble);
} else if(dialog && lastMsgID == topMessage) {
this.log('will scroll down', this.scroll.scrollTop, this.scroll.scrollHeight);
this.scroll.scrollTop = this.scroll.scrollHeight;
@ -1545,7 +1551,10 @@ export class AppImManager {
this.scrollable.scrollTop = this.scrollable.scrollHeight;
}
const bubble = forwardingUnread ? (this.firstUnreadBubble || this.bubbles[lastMsgID]) : this.bubbles[lastMsgID];
let bubble: HTMLElement = forwardingUnread ? (this.firstUnreadBubble || this.bubbles[lastMsgID]) : this.bubbles[lastMsgID];
if(!bubble?.parentElement) {
bubble = this.findMountedBubbleByMsgID(lastMsgID);
}
this.scrollable.scrollIntoView(bubble, samePeer/* , fromUp */);
if(!forwardingUnread) {
@ -1722,7 +1731,7 @@ export class AppImManager {
}
}
public highlightBubble(element: HTMLDivElement) {
public highlightBubble(element: HTMLElement) {
if(element.dataset.timeout) {
clearTimeout(+element.dataset.timeout);
element.classList.remove('is-selected');
@ -1933,7 +1942,7 @@ export class AppImManager {
if(message._ == 'messageService') {
let action = message.action;
let _ = action._;
if(IGNOREACTIONS.indexOf(_) !== -1) {
if(langPack.hasOwnProperty(_) && !langPack[_]) {
return bubble;
}
@ -2823,7 +2832,7 @@ export class AppImManager {
let ids: number[];
if((reverse && this.loadedTopTimes > 2) || (!reverse && this.loadedBottomTimes > 2)) {
ids = Object.keys(this.bubbles).map(i => +i).sort((a, b) => a - b);
ids = getObjectKeysAndSort(this.bubbles);
}
//let removeCount = loadCount / 2;

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

@ -2389,7 +2389,7 @@ export class AppMessagesManager {
break;
case 'messageActionHistoryClear':
apiMessage.deleted = true;
//apiMessage.deleted = true;
apiMessage.clear_history = true;
apiMessage.pFlags.out = false;
apiMessage.pFlags.unread = false;
@ -2505,7 +2505,7 @@ export class AppMessagesManager {
//this.log('message action:', action);
messageText = '<i>' + str + '</i>';
messageText = str ? '<i>' + str + '</i>' : '';
}
let messageWrapped = '';

12
src/lib/utils.ts
View File

@ -222,7 +222,7 @@ export function generatePathData(x: number, y: number, width: number, height: nu
return data.join(' ');
};
export const langPack = {
export const langPack: {[actionType: string]: string} = {
"messageActionChatCreate": "created the group",
"messageActionChatEditTitle": "changed group name",
"messageActionChatEditPhoto": "changed group photo",
@ -240,7 +240,9 @@ export const langPack = {
"messageActionChannelEditTitle": "Channel renamed",
"messageActionChannelEditPhoto": "Channel photo updated",
"messageActionChannelDeletePhoto": "Channel photo removed",
"messageActionHistoryClear": "History cleared",
"messageActionHistoryClear": "",//"History cleared",
"messageActionChannelMigrateFrom": "",
"messageActionPhoneCall.in_ok": "Incoming Call",
"messageActionPhoneCall.out_ok": "Outgoing Call",
@ -311,6 +313,12 @@ export function findUpAttribute(el: any, attribute: string): HTMLElement {
return null;
}
export function getObjectKeysAndSort(object: any, sort: 'asc' | 'desc' = 'asc') {
const ids = Object.keys(object).map(i => +i);
if(sort == 'asc') return ids.sort((a, b) => a - b);
else return ids.sort((a, b) => b - a);
}
export function whichChild(elem: Node) {
let i = 0;
// @ts-ignore

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

@ -301,7 +301,7 @@ $bubble-margin: .25rem;
&:not(.sticker) .attachment {
padding-top: .5rem;
padding-bottom: 1.5rem;
max-width: fit-content!important;
//max-width: fit-content!important;
max-height: fit-content!important;
span.emoji {