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

Fix filling folders when reloading filters

Browse Source
This commit is contained in:
morethanwords 2021-10-21 20:40:45 +04:00
parent 2fb747c584
commit 42fc7ef557
5 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/helpers/object.ts
View File

@ -51,7 +51,7 @@ export function defineNotNumerableProperties<T extends any>(obj: T, names: (keyo
const props = {writable: true, configurable: true}; const props = {writable: true, configurable: true};
const out: {[name in keyof T]?: typeof props} = {}; const out: {[name in keyof T]?: typeof props} = {};
names.forEach(name => { names.forEach(name => {
if(obj[name] === undefined) { if(!obj.hasOwnProperty(name)) {
out[name] = props; out[name] = props;
} }
}); });

1
src/lib/appManagers/appStateManager.ts
View File

@ -26,6 +26,7 @@ import { nextRandomUint } from '../../helpers/random';
import compareVersion from '../../helpers/compareVersion'; import compareVersion from '../../helpers/compareVersion';
const REFRESH_EVERY = 24 * 60 * 60 * 1000; // 1 day const REFRESH_EVERY = 24 * 60 * 60 * 1000; // 1 day
// const REFRESH_EVERY = 1e3;
//const REFRESH_EVERY_WEEK = 24 * 60 * 60 * 1000 * 7; // 7 days //const REFRESH_EVERY_WEEK = 24 * 60 * 60 * 1000 * 7; // 7 days
const STATE_VERSION = App.versionFull; const STATE_VERSION = App.versionFull;
const BUILD = App.build; const BUILD = App.build;

1
src/lib/rootScope.ts
View File

@ -34,6 +34,7 @@ export type BroadcastEvents = {
'filter_delete': MyDialogFilter, 'filter_delete': MyDialogFilter,
'filter_update': MyDialogFilter, 'filter_update': MyDialogFilter,
'filter_new': MyDialogFilter,
'filter_order': number[], 'filter_order': number[],
'folder_unread': Folder, 'folder_unread': Folder,

7
src/lib/storages/dialogs.ts
View File

@ -94,12 +94,15 @@ export default class DialogsStorage {
} }
}); });
rootScope.addEventListener('filter_update', (filter) => { const onFilterUpdate = (filter: MyDialogFilter) => {
const dialogs = this.getCachedDialogs(false); const dialogs = this.getCachedDialogs(false);
for(let i = 0; i < dialogs.length; ++i) { for(let i = 0; i < dialogs.length; ++i) {
this.processDialogForFilter(dialogs[i], filter); this.processDialogForFilter(dialogs[i], filter);
} }
}); };
rootScope.addEventListener('filter_update', onFilterUpdate);
rootScope.addEventListener('filter_new', onFilterUpdate);
rootScope.addEventListener('filter_delete', (filter) => { rootScope.addEventListener('filter_delete', (filter) => {
delete this.folders[filter.id]; delete this.folders[filter.id];

11
src/lib/storages/filters.ts
View File

@ -303,16 +303,19 @@ export default class FiltersStorage {
filter.include_peers = filter.pinned_peers.concat(filter.include_peers); filter.include_peers = filter.pinned_peers.concat(filter.include_peers);
filter.includePeerIds = filter.pinnedPeerIds.concat(filter.includePeerIds); filter.includePeerIds = filter.pinnedPeerIds.concat(filter.includePeerIds);
if(this.filters[filter.id]) { const oldFilter = this.filters[filter.id];
Object.assign(this.filters[filter.id], filter); if(oldFilter) {
Object.assign(oldFilter, filter);
} else { } else {
this.filters[filter.id] = filter; this.filters[filter.id] = filter;
} }
this.setOrderIndex(filter); this.setOrderIndex(filter);
if(update) { if(update) {
this.rootScope.dispatchEvent('filter_update', filter); this.rootScope.dispatchEvent('filter_update', filter);
} else if(!oldFilter) {
this.rootScope.dispatchEvent('filter_new', filter);
} }
} }