@ -4,7 +4,7 @@ import { tsNow } from "../../helpers/date";
import { copy , defineNotNumerableProperties , getObjectKeysAndSort } from "../../helpers/object" ; import { copy , defineNotNumerableProperties , getObjectKeysAndSort } from "../../helpers/object" ;
import { randomLong } from "../../helpers/random" ; import { randomLong } from "../../helpers/random" ;
import { splitStringByLength , limitSymbols } from "../../helpers/string" ; import { splitStringByLength , limitSymbols } from "../../helpers/string" ;
import { Dialog as MTDialog , DialogPeer , DocumentAttribute , InputMedia , InputMessage , InputNotifyPeer , InputPeerNotifySettings , InputSingleMedia , Message , MessageAction , MessageEntity , MessagesDialogs , MessagesFilter , MessagesMessages , MessagesPeerDialogs , MethodDeclMap , NotifyPeer , PhotoSize , SendMessageAction , Update } from "../../layer" ; import { Dialog as MTDialog , DialogPeer , DocumentAttribute , InputMedia , InputMessage , InputNotifyPeer , InputPeerNotifySettings , InputSingleMedia , Message , MessageAction , MessageEntity , MessageReplyHeader , Message sDialogs , MessagesFilter , MessagesMessages , MessagesPeerDialogs , MethodDeclMap , NotifyPeer , PhotoSize , SendMessageAction , Update } from "../../layer" ;
import { InvokeApiOptions } from "../../types" ; import { InvokeApiOptions } from "../../types" ;
import { langPack } from "../langPack" ; import { langPack } from "../langPack" ;
import { logger , LogLevels } from "../logger" ; import { logger , LogLevels } from "../logger" ;
@ -43,8 +43,11 @@ export type HistoryStorage = {
history : number [ ] , history : number [ ] ,
pending : number [ ] , pending : number [ ] ,
maxId? : number ,
readPromise? : Promise < boolean > , readPromise? : Promise < boolean > ,
readMaxId? : number , readMaxId? : number ,
readOutboxMaxId? : number ,
maxOutId? : number , maxOutId? : number ,
reply_markup? : any reply_markup? : any
} ; } ;
@ -89,6 +92,11 @@ export class AppMessagesManager {
public historiesStorage : { public historiesStorage : {
[ peerId : string ] : HistoryStorage [ peerId : string ] : HistoryStorage
} = { } ; } = { } ;
public threadsStorage : {
[ peerId : string ] : {
[ threadId : string ] : HistoryStorage
}
} = { } ;
public searchesStorage : { public searchesStorage : {
[ peerId : string ] : Partial < { [ peerId : string ] : Partial < {
[ inputFilter in MyInputMessagesFilter ] : { [ inputFilter in MyInputMessagesFilter ] : {
@ -386,6 +394,7 @@ export class AppMessagesManager {
public sendText ( peerId : number , text : string , options : Partial < { public sendText ( peerId : number , text : string , options : Partial < {
entities : any [ ] , entities : any [ ] ,
replyToMsgId : number , replyToMsgId : number ,
threadId : number ,
viaBotId : number , viaBotId : number ,
queryId : string , queryId : string ,
resultId : string , resultId : string ,
@ -462,7 +471,7 @@ export class AppMessagesManager {
date : options.scheduleDate || ( tsNow ( true ) + serverTimeManager . serverTimeOffset ) , date : options.scheduleDate || ( tsNow ( true ) + serverTimeManager . serverTimeOffset ) ,
message : text , message : text ,
random_id : randomIdS , random_id : randomIdS ,
reply_to : { reply_to_msg_id : replyToMsgId } , reply_to : this.generateReplyHeader ( options . replyToMsgId , options . threadId ) ,
via_bot_id : options.viaBotId , via_bot_id : options.viaBotId ,
reply_markup : options.reply_markup , reply_markup : options.reply_markup ,
entities : entities , entities : entities ,
@ -579,6 +588,7 @@ export class AppMessagesManager {
isMedia : true , isMedia : true ,
replyToMsgId : number , replyToMsgId : number ,
threadId : number ,
caption : string , caption : string ,
entities : MessageEntity [ ] , entities : MessageEntity [ ] ,
width : number , width : number ,
@ -785,7 +795,7 @@ export class AppMessagesManager {
document : file document : file
} : media , } : media ,
random_id : randomIdS , random_id : randomIdS ,
reply_to : { reply_to_msg_id : replyToMsgId } , reply_to : this.generateReplyHeader ( options . replyToMsgId , options . threadId ) ,
views : asChannel && 1 , views : asChannel && 1 ,
pending : true pending : true
} ; } ;
@ -923,6 +933,7 @@ export class AppMessagesManager {
isMedia : true , isMedia : true ,
entities : MessageEntity [ ] , entities : MessageEntity [ ] ,
replyToMsgId : number , replyToMsgId : number ,
threadId : number ,
caption : string , caption : string ,
sendFileDetails : Partial < { sendFileDetails : Partial < {
duration : number , duration : number ,
@ -958,13 +969,15 @@ export class AppMessagesManager {
isMedia : options.isMedia , isMedia : options.isMedia ,
scheduleDate : options.scheduleDate , scheduleDate : options.scheduleDate ,
silent : options.silent , silent : options.silent ,
replyToMsgId ,
threadId : options.threadId ,
. . . details . . . details
} ; } ;
if ( idx === 0 ) { if ( idx === 0 ) {
o . caption = caption ; o . caption = caption ;
o . entities = entities ; o . entities = entities ;
o . replyToMsgId = replyToMsgId ; //o.replyToMsgId = replyToMsgId;
} }
return this . sendFile ( peerId , file , o ) . message ; return this . sendFile ( peerId , file , o ) . message ;
@ -1058,6 +1071,7 @@ export class AppMessagesManager {
public sendOther ( peerId : number , inputMedia : any , options : Partial < { public sendOther ( peerId : number , inputMedia : any , options : Partial < {
replyToMsgId : number , replyToMsgId : number ,
threadId : number ,
viaBotId : number , viaBotId : number ,
reply_markup : any , reply_markup : any ,
clearDraft : true , clearDraft : true ,
@ -1181,7 +1195,7 @@ export class AppMessagesManager {
message : '' , message : '' ,
media , media ,
random_id : randomIdS , random_id : randomIdS ,
reply_to : { reply_to_msg_id : replyToMsgId } , reply_to : this.generateReplyHeader ( options . replyToMsgId , options . threadId ) ,
via_bot_id : options.viaBotId , via_bot_id : options.viaBotId ,
reply_markup : options.reply_markup , reply_markup : options.reply_markup ,
views : asChannel && 1 , views : asChannel && 1 ,
@ -1299,6 +1313,19 @@ export class AppMessagesManager {
} }
} }
private generateReplyHeader ( replyToMsgId : number , replyToTopId? : number ) {
const header = {
_ : 'messageReplyHeader' ,
reply_to_msg_id : replyToMsgId ,
} as MessageReplyHeader ;
if ( replyToTopId && replyToTopId !== replyToMsgId ) {
header . reply_to_top_id = replyToTopId ;
}
return header ;
}
private setDialogIndexByMessage ( dialog : MTDialog.dialog , message : MyMessage ) { private setDialogIndexByMessage ( dialog : MTDialog.dialog , message : MyMessage ) {
if ( ! dialog . pFlags . pinned || ! dialog . index ) { if ( ! dialog . pFlags . pinned || ! dialog . index ) {
dialog . index = this . dialogsStorage . generateDialogIndex ( message . date ) ; dialog . index = this . dialogsStorage . generateDialogIndex ( message . date ) ;
@ -1309,6 +1336,9 @@ export class AppMessagesManager {
const dialog = this . getDialogByPeerId ( message . peerId ) [ 0 ] ; const dialog = this . getDialogByPeerId ( message . peerId ) [ 0 ] ;
if ( dialog ) { if ( dialog ) {
dialog . top_message = message . mid ; dialog . top_message = message . mid ;
const historyStorage = this . getHistoryStorage ( message . peerId ) ;
historyStorage . maxId = message . mid ;
this . setDialogIndexByMessage ( dialog , message ) ; this . setDialogIndexByMessage ( dialog , message ) ;
@ -1436,6 +1466,11 @@ export class AppMessagesManager {
} ) ; } ) ;
} }
public isHistoryUnread ( peerId : number , threadId? : number ) {
const historyStorage = this . getHistoryStorage ( peerId , threadId ) ;
return ( peerId > 0 ? Math . max ( historyStorage . readMaxId , historyStorage . readOutboxMaxId ) : historyStorage . readMaxId ) < historyStorage . maxId ;
}
public getTopMessages ( limit : number , folderId : number ) : Promise < number > { public getTopMessages ( limit : number , folderId : number ) : Promise < number > {
const dialogs = this . dialogsStorage . getFolder ( folderId ) ; const dialogs = this . dialogsStorage . getFolder ( folderId ) ;
let offsetId = 0 ; let offsetId = 0 ;
@ -1492,7 +1527,7 @@ export class AppMessagesManager {
( dialogsResult . dialogs as Dialog [ ] ) . forEachReverse ( dialog = > { ( dialogsResult . dialogs as Dialog [ ] ) . forEachReverse ( dialog = > {
//const d = Object.assign({}, dialog);
//const d = Object.assign({}, dialog);
// ! нужно передавать folderId, так как по папке != 0 нет свойства folder_id
// ! нужно передавать folderId, так как по папке != 0 нет свойства folder_id
this . saveConversation ( dialog , folderId ) ; this . saveConversation ( dialog , dialog . folder_id ? ? folderId ) ;
/ * i f ( d i a l o g . p e e r I d = = - 1 2 1 3 5 1 1 2 9 4 ) { / * i f ( d i a l o g . p e e r I d = = - 1 2 1 3 5 1 1 2 9 4 ) {
this . log . error ( 'lun bot' , folderId , d ) ; this . log . error ( 'lun bot' , folderId , d ) ;
@ -1505,9 +1540,11 @@ export class AppMessagesManager {
// ! это может случиться, если запрос идёт не по папке 0, а по 1. почему-то read'ов нет
// ! это может случиться, если запрос идёт не по папке 0, а по 1. почему-то read'ов нет
// ! в итоге, чтобы получить 1 диалог, делается первый запрос по папке 0, потом запрос для архивных по папке 1, и потом ещё перезагрузка архивного диалога
// ! в итоге, чтобы получить 1 диалог, делается первый запрос по папке 0, потом запрос для архивных по папке 1, и потом ещё перезагрузка архивного диалога
if ( ! dialog . read_inbox_max_id && ! dialog . read_outbox_max_id ) { if ( ! this . getLocalMessageId ( dialog . read_inbox_max_id ) && ! this . getLocalMessageId ( dialog . read_outbox_max_id ) ) {
noIdsDialogs [ dialog . peerId ] = dialog ; noIdsDialogs [ dialog . peerId ] = dialog ;
this . log . error ( 'noIdsDialogs' , dialog ) ;
/ * i f ( d i a l o g . p e e r I d = = - 1 2 1 3 5 1 1 2 9 4 ) { / * i f ( d i a l o g . p e e r I d = = - 1 2 1 3 5 1 1 2 9 4 ) {
this . log . error ( 'lun bot' , folderId ) ; this . log . error ( 'lun bot' , folderId ) ;
} * / } * /
@ -1622,7 +1659,7 @@ export class AppMessagesManager {
public getMessageById ( messageId : number ) { public getMessageById ( messageId : number ) {
for ( const peerId in this . messagesStorageByPeerId ) { for ( const peerId in this . messagesStorageByPeerId ) {
if ( appPeersManager . isChannel ( - + peerId ) ) { if ( appPeersManager . isChannel ( + peerId ) ) {
continue ; continue ;
} }
@ -1849,7 +1886,7 @@ export class AppMessagesManager {
public generateMessageId ( messageId : number , temp = false ) { public generateMessageId ( messageId : number , temp = false ) {
const q = 0xFFFFFFFF ; const q = 0xFFFFFFFF ;
const num = temp ? ++ this . tempNum : 0 ; const num = temp ? ++ this . tempNum : 0 ;
if ( messageId > q ) { if ( messageId >= q ) {
if ( temp ) { if ( temp ) {
return messageId + ( num & 0xFFFF ) ; return messageId + ( num & 0xFFFF ) ;
} }
@ -1865,7 +1902,7 @@ export class AppMessagesManager {
* / * /
public getLocalMessageId ( messageId : number ) { public getLocalMessageId ( messageId : number ) {
const q = 0xFFFFFFFF ; const q = 0xFFFFFFFF ;
if ( messageId < q ) { if ( messageId <= q ) {
return messageId ; return messageId ;
} }
@ -1928,9 +1965,17 @@ export class AppMessagesManager {
} }
// this.log(dT(), 'msg unread', mid, apiMessage.pFlags.out, dialog && dialog[apiMessage.pFlags.out ? 'read_outbox_max_id' : 'read_inbox_max_id'])
// this.log(dT(), 'msg unread', mid, apiMessage.pFlags.out, dialog && dialog[apiMessage.pFlags.out ? 'read_outbox_max_id' : 'read_inbox_max_id'])
if ( message . reply_to && message . reply_to . reply_to_msg_id ) { if ( message . reply_to ) {
//message.reply_to_mid = message.reply_to.reply_to_msg_id;
if ( message . reply_to . reply_to_msg_id ) {
message . reply_to_mid = this . generateMessageId ( message . reply_to . reply_to_msg_id ) ; message . reply_to . reply_to_msg_id = message . reply_to_mid = this . generateMessageId ( message . reply_to . reply_to_msg_id ) ;
}
if ( message . reply_to . reply_to_top_id ) message . reply_to . reply_to_top_id = this . generateMessageId ( message . reply_to . reply_to_top_id ) ;
}
if ( message . replies ) {
if ( message . replies . max_id ) message . replies . max_id = this . generateMessageId ( message . replies . max_id ) ;
if ( message . replies . read_max_id ) message . replies . read_max_id = this . generateMessageId ( message . replies . read_max_id ) ;
} }
const overwriting = ! ! message . peerId ; const overwriting = ! ! message . peerId ;
@ -1945,7 +1990,8 @@ export class AppMessagesManager {
if ( message . peerId == myId /* && !message.from_id && !message.fwd_from */ ) { if ( message . peerId == myId /* && !message.from_id && !message.fwd_from */ ) {
message . fromId = message . fwd_from ? ( message . fwd_from . from_id ? appPeersManager . getPeerId ( message . fwd_from . from_id ) : 0 ) : myId ; message . fromId = message . fwd_from ? ( message . fwd_from . from_id ? appPeersManager . getPeerId ( message . fwd_from . from_id ) : 0 ) : myId ;
} else { } else {
message . fromId = message . pFlags . post || ( ! message . pFlags . out && ! message . from_id ) ? peerId : appPeersManager.getPeerId ( message . from_id ) ; //message.fromId = message.pFlags.post || (!message.pFlags.out && !message.from_id) ? peerId : appPeersManager.getPeerId(message.from_id);
message . fromId = message . pFlags . post || ! message . from_id ? peerId : appPeersManager.getPeerId ( message . from_id ) ;
} }
const fwdHeader = message . fwd_from ; const fwdHeader = message . fwd_from ;
@ -2449,6 +2495,7 @@ export class AppMessagesManager {
if ( ! topMessage if ( ! topMessage
|| ( this . getMessageByPeer ( peerId , topPendingMessage ) as MyMessage ) . date > ( this . getMessageByPeer ( peerId , topMessage ) as MyMessage ) . date ) { || ( this . getMessageByPeer ( peerId , topPendingMessage ) as MyMessage ) . date > ( this . getMessageByPeer ( peerId , topMessage ) as MyMessage ) . date ) {
dialog . top_message = topMessage = topPendingMessage ; dialog . top_message = topMessage = topPendingMessage ;
this . getHistoryStorage ( peerId ) . maxId = topPendingMessage ;
} }
} }
@ -2546,14 +2593,15 @@ export class AppMessagesManager {
} }
} }
const wasDialogBefore = this . getDialogByPeerId ( peerId ) [ 0 ] ;
dialog . top_message = mid ; dialog . top_message = mid ;
dialog . read_inbox_max_id = this . generateMessageId ( dialog . read_inbox_max_id ) ; dialog . read_inbox_max_id = wasDialogBefore && ! dialog . read_inbox_max_id ? wasDialogBefore.read_inbox_max_id : this. generateMessageId( dialog . read_inbox_max_id ) ;
dialog . read_outbox_max_id = this . generateMessageId ( dialog . read_outbox_max_id ) ; dialog . read_outbox_max_id = wasDialogBefore && ! dialog . read_outbox_max_id ? wasDialogBefore.read_outbox_max_id : this. generateMessageId( dialog . read_outbox_max_id ) ;
if ( ! dialog . hasOwnProperty ( 'folder_id' ) ) { if ( ! dialog . hasOwnProperty ( 'folder_id' ) ) {
if ( dialog . _ == 'dialog' ) { if ( dialog . _ == 'dialog' ) {
// ! СЛОЖНО ! СМОТРИ В getTopMessages
// ! СЛОЖНО ! СМОТРИ В getTopMessages
const wasDialogBefore = this . getDialogByPeerId ( peerId ) [ 0 ] ;
dialog . folder_id = wasDialogBefore ? wasDialogBefore.folder_id : folderId ; dialog . folder_id = wasDialogBefore ? wasDialogBefore.folder_id : folderId ;
} / * else if ( dialog . _ == 'dialogFolder' ) { } / * else if ( dialog . _ == 'dialogFolder' ) {
dialog . folder_id = dialog . folder . id ; dialog . folder_id = dialog . folder . id ;
@ -2562,12 +2610,9 @@ export class AppMessagesManager {
dialog . peerId = peerId ; dialog . peerId = peerId ;
this . dialogsStorage . generateIndexForDialog ( dialog ) ;
this . dialogsStorage . pushDialog ( dialog , message . date ) ;
// Because we saved message without dialog present
// Because we saved message without dialog present
if ( message . m id > 0 ) { if ( mid > 0 ) {
if ( message . m id > dialog [ message . pFlags . out ? 'read_outbox_max_id' : 'read_inbox_max_id' ] ) message . pFlags . unread = true ; if ( mid > dialog [ message . pFlags . out ? 'read_outbox_max_id' : 'read_inbox_max_id' ] ) message . pFlags . unread = true ;
else delete message . pFlags . unread ; else delete message . pFlags . unread ;
} }
@ -2584,13 +2629,16 @@ export class AppMessagesManager {
historyStorage [ mid > 0 ? 'history' : 'pending' ] . push ( mid ) ; historyStorage [ mid > 0 ? 'history' : 'pending' ] . push ( mid ) ;
} }
historyStorage . maxId = mid ;
historyStorage . readMaxId = dialog . read_inbox_max_id ;
historyStorage . readOutboxMaxId = dialog . read_outbox_max_id ;
if ( channelId && dialog . pts ) { if ( channelId && dialog . pts ) {
apiUpdatesManager . addChannelState ( channelId , dialog . pts ) ; apiUpdatesManager . addChannelState ( channelId , dialog . pts ) ;
} }
//if(this.filtersStorage.inited) {
this . dialogsStorage . generateIndexForDialog ( dialog ) ;
//this.filtersStorage.processDialog(dialog);
this . dialogsStorage . pushDialog ( dialog , message . date ) ;
//}
} }
public mergeReplyKeyboard ( historyStorage : HistoryStorage , message : any ) { public mergeReplyKeyboard ( historyStorage : HistoryStorage , message : any ) {
@ -2679,9 +2727,24 @@ export class AppMessagesManager {
} ) ; } ) ;
} }
public getSearchNew ( { peerId , query , inputFilter , maxId , limit , offsetRate , backLimit , threadId } : {
peerId : number ,
maxId : number ,
limit? : number ,
offsetRate? : number ,
backLimit? : number ,
threadId? : number ,
query? : string ,
inputFilter ? : {
_ : MyInputMessagesFilter
} ,
} ) {
return this . getSearch ( peerId , query , inputFilter , maxId , limit , offsetRate , backLimit , threadId ) ;
}
public getSearch ( peerId = 0 , query : string = '' , inputFilter : { public getSearch ( peerId = 0 , query : string = '' , inputFilter : {
_ : MyInputMessagesFilter _ : MyInputMessagesFilter
} = { _ : 'inputMessagesFilterEmpty' } , maxId : number , limit = 20 , offsetRate = 0 , backLimit = 0 ) : Promise < { } = { _ : 'inputMessagesFilterEmpty' } , maxId : number , limit = 20 , offsetRate = 0 , backLimit = 0 , threadId = 0 ) : Promise < {
count : number , count : number ,
next_rate : number , next_rate : number ,
offset_id_offset : number , offset_id_offset : number ,
@ -2704,7 +2767,7 @@ export class AppMessagesManager {
} ; } ;
// * костыль для limit 1, если нужно и получить сообщение, и узнать количество сообщений
// * костыль для limit 1, если нужно и получить сообщение, и узнать количество сообщений
if ( peerId && ! backLimit && ! maxId && ! query && limit !== 1 /* && inputFilter._ !== 'inputMessagesFilterPinned' */ ) { if ( peerId && ! backLimit && ! maxId && ! query && limit !== 1 && ! threadId /* && inputFilter._ !== 'inputMessagesFilterPinned' */ ) {
storage = beta ? storage = beta ?
this . getSearchStorage ( peerId , inputFilter . _ ) : this . getSearchStorage ( peerId , inputFilter . _ ) :
this . getHistoryStorage ( peerId ) ; this . getHistoryStorage ( peerId ) ;
@ -2860,19 +2923,20 @@ export class AppMessagesManager {
add_offset : backLimit ? - backLimit : 0 , add_offset : backLimit ? - backLimit : 0 ,
max_id : 0 , max_id : 0 ,
min_id : 0 , min_id : 0 ,
hash : 0 hash : 0 ,
top_msg_id : threadId
} , { } , {
//timeout: APITIMEOUT,
//timeout: APITIMEOUT,
noErrorBox : true noErrorBox : true
} ) ; } ) ;
} else { } else {
var offsetDate = 0 ; //var offsetDate = 0;
var offsetPeerId = 0 ; let offsetPeerId = 0 ;
var offsetId = 0 ; let offsetId = 0 ;
var offsetMessage = maxId && this . getMessageByPeer ( peerId , maxId ) ; let offsetMessage = maxId && this . getMessageByPeer ( peerId , maxId ) ;
if ( offsetMessage && offsetMessage . date ) { if ( offsetMessage && offsetMessage . date ) {
offsetDate = offsetMessage . date + serverTimeManager . serverTimeOffset ; //offsetDate = offsetMessage.date + serverTimeManager.serverTimeOffset;
offsetId = offsetMessage . id ; offsetId = offsetMessage . id ;
offsetPeerId = this . getMessagePeer ( offsetMessage ) ; offsetPeerId = this . getMessagePeer ( offsetMessage ) ;
} }
@ -2885,7 +2949,7 @@ export class AppMessagesManager {
offset_rate : offsetRate , offset_rate : offsetRate ,
offset_peer : appPeersManager.getInputPeerById ( offsetPeerId ) , offset_peer : appPeersManager.getInputPeerById ( offsetPeerId ) ,
offset_id : offsetId , offset_id : offsetId ,
limit limit ,
} , { } , {
//timeout: APITIMEOUT,
//timeout: APITIMEOUT,
noErrorBox : true noErrorBox : true
@ -2930,6 +2994,25 @@ export class AppMessagesManager {
} ) ; } ) ;
} }
public getDiscussionMessage ( peerId : number , mid : number ) {
return apiManager . invokeApi ( 'messages.getDiscussionMessage' , {
peer : appPeersManager.getInputPeerById ( peerId ) ,
msg_id : this.getLocalMessageId ( mid )
} ) . then ( result = > {
appChatsManager . saveApiChats ( result . chats ) ;
appUsersManager . saveApiUsers ( result . users ) ;
this . saveMessages ( result . messages ) ;
const message = result . messages [ 0 ] as MyMessage ;
const historyStorage = this . getHistoryStorage ( message . peerId , message . mid ) ;
historyStorage . maxId = this . generateMessageId ( result . max_id ) || 0 ;
historyStorage . readMaxId = this . generateMessageId ( result . read_inbox_max_id ) || 0 ;
historyStorage . readOutboxMaxId = this . generateMessageId ( result . read_outbox_max_id ) || 0 ;
return result ;
} ) ;
}
handleNewMessages = ( ) = > { handleNewMessages = ( ) = > {
clearTimeout ( this . newMessagesHandlePromise ) ; clearTimeout ( this . newMessagesHandlePromise ) ;
this . newMessagesHandlePromise = 0 ; this . newMessagesHandlePromise = 0 ;
@ -2972,12 +3055,12 @@ export class AppMessagesManager {
} }
} }
public deleteMessages ( peerId : number , mids : number [ ] , revoke : boolean ) { public deleteMessages ( peerId : number , mids : number [ ] , revoke? : true ) {
let promise : Promise < any > ; let promise : Promise < any > ;
mids = mids . map ( mid = > this . getLocalMessageId ( mid ) ) ; mids = mids . map ( mid = > this . getLocalMessageId ( mid ) ) ;
if ( peerId < 0 && appPeersManager . isChannel ( - peerId ) ) { if ( peerId < 0 && appPeersManager . isChannel ( peerId ) ) {
const channelId = - peerId ; const channelId = - peerId ;
const channel = appChatsManager . getChat ( channelId ) ; const channel = appChatsManager . getChat ( channelId ) ;
if ( ! channel . pFlags . creator && ! ( channel . pFlags . editor && channel . pFlags . megagroup ) ) { if ( ! channel . pFlags . creator && ! ( channel . pFlags . editor && channel . pFlags . megagroup ) ) {
@ -3015,7 +3098,7 @@ export class AppMessagesManager {
} ) ; } ) ;
} else { } else {
promise = apiManager . invokeApi ( 'messages.deleteMessages' , { promise = apiManager . invokeApi ( 'messages.deleteMessages' , {
revoke : revoke || undefined , revoke ,
id : mids id : mids
} ) . then ( ( affectedMessages ) = > { } ) . then ( ( affectedMessages ) = > {
apiUpdatesManager . processUpdateMessage ( { apiUpdatesManager . processUpdateMessage ( {
@ -3035,24 +3118,10 @@ export class AppMessagesManager {
public readHistory ( peerId : number , maxId = 0 ) { public readHistory ( peerId : number , maxId = 0 ) {
// console.trace('start read')
// console.trace('start read')
if ( ! this . isHistoryUnread ( peerId ) ) return Promise . resolve ( true ) ;
const isChannel = appPeersManager . isChannel ( peerId ) ; const isChannel = appPeersManager . isChannel ( peerId ) ;
const historyStorage = this . getHistoryStorage ( peerId ) ; const historyStorage = this . getHistoryStorage ( peerId ) ;
const foundDialog = this . getDialogByPeerId ( peerId ) [ 0 ] ;
if ( ! foundDialog || ! foundDialog . unread_count ) {
if ( ! historyStorage . history . length ) {
return Promise . resolve ( false ) ;
}
let foundUnread = ! ! historyStorage . history . find ( messageId = > {
const message = this . getMessagesStorage ( peerId ) [ messageId ] ;
return message && ! message . pFlags . out && message . pFlags . unread ;
} ) ;
if ( ! foundUnread ) {
return Promise . resolve ( false ) ;
}
}
if ( ! historyStorage . readMaxId || maxId > historyStorage . readMaxId ) { if ( ! historyStorage . readMaxId || maxId > historyStorage . readMaxId ) {
historyStorage . readMaxId = maxId ; historyStorage . readMaxId = maxId ;
@ -3066,7 +3135,7 @@ export class AppMessagesManager {
if ( isChannel ) { if ( isChannel ) {
apiPromise = apiManager . invokeApi ( 'channels.readHistory' , { apiPromise = apiManager . invokeApi ( 'channels.readHistory' , {
channel : appChatsManager.getChannelInput ( - peerId ) , channel : appChatsManager.getChannelInput ( - peerId ) ,
max_id : maxId max_id : this.getLocalMessageId ( maxId )
} ) . then ( ( res ) = > { } ) . then ( ( res ) = > {
apiUpdatesManager . processUpdateMessage ( { apiUpdatesManager . processUpdateMessage ( {
_ : 'updateShort' , _ : 'updateShort' ,
@ -3082,7 +3151,7 @@ export class AppMessagesManager {
} else { } else {
apiPromise = apiManager . invokeApi ( 'messages.readHistory' , { apiPromise = apiManager . invokeApi ( 'messages.readHistory' , {
peer : appPeersManager.getInputPeerById ( peerId ) , peer : appPeersManager.getInputPeerById ( peerId ) ,
max_id : maxId max_id : this.getLocalMessageId ( maxId )
} ) . then ( ( affectedMessages ) = > { } ) . then ( ( affectedMessages ) = > {
apiUpdatesManager . processUpdateMessage ( { apiUpdatesManager . processUpdateMessage ( {
_ : 'updateShort' , _ : 'updateShort' ,
@ -3111,8 +3180,6 @@ export class AppMessagesManager {
if ( historyStorage . readMaxId > maxId ) { if ( historyStorage . readMaxId > maxId ) {
this . readHistory ( peerId , historyStorage . readMaxId ) ; this . readHistory ( peerId , historyStorage . readMaxId ) ;
} else {
delete historyStorage . readMaxId ;
} }
} ) ; } ) ;
@ -3152,7 +3219,13 @@ export class AppMessagesManager {
} }
} }
public getHistoryStorage ( peerId : number ) { public getHistoryStorage ( peerId : number , threadId? : number ) {
if ( threadId ) {
threadId = this . getLocalMessageId ( threadId ) ;
if ( ! this . threadsStorage [ peerId ] ) this . threadsStorage [ peerId ] = { } ;
return this . threadsStorage [ peerId ] [ threadId ] ? ? ( this . threadsStorage [ peerId ] [ threadId ] = { count : null , history : [ ] , pending : [ ] } ) ;
}
return this . historiesStorage [ peerId ] ? ? ( this . historiesStorage [ peerId ] = { count : null , history : [ ] , pending : [ ] } ) ; return this . historiesStorage [ peerId ] ? ? ( this . historiesStorage [ peerId ] = { count : null , history : [ ] , pending : [ ] } ) ;
} }
@ -3427,7 +3500,6 @@ export class AppMessagesManager {
case 'updateEditChannelMessage' : { case 'updateEditChannelMessage' : {
const message = update . message as MyMessage ; const message = update . message as MyMessage ;
const peerId = this . getMessagePeer ( message ) ; const peerId = this . getMessagePeer ( message ) ;
//const mid = message.id;
const mid = this . generateMessageId ( message . id ) ; const mid = this . generateMessageId ( message . id ) ;
const storage = this . getMessagesStorage ( peerId ) ; const storage = this . getMessagesStorage ( peerId ) ;
if ( storage [ mid ] === undefined ) { if ( storage [ mid ] === undefined ) {
@ -3456,22 +3528,7 @@ export class AppMessagesManager {
mid mid
} ) ; } ) ;
const groupId = ( message as Message . message ) . grouped_id ; if ( isTopMessage || ( message as Message . message ) . grouped_id ) {
/ * i f ( t h i s . p i n n e d M e s s a g e s S t o r a g e [ p e e r I d ] ) {
let pinnedMid : number ;
if ( groupId ) {
const mids = this . getMidsByAlbum ( groupId ) ;
pinnedMid = mids . find ( mid = > this . pinnedMessagesStorage [ peerId ] == mid ) ;
} else if ( this . pinnedMessagesStorage [ peerId ] == mid ) {
pinnedMid = mid ;
}
if ( pinnedMid ) {
rootScope . broadcast ( 'peer_pinned_message' , peerId ) ;
}
} * /
if ( isTopMessage || groupId ) {
const updatedDialogs : { [ peerId : number ] : Dialog } = { } ; const updatedDialogs : { [ peerId : number ] : Dialog } = { } ;
updatedDialogs [ peerId ] = dialog ; updatedDialogs [ peerId ] = dialog ;
rootScope . broadcast ( 'dialogs_multiupdate' , updatedDialogs ) ; rootScope . broadcast ( 'dialogs_multiupdate' , updatedDialogs ) ;
@ -3480,27 +3537,34 @@ export class AppMessagesManager {
break ; break ;
} }
case 'updateReadChannelDiscussionInbox' :
case 'updateReadChannelDiscussionOutbox' :
case 'updateReadHistoryInbox' : case 'updateReadHistoryInbox' :
case 'updateReadHistoryOutbox' : case 'updateReadHistoryOutbox' :
case 'updateReadChannelInbox' : case 'updateReadChannelInbox' :
case 'updateReadChannelOutbox' : { case 'updateReadChannelOutbox' : {
const channelId : number = ( update as Update . updateReadChannelInbox ) . channel_id ; const channelId = ( update as Update . updateReadChannelInbox ) . channel_id ;
//const maxId = update.max_id;
const maxId = this . generateMessageId ( ( update as Update . updateReadChannelInbox ) . max_id || ( update as Update . updateReadChannelDiscussionInbox ) . read_max_id ) ;
const max Id= this . generateMessageId ( update . max _id) ; const thread Id= this . generateMessageId ( ( update as Update . updateReadChannelDiscussionInbox ) . top_msg _id) ;
const peerId = channelId ? - channelId : appPeersManager.getPeerId ( ( update as Update . updateReadHistoryInbox ) . peer ) ; const peerId = channelId ? - channelId : appPeersManager.getPeerId ( ( update as Update . updateReadHistoryInbox ) . peer ) ;
const isOut = update . _ == 'updateReadHistoryOutbox' || update . _ == 'updateReadChannelOutbox' ? true : undefined ;
const isOut = update . _ === 'updateReadHistoryOutbox' || update . _ === 'updateReadChannelOutbox' || update . _ === 'updateReadChannelDiscussionOutbox' ? true : undefined ;
const storage = this . getMessagesStorage ( peerId ) ;
const history = getObjectKeysAndSort ( storage , 'desc' ) ;
const foundDialog = this . getDialogByPeerId ( peerId ) [ 0 ] ; const foundDialog = this . getDialogByPeerId ( peerId ) [ 0 ] ;
const history = getObjectKeysAndSort ( this . getMessagesStorage ( peerId ) , 'desc' ) ; const stillUnreadCount = ( update as Update . updateReadChannelInbox ) . still_unread_count ;
let newUnreadCount = 0 ; let newUnreadCount = 0 ;
let foundAffected = false ; let foundAffected = false ;
//this.log.warn(dT(), 'read', peerId, isOut ? 'out' : 'in', maxId)
//this.log.warn(dT(), 'read', peerId, isOut ? 'out' : 'in', maxId)
const historyStorage = this . getHistoryStorage ( peerId , threadId ) ;
if ( peerId > 0 && isOut ) { if ( peerId > 0 && isOut ) {
appUsersManager . forceUserOnline ( peerId ) ; appUsersManager . forceUserOnline ( peerId ) ;
} }
const storage = this . getMessagesStorage ( peerId ) ;
for ( let i = 0 , length = history . length ; i < length ; i ++ ) { for ( let i = 0 , length = history . length ; i < length ; i ++ ) {
const messageId = history [ i ] ; const messageId = history [ i ] ;
if ( messageId > maxId ) { if ( messageId > maxId ) {
@ -3508,9 +3572,6 @@ export class AppMessagesManager {
} }
const message = storage [ messageId ] ; const message = storage [ messageId ] ;
if ( ! message ) {
continue ;
}
if ( message . pFlags . out != isOut ) { if ( message . pFlags . out != isOut ) {
continue ; continue ;
@ -3519,6 +3580,13 @@ export class AppMessagesManager {
if ( ! message . pFlags . unread ) { if ( ! message . pFlags . unread ) {
break ; break ;
} }
if ( threadId ) {
const replyTo = message . reply_to as MessageReplyHeader ;
if ( ! replyTo || ( replyTo . reply_to_top_id || replyTo . reply_to_msg_id ) !== threadId ) {
continue ;
}
}
// this.log.warn('read', messageId, message.pFlags.unread, message)
// this.log.warn('read', messageId, message.pFlags.unread, message)
if ( message . pFlags . unread ) { if ( message . pFlags . unread ) {
@ -3527,28 +3595,30 @@ export class AppMessagesManager {
foundAffected = true ; foundAffected = true ;
} }
if ( ! message . pFlags . out ) { if ( ! message . pFlags . out && ! threadId && stillUnreadCount === undefined ) {
if ( foundDialog ) { newUnreadCount = -- foundDialog . unread_count ;
newUnreadCount = -- foundDialog . unread_count ;
}
//NotificationsManager.cancel('msg' + messageId); // warning
//NotificationsManager.cancel('msg' + messageId); // warning
} }
} }
} }
if ( foundDialog ) { if ( isOut ) historyStorage . readOutboxMaxId = maxId ;
if ( ! isOut && newUnreadCount && foundDialog . top_message <= maxId ) { else historyStorage . readMaxId = maxId ;
newUnreadCount = foundDialog . unread_count = 0 ;
}
foundDialog [ isOut ? 'read_outbox_max_id' : 'read_inbox_max_id' ] = maxId ; if ( ! threadId && foundDialog ) {
} if ( isOut ) foundDialog . read_outbox_max_id = maxId ;
else foundDialog . read_inbox_max_id = maxId ;
// need be commented for read out messages
if ( ! isOut ) {
//if(newUnreadCount != 0 || !isOut) { // fix 16.11.2019 (maybe not)
if ( newUnreadCount < 0 || ! this . isHistoryUnread ( peerId ) ) {
//////////this.log.warn(dT(), 'cnt', peerId, newUnreadCount, isOut, foundDialog, update, foundAffected);
foundDialog . unread_count = 0 ;
rootScope . broadcast ( 'dialog_unread' , { peerId , count : newUnreadCount } ) ; } else if ( newUnreadCount && foundDialog . top_message > maxId ) {
//}
foundDialog . unread_count = newUnreadCount ;
}
}
rootScope . broadcast ( 'dialog_unread' , { peerId } ) ;
}
if ( foundAffected ) { if ( foundAffected ) {
rootScope . broadcast ( 'messages_read' ) ; rootScope . broadcast ( 'messages_read' ) ;
@ -3625,10 +3695,7 @@ export class AppMessagesManager {
if ( historyUpdated . unread ) { if ( historyUpdated . unread ) {
foundDialog . unread_count -= historyUpdated . unread ; foundDialog . unread_count -= historyUpdated . unread ;
rootScope . broadcast ( 'dialog_unread' , { rootScope . broadcast ( 'dialog_unread' , { peerId } ) ;
peerId ,
count : foundDialog.unread_count
} ) ;
} }
if ( historyUpdated . msgs [ foundDialog . top_message ] ) { if ( historyUpdated . msgs [ foundDialog . top_message ] ) {
@ -4061,12 +4128,16 @@ export class AppMessagesManager {
} ) ; } ) ;
} }
public getHistory ( peerId : number , maxId = 0 , limit : number , backLimit? : number ) { public getHistory ( peerId : number , maxId = 0 , limit : number , backLimit? : number , threadId? : number ) {
if ( threadId ) {
threadId = this . getLocalMessageId ( threadId ) ;
}
if ( this . migratedFromTo [ peerId ] ) { if ( this . migratedFromTo [ peerId ] ) {
peerId = this . migratedFromTo [ peerId ] ; peerId = this . migratedFromTo [ peerId ] ;
} }
const historyStorage = this . getHistoryStorage ( peerId ) ; const historyStorage = this . getHistoryStorage ( peerId , threadId ) ;
const unreadOffset = 0 ; const unreadOffset = 0 ;
const unreadSkip = false ; const unreadSkip = false ;
@ -4126,7 +4197,7 @@ export class AppMessagesManager {
limit += backLimit ; limit += backLimit ;
} }
return this . requestHistory ( reqPeerId , maxId , limit , offset ) . then ( ( historyResult ) = > { return this . requestHistory ( reqPeerId , maxId , limit , offset , undefined , threadId ) . then ( ( historyResult ) = > {
historyStorage . count = ( historyResult as MessagesMessages . messagesMessagesSlice ) . count || historyResult . messages . length ; historyStorage . count = ( historyResult as MessagesMessages . messagesMessagesSlice ) . count || historyResult . messages . length ;
if ( isMigrated ) { if ( isMigrated ) {
historyStorage . count ++ ; historyStorage . count ++ ;
@ -4150,7 +4221,7 @@ export class AppMessagesManager {
} ) ; } ) ;
} }
return this . fillHistoryStorage ( peerId , maxId , limit , historyStorage ) . then ( ( ) = > { return this . fillHistoryStorage ( peerId , maxId , limit , historyStorage , threadId ) . then ( ( ) = > {
offset = 0 ; offset = 0 ;
if ( maxId > 0 ) { if ( maxId > 0 ) {
for ( offset = 0 ; offset < historyStorage . history . length ; offset ++ ) { for ( offset = 0 ; offset < historyStorage . history . length ; offset ++ ) {
@ -4174,10 +4245,10 @@ export class AppMessagesManager {
} ) ; } ) ;
} }
public fillHistoryStorage ( peerId : number , maxId : number , fullLimit : number , historyStorage : HistoryStorage ) : Promise < boolean > { public fillHistoryStorage ( peerId : number , maxId : number , fullLimit : number , historyStorage : HistoryStorage , threadId? : number ) : Promise < boolean > {
// this.log('fill history storage', peerId, maxId, fullLimit, angular.copy(historyStorage))
// this.log('fill history storage', peerId, maxId, fullLimit, angular.copy(historyStorage))
const offset = ( this . migratedFromTo [ peerId ] && ! maxId ) ? 1 : 0 ; const offset = ( this . migratedFromTo [ peerId ] && ! maxId ) ? 1 : 0 ;
return this . requestHistory ( peerId , maxId , fullLimit , offset ) . then ( ( historyResult ) = > { return this . requestHistory ( peerId , maxId , fullLimit , offset , undefined , threadId ) . then ( ( historyResult ) = > {
historyStorage . count = ( historyResult as MessagesMessages . messagesMessagesSlice ) . count || historyResult . messages . length ; historyStorage . count = ( historyResult as MessagesMessages . messagesMessagesSlice ) . count || historyResult . messages . length ;
if ( ! maxId && historyResult . messages . length ) { if ( ! maxId && historyResult . messages . length ) {
@ -4228,9 +4299,9 @@ export class AppMessagesManager {
} }
} }
return this . fillHistoryStorage ( peerId , maxId , fullLimit , historyStorage ) ; return this . fillHistoryStorage ( peerId , maxId , fullLimit , historyStorage , threadId ) ;
} else if ( totalCount < historyStorage . count ) { } else if ( totalCount < historyStorage . count ) {
return this . fillHistoryStorage ( peerId , maxId , fullLimit , historyStorage ) ; return this . fillHistoryStorage ( peerId , maxId , fullLimit , historyStorage , threadId ) ;
} }
} }
@ -4251,15 +4322,16 @@ export class AppMessagesManager {
return result ; return result ;
} }
public requestHistory ( peerId : number , maxId : number , limit = 0 , offset = 0 , offsetDate = 0 ) : Promise < Exclude < MessagesMessages , MessagesMessages.messagesMessagesNotModified > > { public requestHistory ( peerId : number , maxId : number , limit = 0 , offset = 0 , offsetDate = 0 , threadId = 0 ) : Promise < Exclude < MessagesMessages , MessagesMessages.messagesMessagesNotModified > > {
const isChannel = appPeersManager . isChannel ( peerId ) ; const isChannel = appPeersManager . isChannel ( peerId ) ;
//console.trace('requestHistory', peerId, maxId, limit, offset);
//console.trace('requestHistory', peerId, maxId, limit, offset);
//rootScope.broadcast('history_request');
//rootScope.broadcast('history_request');
const promise = apiManager . invokeApi ( 'messages.getHistory' , { const options = {
peer : appPeersManager.getInputPeerById ( peerId ) , peer : appPeersManager.getInputPeerById ( peerId ) ,
msg_id : threadId ,
offset_id : this.getLocalMessageId ( maxId ) || 0 , offset_id : this.getLocalMessageId ( maxId ) || 0 ,
offset_date : offsetDate , offset_date : offsetDate ,
add_offset : offset , add_offset : offset ,
@ -4267,18 +4339,16 @@ export class AppMessagesManager {
max_id : 0 , max_id : 0 ,
min_id : 0 , min_id : 0 ,
hash : 0 hash : 0
} , { } ;
const promise : ReturnType < AppMessagesManager [ ' requestHistory ' ] > = apiManager . invokeApi ( threadId ? 'messages.getReplies' : 'messages.getHistory' , options , {
//timeout: APITIMEOUT,
//timeout: APITIMEOUT,
noErrorBox : true noErrorBox : true
} ) as ReturnType < AppMessagesManager [ ' requestHistory ' ] > ; } ) as any ;
return promise . then ( ( historyResult ) = > { return promise . then ( ( historyResult ) = > {
this . log ( 'requestHistory result:' , peerId , historyResult , maxId , limit , offset ) ; this . log ( 'requestHistory result:' , peerId , historyResult , maxId , limit , offset ) ;
/ * i f ( h i s t o r y R e s u l t . _ = = ' m e s s a g e s . m e s s a g e s N o t M o d i f i e d ' ) {
return historyResult as any ;
} * /
appUsersManager . saveApiUsers ( historyResult . users ) ; appUsersManager . saveApiUsers ( historyResult . users ) ;
appChatsManager . saveApiChats ( historyResult . chats ) ; appChatsManager . saveApiChats ( historyResult . chats ) ;
this . saveMessages ( historyResult . messages ) ; this . saveMessages ( historyResult . messages ) ;
@ -4295,47 +4365,16 @@ export class AppMessagesManager {
} }
// will load more history if last message is album grouped (because it can be not last item)
// will load more history if last message is album grouped (because it can be not last item)
const historyStorage = this . getHistoryStorage ( peerId ) ; const historyStorage = this . getHistoryStorage ( peerId , threadId ) ;
// historyResult.messages: desc sorted
// historyResult.messages: desc sorted
if ( length && ( historyResult . messages [ length - 1 ] as Message . message ) . grouped_id if ( length && ( historyResult . messages [ length - 1 ] as Message . message ) . grouped_id
&& ( historyStorage . history . length + historyResult . messages . length ) < ( historyResult as MessagesMessages . messagesMessagesSlice ) . count ) { && ( historyStorage . history . length + historyResult . messages . length ) < ( historyResult as MessagesMessages . messagesMessagesSlice ) . count ) {
return this . requestHistory ( peerId , ( historyResult . messages [ length - 1 ] as Message . message ) . mid , 10 , 0 ) . then ( ( _historyResult ) = > { return this . requestHistory ( peerId , ( historyResult . messages [ length - 1 ] as Message . message ) . mid , 10 , 0 , offsetDate , threadId ) . then ( ( _historyResult ) = > {
return historyResult ; return historyResult ;
} ) ; } ) ;
} }
// don't need the intro now
/ * i f ( p e e r I d < 0 | | ! a p p U s e r s M a n a g e r . i s B o t ( p e e r I d ) | | ( l e n g t h = = l i m i t & & l i m i t < h i s t o r y R e s u l t . c o u n t ) ) {
return historyResult ;
} * /
return historyResult as any ; return historyResult as any ;
/ * r e t u r n a p p P r o f i l e M a n a g e r . g e t P r o f i l e ( p e e r I d ) . t h e n ( ( u s e r F u l l : a n y ) = > {
var description = userFull . bot_info && userFull . bot_info . description ;
if ( description ) {
var messageId = this . tempId -- ;
var message = {
_ : 'messageService' ,
id : messageId ,
from_id : peerId ,
peer_id : appPeersManager.getOutputPeer ( peerId ) ,
pFlags : { } ,
date : tsNow ( true ) + serverTimeManager . serverTimeOffset ,
action : {
_ : 'messageActionBotIntro' ,
description : description
}
}
this . saveMessages ( [ message ] ) ;
historyResult . messages . push ( message ) ;
if ( historyResult . count ) {
historyResult . count ++ ;
}
}
return historyResult ;
} ) ; * /
} , ( error ) = > { } , ( error ) = > {
switch ( error . type ) { switch ( error . type ) {
case 'CHANNEL_PRIVATE' : case 'CHANNEL_PRIVATE' :
Eduard Kuzmenko
4 years ago