SW/mattermost-mobile
2
0
Fork 0
forked from Ivasoft/mattermost-mobile
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Show permalink view with CRT enabled (#6343)

Browse Source
This commit is contained in:
Elias Nahum
2022-06-03 08:49:13 -04:00
committed by GitHub
parent df1da4da19
commit 834c81fd27
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/actions/remote/post.ts
View File

@@ -631,7 +631,7 @@ export async function fetchPostThread(serverUrl: string, postId: string, fetchOn
}
}
export async function fetchPostsAround(serverUrl: string, channelId: string, postId: string, perPage = General.POST_AROUND_CHUNK_SIZE) {
export async function fetchPostsAround(serverUrl: string, channelId: string, postId: string, perPage = General.POST_AROUND_CHUNK_SIZE, isCRTEnabled = false) {
const operator = DatabaseManager.serverDatabases[serverUrl]?.operator;
if (!operator) {
return {error: `${serverUrl} database not found`};
@@ -646,9 +646,9 @@ export async function fetchPostsAround(serverUrl: string, channelId: string, pos
try {
const [after, post, before] = await Promise.all<PostsObjectsRequest>([
client.getPostsAfter(channelId, postId, 0, perPage),
client.getPostThread(postId),
client.getPostsBefore(channelId, postId, 0, perPage),
client.getPostsAfter(channelId, postId, 0, perPage, isCRTEnabled, isCRTEnabled),
client.getPostThread(postId, isCRTEnabled, isCRTEnabled),
client.getPostsBefore(channelId, postId, 0, perPage, isCRTEnabled, isCRTEnabled),
]);
const preData: PostResponse = {
@@ -687,7 +687,6 @@ export async function fetchPostsAround(serverUrl: string, channelId: string, pos
models.push(...posts);
const isCRTEnabled = await getIsCRTEnabled(operator.database);
if (isCRTEnabled) {
const threadModels = await prepareThreadsFromReceivedPosts(operator, data.posts);
if (threadModels?.length) {

2
app/screens/permalink/index.ts
View File

@@ -7,6 +7,7 @@ import {of as of$} from 'rxjs';
import {switchMap} from 'rxjs/operators';
import {observePost} from '@queries/servers/post';
import {observeIsCRTEnabled} from '@queries/servers/thread';
import {WithDatabaseArgs} from '@typings/database/database';
import PostModel from '@typings/database/models/servers/post';
@@ -21,6 +22,7 @@ const enhance = withObservables([], ({database, postId}: OwnProps) => {
channel: post.pipe(
switchMap((p) => (p ? p.channel.observe() : of$(undefined))),
),
isCRTEnabled: observeIsCRTEnabled(database),
};
});

8
app/screens/permalink/permalink.tsx
View File

@@ -25,8 +25,9 @@ import type ChannelModel from '@typings/database/models/servers/channel';
import type PostModel from '@typings/database/models/servers/post';
type Props = {
postId: PostModel['id'];
channel?: ChannelModel;
isCRTEnabled: boolean;
postId: PostModel['id'];
}
const edges: Edge[] = ['left', 'right', 'top'];
@@ -118,7 +119,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => ({
},
}));
function Permalink({channel, postId}: Props) {
function Permalink({channel, isCRTEnabled, postId}: Props) {
const [posts, setPosts] = useState<PostModel[]>([]);
const [loading, setLoading] = useState(true);
const theme = useTheme();
@@ -133,7 +134,7 @@ function Permalink({channel, postId}: Props) {
useEffect(() => {
(async () => {
if (channel?.id) {
const data = await fetchPostsAround(serverUrl, channel.id, postId, 5);
const data = await fetchPostsAround(serverUrl, channel.id, postId, 5, isCRTEnabled);
if (data?.posts) {
setLoading(false);
setPosts(data.posts);
@@ -209,6 +210,7 @@ function Permalink({channel, postId}: Props) {
<View style={style.postList}>
<PostList
highlightedId={postId}
isCRTEnabled={isCRTEnabled}
posts={posts}
location={Screens.PERMALINK}
lastViewedAt={0}