moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Set tile server to empty by default 

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
This commit is contained in:
marcin mikołajczak 2022-12-08 16:45:33 +01:00
parent 47b8f5fe64
commit 24b790c2d1
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/soapbox/features/event/event-information.tsx
View File

@ -9,7 +9,7 @@ import StatusMedia from 'soapbox/components/status-media';
import TranslateButton from 'soapbox/components/translate-button'; import TranslateButton from 'soapbox/components/translate-button';
import { HStack, Icon, Stack, Text } from 'soapbox/components/ui'; import { HStack, Icon, Stack, Text } from 'soapbox/components/ui';
import QuotedStatus from 'soapbox/features/status/containers/quoted-status-container'; import QuotedStatus from 'soapbox/features/status/containers/quoted-status-container';
import { useAppDispatch, useAppSelector, useSettings } from 'soapbox/hooks'; import { useAppDispatch, useAppSelector, useSettings, useSoapboxConfig } from 'soapbox/hooks';
import { makeGetStatus } from 'soapbox/selectors'; import { makeGetStatus } from 'soapbox/selectors';
import { defaultMediaVisibility } from 'soapbox/utils/status'; import { defaultMediaVisibility } from 'soapbox/utils/status';
@ -27,6 +27,7 @@ const EventInformation: React.FC<IEventInformation> = ({ params }) => {
const status = useAppSelector(state => getStatus(state, { id: params.statusId })) as StatusEntity; const status = useAppSelector(state => getStatus(state, { id: params.statusId })) as StatusEntity;
const { tileServer } = useSoapboxConfig();
const settings = useSettings(); const settings = useSettings();
const displayMedia = settings.get('displayMedia') as string; const displayMedia = settings.get('displayMedia') as string;
@ -73,7 +74,7 @@ const EventInformation: React.FC<IEventInformation> = ({ params }) => {
<br /> <br />
</>)} </>)}
{[event.location.get('postalCode'), event.location.get('locality'), event.location.get('country')].filter(text => text).join(', ')} {[event.location.get('postalCode'), event.location.get('locality'), event.location.get('country')].filter(text => text).join(', ')}
{event.location.get('latitude') && (<> {tileServer && event.location.get('latitude') && (<>
<br /> <br />
<a href='#' className='text-primary-600 dark:text-accent-blue hover:underline' onClick={handleShowMap}> <a href='#' className='text-primary-600 dark:text-accent-blue hover:underline' onClick={handleShowMap}>
<FormattedMessage id='event.show_on_map' defaultMessage='Show on map' /> <FormattedMessage id='event.show_on_map' defaultMessage='Show on map' />

3
app/soapbox/features/ui/components/link-footer.tsx
View File

@ -43,9 +43,6 @@ const LinkFooter: React.FC = (): JSX.Element => {
{features.profileDirectory && ( {features.profileDirectory && (
<FooterLink to='/directory'><FormattedMessage id='navigation_bar.profile_directory' defaultMessage='Profile directory' /></FooterLink> <FooterLink to='/directory'><FormattedMessage id='navigation_bar.profile_directory' defaultMessage='Profile directory' /></FooterLink>
)} )}
{features.events && (
<FooterLink to='/events'><FormattedMessage id='navigation_bar.events' defaultMessage='Events' /></FooterLink>
)}
<FooterLink to='/blocks'><FormattedMessage id='navigation_bar.blocks' defaultMessage='Blocks' /></FooterLink> <FooterLink to='/blocks'><FormattedMessage id='navigation_bar.blocks' defaultMessage='Blocks' /></FooterLink>
<FooterLink to='/mutes'><FormattedMessage id='navigation_bar.mutes' defaultMessage='Mutes' /></FooterLink> <FooterLink to='/mutes'><FormattedMessage id='navigation_bar.mutes' defaultMessage='Mutes' /></FooterLink>
{features.filters && ( {features.filters && (

4
app/soapbox/normalizers/soapbox/soapbox-config.ts
View File

@ -114,8 +114,8 @@ export const SoapboxConfigRecord = ImmutableRecord({
displayCta: true, displayCta: true,
/** Whether to inject suggested profiles into the Home feed. */ /** Whether to inject suggested profiles into the Home feed. */
feedInjection: true, feedInjection: true,
tileServer: 'https://tile.openstreetmap.org/{z}/{x}/{y}.png', tileServer: '',
tileServerAttribution: '© OpenStreetMap Contributors', tileServerAttribution: '',
}, 'SoapboxConfig'); }, 'SoapboxConfig');
type SoapboxConfigMap = ImmutableMap<string, any>; type SoapboxConfigMap = ImmutableMap<string, any>;