diff --git a/bskyweb/cmd/bskyweb/server.go b/bskyweb/cmd/bskyweb/server.go index 8a91d0bf70..5e2658e75b 100644 --- a/bskyweb/cmd/bskyweb/server.go +++ b/bskyweb/cmd/bskyweb/server.go @@ -100,11 +100,12 @@ func serve(cctx *cli.Context) error { // generic routes e.GET("/search", server.WebGeneric) e.GET("/notifications", server.WebGeneric) - e.GET("/lists", server.WebGeneric) + e.GET("/moderation", server.WebGeneric) + e.GET("/moderation/mute-lists", server.WebGeneric) + e.GET("/moderation/muted-accounts", server.WebGeneric) + e.GET("/moderation/blocked-accounts", server.WebGeneric) e.GET("/settings", server.WebGeneric) e.GET("/settings/app-passwords", server.WebGeneric) - e.GET("/settings/muted-accounts", server.WebGeneric) - e.GET("/settings/blocked-accounts", server.WebGeneric) e.GET("/sys/debug", server.WebGeneric) e.GET("/sys/log", server.WebGeneric) e.GET("/support", server.WebGeneric) diff --git a/src/Navigation.tsx b/src/Navigation.tsx index bf5db51d06..4e0403be90 100644 --- a/src/Navigation.tsx +++ b/src/Navigation.tsx @@ -33,7 +33,8 @@ import {useStores} from './state' import {HomeScreen} from './view/screens/Home' import {SearchScreen} from './view/screens/Search' import {NotificationsScreen} from './view/screens/Notifications' -import {ListsScreen} from './view/screens/Lists' +import {ModerationScreen} from './view/screens/Moderation' +import {ModerationMuteListsScreen} from './view/screens/ModerationMuteLists' import {NotFoundScreen} from './view/screens/NotFound' import {SettingsScreen} from './view/screens/Settings' import {ProfileScreen} from './view/screens/Profile' @@ -51,8 +52,8 @@ import {TermsOfServiceScreen} from './view/screens/TermsOfService' import {CommunityGuidelinesScreen} from './view/screens/CommunityGuidelines' import {CopyrightPolicyScreen} from './view/screens/CopyrightPolicy' import {AppPasswords} from 'view/screens/AppPasswords' -import {MutedAccounts} from 'view/screens/MutedAccounts' -import {BlockedAccounts} from 'view/screens/BlockedAccounts' +import {ModerationMutedAccounts} from 'view/screens/ModerationMutedAccounts' +import {ModerationBlockedAccounts} from 'view/screens/ModerationBlockedAccounts' import {getRoutingInstrumentation} from 'lib/sentry' const navigationRef = createNavigationContainerRef() @@ -72,7 +73,19 @@ function commonScreens(Stack: typeof HomeTab) { return ( <> - + + + + - - ) } diff --git a/src/lib/routes/types.ts b/src/lib/routes/types.ts index b0d678be07..56775deee6 100644 --- a/src/lib/routes/types.ts +++ b/src/lib/routes/types.ts @@ -5,7 +5,10 @@ export type {NativeStackScreenProps} from '@react-navigation/native-stack' export type CommonNavigatorParams = { NotFound: undefined - Lists: undefined + Moderation: undefined + ModerationMuteLists: undefined + ModerationMutedAccounts: undefined + ModerationBlockedAccounts: undefined Settings: undefined Profile: {name: string; hideBackButton?: boolean} ProfileFollowers: {name: string} @@ -22,8 +25,6 @@ export type CommonNavigatorParams = { CommunityGuidelines: undefined CopyrightPolicy: undefined AppPasswords: undefined - MutedAccounts: undefined - BlockedAccounts: undefined } export type BottomTabNavigatorParams = CommonNavigatorParams & { diff --git a/src/routes.ts b/src/routes.ts index 3c4168592b..571aca7ffa 100644 --- a/src/routes.ts +++ b/src/routes.ts @@ -4,8 +4,11 @@ export const router = new Router({ Home: '/', Search: '/search', Notifications: '/notifications', - Lists: '/lists', Settings: '/settings', + Moderation: '/moderation', + ModerationMuteLists: '/moderation/mute-lists', + ModerationMutedAccounts: '/moderation/muted-accounts', + ModerationBlockedAccounts: '/moderation/blocked-accounts', Profile: '/profile/:name', ProfileFollowers: '/profile/:name/followers', ProfileFollows: '/profile/:name/follows', @@ -16,8 +19,6 @@ export const router = new Router({ Debug: '/sys/debug', Log: '/sys/log', AppPasswords: '/settings/app-passwords', - MutedAccounts: '/settings/muted-accounts', - BlockedAccounts: '/settings/blocked-accounts', Support: '/support', PrivacyPolicy: '/support/privacy', TermsOfService: '/support/tos', diff --git a/src/view/com/lists/SubscribedMutelistsEmptyState.tsx b/src/view/com/lists/SubscribedMutelistsEmptyState.tsx index 281a0f9ae6..81faaafa12 100644 --- a/src/view/com/lists/SubscribedMutelistsEmptyState.tsx +++ b/src/view/com/lists/SubscribedMutelistsEmptyState.tsx @@ -28,7 +28,8 @@ export function SubscribedMutelistsEmptyState() { You can subscribe to mutelists to automatically mute all of the users - they include. Mutelists are public but your subscription is not. + they include. Mutelists are public but your subscription to a mutelist + is private.