gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2026-02-21 00:28:44 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Profile redesign: Switch to server flag (#37876)

Browse Source
This commit is contained in:
Echo 2026-02-16 14:06:49 +01:00 committed by GitHub
parent f199d7995c
commit f7bf804a3f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/mastodon/features/account_timeline/common.ts
View File

@ -1,5 +1,5 @@
import { isClientFeatureEnabled } from '@/mastodon/utils/environment';
import { isServerFeatureEnabled } from '@/mastodon/utils/environment';
export function isRedesignEnabled() {
return isClientFeatureEnabled('profile_redesign');
return isServerFeatureEnabled('profile_redesign');
}

4
app/javascript/mastodon/features/ui/index.jsx
View File

@ -22,6 +22,7 @@ import { identityContextPropShape, withIdentity } from 'mastodon/identity_contex
import { layoutFromWindow } from 'mastodon/is_mobile';
import { WithRouterPropTypes } from 'mastodon/utils/react_router';
import { checkAnnualReport } from '@/mastodon/reducers/slices/annual_report';
import { isServerFeatureEnabled } from '@/mastodon/utils/environment';
import { uploadCompose, resetCompose, changeComposeSpoilerness } from '../../actions/compose';
import { clearHeight } from '../../actions/height_cache';
@ -89,7 +90,6 @@ import { WrappedSwitch, WrappedRoute } from './util/react_router_helpers';
// Without this it ends up in ~8 very commonly used bundles.
import '../../components/status';
import { areCollectionsEnabled } from '../collections/utils';
import { isClientFeatureEnabled } from '@/mastodon/utils/environment';
const messages = defineMessages({
beforeUnload: { id: 'ui.beforeunload', defaultMessage: 'Your draft will be lost if you leave Mastodon.' },
@ -162,7 +162,7 @@ class SwitchingColumnsArea extends PureComponent {
redirect = <Redirect from='/' to='/about' exact />;
}
const profileRedesignEnabled = isClientFeatureEnabled('profile_redesign');
const profileRedesignEnabled = isServerFeatureEnabled('profile_redesign');
const profileRedesignRoutes = [];
if (profileRedesignEnabled) {
profileRedesignRoutes.push(

4
app/javascript/mastodon/features/ui/util/async-components.js
View File

@ -1,4 +1,4 @@
import { isClientFeatureEnabled } from '@/mastodon/utils/environment';
import { isServerFeatureEnabled } from '@/mastodon/utils/environment';
export function EmojiPicker () {
return import('../../emoji/emoji_picker');
@ -73,7 +73,7 @@ export function PinnedStatuses () {
}
export function AccountTimeline () {
if (isClientFeatureEnabled('profile_redesign')) {
if (isServerFeatureEnabled('profile_redesign')) {
return import('../../account_timeline/v2');
}
return import('../../account_timeline');

4
app/javascript/mastodon/utils/environment.ts
View File

@ -12,13 +12,13 @@ export function isProduction() {
else return import.meta.env.PROD;
}
export type ServerFeatures = 'fasp' | 'collections';
export type ServerFeatures = 'fasp' | 'collections' | 'profile_redesign';
export function isServerFeatureEnabled(feature: ServerFeatures) {
return initialState?.features.includes(feature) ?? false;
}
type ClientFeatures = 'profile_redesign' | 'collections';
type ClientFeatures = 'collections';
export function isClientFeatureEnabled(feature: ClientFeatures) {
try {