mirror of
https://github.com/mattermost/mattermost-mobile.git
synced 2026-11-06 02:40:15 +00:00
* app fixes surfaced by detox RF migration Carve the app-side bug fixes from the migrate_RF_to_detox branch into their own PR. Includes: - NavigationStore.waitUntilScreenIsTop helper + matching switchToChannel / notification.test wiring (Screens.CHANNEL_LIST -> Screens.HOME) - Detox source build + null-guard patch for Android FabricUIManagerIdlingResources (android/settings.gradle, android/app/build.gradle, gradle.properties) - iOS Podfile: Alamofire 5.10 duplicate-allHeaders patch + stdlib embed for extensions - iOS Server screen: defer push-proxy verification alert past Navigation.push to fix iOS 26 race - Android NetworkClient: null-guard host extraction to prevent NPE on bad cert reports - ephemeral_store: track recently-unsaved saved posts with 2-min TTL - post_draft: filter undefined channel observable to prevent archived-banner flicker - queries/servers/thread: is_following nullish-coalesce to false - datetime: NaN guard for invalid scheduled-message timestamp (MM-T5720) - navigation: dismissBottomSheet handles GENERIC_BOTTOM_SHEET fallback - bottom_sheet: accessibilityViewIsModal for VoiceOver - calls websocket_client: extend interface for optional sendBinary - edit_profile: wrap Save Pressable in View to constrain Detox tap bounds (MM-T4989_2/MM-T3250) - invite/summary: fix retry testID hardcoded to use the dynamic type - channel_bookmark/bookmark_link: URL resolution timeout + setBookmarkLinkUrl - categories_list/load_channel_error: missing return statement for error UI - iOS MattermostShare: TestID-friendly testIDs on Swift share-extension views - patches/react-native-network-client: Android host null-guard patch - scripts/build.sh: copy compass-icons.ttf manually when --ignore-scripts is used - types/modules: WebSocketClientInterface sendBinary extension Matched detox specs that exercise these bugs land in the rf-split/detox-tests PR. * address CodeRabbit review on PR #9789 - post_list/index.ts, thread_options/index.ts: track serverUrl in withObservables dependency keys - post/body/index.tsx: restore React.memo(Body) to avoid per-item re-render regression - thread.tsx, edit_profile.tsx: add pressed feedback via style callback; move inline typography to stylesheet - bookmark_link.tsx: include queueFetch in useDidUpdate deps - ephemeral_store.ts: complete and delete per-post recently-unsaved subjects on expiry/clear to bound growth Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * test: fix stale mocks and add coverage for recently-unsaved saved posts Update thread/preference tests for the new NavigationStore and prepareDestroyPermanently call paths, and add unit tests for the EphemeralStore recently-unsaved saved-post logic plus the websocket filterStaleSavedPostPreferences path. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * test: tighten recently-unsaved saved post assertions Address CodeRabbit nitpicks on #9789: - preference.test.ts: assert addRecentlyUnsavedSavedPost is called once with (serverUrl, postId) so the echoed websocket re-save is filtered. - ephemeral_store.test.ts: assert the observed Set size (2 after two adds, 1 after clearing one) so we catch stray/missing entries. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * docs: explain pinned posts descending sort order The asc->desc change to queryPinnedPostsInChannel surfaced during the detox RF migration was correct but undocumented. selectOrderedPosts (reached via observePinnedPostsInChannel) iterates the posts array from the end backwards expecting oldest->newest, so it requires descending (newest-first) input, matching queryPostsInChannel. Add a comment so the sort order isn't questioned in review. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * test: cover thread/config/bottom-sheet edge cases flagged in review Add unit tests for coverage gaps identified by CodeRabbit on #9789: - createThreadFromNewPost: reply where the thread is missing but the root post exists (back-fills + auto-follows), and where neither exists (only records the participant, no crash) - processReceivedThreads: thread entry with no post/participants is skipped without crashing - markThreadAsUnread: unread_replies/unread_mentions from the API response are persisted to the local thread - getConfigBooleanValue: 'true' -> true, non-'true' -> false, missing key honors the default - dismissBottomSheet: falls back to GENERIC_BOTTOM_SHEET when only the generic variant is in the stack Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * refactor(thread_options): use withServerUrl HOC Replace the hand-rolled `ThreadOptionsWithServerUrl` wrapper (which called `useServerUrl()` inside a function component and re-created the element via `React.createElement`) with the existing `withServerUrl` HOC from `@context/server`. Composition chain becomes: withDatabase(withServerUrl(enhanced(ThreadOptions))) Addresses larkox's review on app/screens/thread_options/index.ts:41: "This is not needed. You should be able to use `withServerUrl` function." Also tightens the Props type — `serverUrl` is now required (the HOC guarantees it), not optional. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * chore(deps): bump react-native-network-client to 1.10.2; drop workarounds 1.10.2 upstreams both fixes that were being carried locally: - iOS: apply_patches.rb is now idempotent (mattermost/react-native-network-client#167), so its bundled Alamofire diff can no longer double-apply. Removes the need for the Podfile post_install workaround that stripped the duplicate `let allHeaders` (Swift 6 / Xcode 26 "invalid redeclaration"). Workaround deleted. - Android: the cert-error host null-fallback in NetworkClient.kt is now upstream (and improved — prefers HttpUrl host, then URI, then baseUrlString; references #9789). The patch-package patch (@mattermost+react-native-network-client+1.10.0.patch) is therefore obsolete and deleted. It was also a silent no-op here anyway — named 1.10.0 while 1.10.1 was installed, so patch-package skipped it. Addresses @enahum's review on #9789: the fix belongs in network-client, not patched downstream — and it now is. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> * chore(ios): update Podfile.lock for rnnc 1.10.2 Run `pod install` to sync Podfile.lock with the dependency bump in the previous commit: - react-native-network-client 1.10.1 → 1.10.2 - its pod checksum recomputed - PODFILE CHECKSUM recomputed (the Podfile changed — Alamofire duplicate-allHeaders workaround removed) The previous commit bumped package.json + ran npm install but did not regenerate Podfile.lock, so the iOS lockfile-consistency check would have failed (caught in review by @enahum). Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> * refactor(thread): use shared NavigationButton for header back Addresses @larkox's review on #9789: the thread route hand-rolled its header back button with a raw Pressable + CompassIcon + local StyleSheet, which is inconsistent with the rest of the app. Switch to the shared NavigationButton component — the same pattern used by app/screens/code/index.tsx, custom_status_clear_after, channel_bookmark, and the getModalHeaderOptions/getLoginModalHeaderOptions helpers (navigation.setOptions → NavigationButton with iconName/iconSize/color/ onPress/testID). Behavior is unchanged (still navigation.goBack() via handleBack) and the testID 'thread.navigation.back.button' is preserved for Detox. Net effect in the app: Android now gets the standard header ripple, a larger hitSlop touch target, and the arrow aligns like other NavigationButton headers. Removes the local styles, Pressable, StyleSheet, and CompassIcon imports. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
198 lines
6.1 KiB
TypeScript
198 lines
6.1 KiB
TypeScript
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
|
|
// See LICENSE.txt for license information.
|
|
|
|
import {decode} from 'html-entities';
|
|
import htmlParser from 'node-html-parser';
|
|
import urlParse from 'url-parse';
|
|
|
|
export type BestImage = {
|
|
secure_url?: string;
|
|
url?: string;
|
|
};
|
|
|
|
export type OpenGraph = {
|
|
link: string;
|
|
title?: string;
|
|
imageURL?: string;
|
|
favIcon?: string;
|
|
error?: any;
|
|
}
|
|
|
|
type LinkRelIcon = {
|
|
href: string;
|
|
sizes?: string;
|
|
}
|
|
|
|
const metaTags: Record<string, string> = {
|
|
title: 'title',
|
|
description: 'description',
|
|
ogUrl: 'og:url',
|
|
ogType: 'og:type',
|
|
ogTitle: 'og:title',
|
|
ogDescription: 'og:description',
|
|
ogImage: 'og:image',
|
|
ogVideo: 'og:video',
|
|
ogVideoType: 'og:video:type',
|
|
ogVideoWidth: 'og:video:width',
|
|
ogVideoHeight: 'og:video:height',
|
|
ogVideoUrl: 'og:video:url',
|
|
twitterPlayer: 'twitter:player',
|
|
twitterPlayerWidth: 'twitter:player:width',
|
|
twitterPlayerHeight: 'twitter:player:height',
|
|
twitterPlayerStream: 'twitter:player:stream',
|
|
twitterCard: 'twitter:card',
|
|
twitterDomain: 'twitter:domain',
|
|
twitterUrl: 'twitter:url',
|
|
twitterTitle: 'twitter:title',
|
|
twitterDescription: 'twitter:description',
|
|
twitterImage: 'twitter:image',
|
|
};
|
|
|
|
export function getDistanceBW2Points(point1: Record<string, any>, point2: Record<string, any>, xAttr = 'x', yAttr = 'y') {
|
|
return Math.sqrt(Math.pow(point1[xAttr] - point2[xAttr], 2) + Math.pow(point1[yAttr] - point2[yAttr], 2));
|
|
}
|
|
|
|
/**
|
|
* Funtion to return nearest point of given pivot point.
|
|
* It return two points one nearest and other nearest but having both coorditanes smaller than the given point's coordinates.
|
|
*/
|
|
export function getNearestPoint(pivotPoint: {height: number; width: number}, points: never[], xAttr = 'x', yAttr = 'y') {
|
|
let nearestPoint: Record<string, any> = {};
|
|
const pivot = {[xAttr]: pivotPoint.width, [yAttr]: pivotPoint.height};
|
|
for (const point of points) {
|
|
if (typeof nearestPoint[xAttr] === 'undefined' || typeof nearestPoint[yAttr] === 'undefined') {
|
|
nearestPoint = point;
|
|
} else if (getDistanceBW2Points(point, pivot, xAttr, yAttr) < getDistanceBW2Points(nearestPoint, pivot, xAttr, yAttr)) {
|
|
// Check for bestImage
|
|
nearestPoint = point;
|
|
}
|
|
}
|
|
return nearestPoint as BestImage;
|
|
}
|
|
|
|
const fetchRaw = async (url: string) => {
|
|
try {
|
|
const res = await fetch(url, {
|
|
headers: {
|
|
'User-Agent': 'OpenGraph',
|
|
'Cache-Control': 'no-cache',
|
|
Accept: '*/*',
|
|
Connection: 'keep-alive',
|
|
},
|
|
});
|
|
|
|
if (!res.ok) {
|
|
return res;
|
|
}
|
|
|
|
return (await res.text()) as any;
|
|
} catch (error: any) {
|
|
return {message: error.message};
|
|
}
|
|
};
|
|
|
|
const getFavIcon = (url: string, html: string) => {
|
|
const getSize = (el: LinkRelIcon) => {
|
|
return (el.sizes && el.sizes[0] && parseInt(el.sizes[0], 10)) || 0;
|
|
};
|
|
|
|
const root = htmlParser.parse(html);
|
|
|
|
const icons = (root.querySelectorAll('link')).reduce<LinkRelIcon[]>((r, e) => {
|
|
if (e.attributes.rel === 'icon' || e.attributes.rel === 'shortcut icon') {
|
|
const {href, sizes} = e.attributes;
|
|
r.push({href, sizes});
|
|
}
|
|
return r;
|
|
}, []).sort((a, b) => {
|
|
return getSize(b) - getSize(a);
|
|
});
|
|
|
|
if (icons.length) {
|
|
const icon = icons[0].href;
|
|
let parsed = urlParse(icon);
|
|
if (!parsed.host) {
|
|
parsed = urlParse(url);
|
|
return `${parsed.protocol}//${parsed.host}${icon}`;
|
|
}
|
|
return icon;
|
|
}
|
|
const parsed = urlParse(url);
|
|
return `${parsed.protocol}//${parsed.host}/favicon.ico`;
|
|
};
|
|
|
|
export const fetchOpenGraph = async (url: string, includeFavIcon = false): Promise<OpenGraph> => {
|
|
const {
|
|
ogTitle,
|
|
ogImage,
|
|
} = metaTags;
|
|
|
|
try {
|
|
const html = await fetchRaw(url);
|
|
if (html.message) {
|
|
throw Error(html.message);
|
|
}
|
|
|
|
let siteTitle = '';
|
|
|
|
const tagTitle = html.match(
|
|
/<title[^>]*>[\r\n\t\s]*([^<]+)[\r\n\t\s]*<\/title>/gim,
|
|
);
|
|
if (tagTitle) {
|
|
siteTitle = tagTitle[0].replace(
|
|
/<title[^>]*>[\r\n\t\s]*([^<]+)[\r\n\t\s]*<\/title>/gim,
|
|
'$1',
|
|
);
|
|
}
|
|
|
|
const og = [];
|
|
const metas: any = html.match(/<meta[^>]+>/gim);
|
|
|
|
// There is no else statement
|
|
/* istanbul ignore else */
|
|
if (metas) {
|
|
for (const m of metas) {
|
|
const meta = m.replace(/\s*\/?>$/, ' />');
|
|
const zname = meta.replace(/[\s\S]*(property|name)\s*=\s*([\s\S]+)/, '$2');
|
|
const name = (/^["']/).test(zname) ? zname.substr(1, zname.slice(1).indexOf(zname[0])) : zname.substr(0, zname.search(/[\s\t]/g));
|
|
const valid = Boolean(Object.keys(metaTags).filter((key: string) => metaTags[key].toLowerCase() === name.toLowerCase()).length);
|
|
|
|
// There is no else statement
|
|
/* istanbul ignore else */
|
|
if (valid) {
|
|
const zcontent = meta.replace(/[\s\S]*(content)\s*=\s*([\s\S]+)/, '$2');
|
|
const content = (/^["']/).test(zcontent) ? zcontent.substr(1, zcontent.slice(1).indexOf(zcontent[0])) : zcontent.substr(0, zcontent.search(/[\s\t]/g));
|
|
og.push({name, value: content === 'undefined' ? null : content});
|
|
}
|
|
}
|
|
}
|
|
|
|
const result: OpenGraph = {link: url};
|
|
const data = og.reduce(
|
|
(chain: any, meta: any) => ({...chain, [meta.name]: decode(meta.value)}),
|
|
{url},
|
|
);
|
|
|
|
// Image
|
|
result.imageURL = data[ogImage] ? data[ogImage] : null;
|
|
result.favIcon = includeFavIcon ? getFavIcon(url, html) : undefined;
|
|
|
|
// Title
|
|
data[ogTitle] = data[ogTitle] ? data[ogTitle] : siteTitle;
|
|
|
|
result.title = data[ogTitle];
|
|
|
|
return result;
|
|
} catch (error: any) {
|
|
return {
|
|
link: url,
|
|
error,
|
|
};
|
|
}
|
|
};
|
|
|
|
export const testExports = {
|
|
fetchRaw,
|
|
getFavIcon,
|
|
};
|