toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replies count query (#6088)

Browse source
This commit is contained in:
Anurag Shivarathri 2022-03-24 18:29:10 +05:30 committed by GitHub
parent 80930477ff
commit aa4776a260
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/components/post_list/post/header/index.ts
View file

@ -8,7 +8,7 @@ import {map, switchMap} from 'rxjs/operators';
import {Preferences} from '@constants';
import {getPreferenceAsBool, getTeammateNameDisplaySetting} from '@helpers/api/preference';
import {queryPostsInThread} from '@queries/servers/post';
import {queryPostRepliesCount} from '@queries/servers/post';
import {queryPreferencesByCategoryAndName} from '@queries/servers/preference';
import {observeConfig, observeLicense} from '@queries/servers/system';
import {isMinimumServerVersion} from '@utils/helpers';
@ -37,7 +37,7 @@ const withHeaderProps = withObservables(
const teammateNameDisplay = combineLatest([preferences, config, license]).pipe(
map(([prefs, cfg, lcs]) => getTeammateNameDisplaySetting(prefs, cfg, lcs)),
);
const commentCount = queryPostsInThread(database, post.rootId || post.id).observeCount();
const commentCount = queryPostRepliesCount(database, post.rootId || post.id).observeCount();
const rootPostAuthor = differentThreadSequence ? post.root.observe().pipe(switchMap((root) => {
if (root.length) {
return root[0].author.observe();

4
app/components/post_list/thread_overview/index.ts
View file

@ -7,7 +7,7 @@ import {of as of$} from 'rxjs';
import {switchMap} from 'rxjs/operators';
import {Preferences} from '@constants';
import {observePost, queryPostsInThread} from '@queries/servers/post';
import {observePost, queryPostRepliesCount} from '@queries/servers/post';
import {queryPreferencesByCategoryAndName} from '@queries/servers/preference';
import ThreadOverview from './thread_overview';
@ -24,7 +24,7 @@ const enhanced = withObservables(
pipe(
switchMap((pref) => of$(Boolean(pref[0]?.value === 'true'))),
),
repliesCount: queryPostsInThread(database, rootId).observeCount(),
repliesCount: queryPostRepliesCount(database, rootId).observeCount(false),
};
});

8
app/queries/servers/post.ts
View file

@ -75,6 +75,14 @@ export const queryPostsInThread = (database: Database, rootId: string, sorted =
return database.get<PostsInThreadModel>(POSTS_IN_THREAD).query(...clauses);
};
export const queryPostRepliesCount = (database: Database, rootId: string, excludeDeleted = true) => {
const clauses: Q.Clause[] = [Q.where('root_id', rootId)];
if (excludeDeleted) {
clauses.push(Q.where('delete_at', Q.eq(0)));
}
return database.get(POST).query(...clauses);
};
export const getRecentPostsInThread = async (database: Database, rootId: string) => {
const chunks = await queryPostsInThread(database, rootId, true, true).fetch();
if (chunks.length) {