Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Disable iOS for now #18

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Disable iOS for now #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/lib/app-store/meta.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ const fetchAppDetailsIos = pMemoize(throttle('ios', _fetchAppDetailsIos), {
});

export const getAppMeta = async (options: GetAppMetaOptions): Promise<AppMeta | undefined> => {
if (options.platform === 'ios') throw new Error('I cannot let you do that.');

if (options.platform === 'android') {
const res = await fetchAppDetailsAndroid(
{ appId: options.appId },
Expand Down
2 changes: 2 additions & 0 deletions src/lib/app-store/search.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ const searchAppsIos = pMemoize(throttle('ios', _searchAppsIos), {
});

export const searchApps = async (options: SearchAppsOptions): Promise<AppSearchResult> => {
if (options.platform === 'ios') throw new Error('I cannot let you do that.');

if (options.platform === 'android') {
const results = await searchAppsAndroid([{ searchTerm: options.term }], {
language: options.language.toLocaleUpperCase() as 'EN',
Expand Down
17 changes: 10 additions & 7 deletions src/pages/a/[platform]/[appId]/index.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { e, client } from '../../../../lib/db';
const { platform, appId } = Astro.params;
if (!platform || !appId) throw new Error('This should never happen.');

if (platform !== 'android' && platform !== 'ios') return new Response('Invalid platform.', { status: 404 });
if (platform !== 'android') return new Response('Invalid platform.', { status: 404 });

const analyses = await e
.select(e.Analysis, (a) => ({
Expand All @@ -21,12 +21,10 @@ const analyses = await e
}))
.run(client);

if (analyses.length === 0) return new Response('We have not analyzed this app yet.', { status: 404 });

// An app can theoretically change its name with each new version, we thus use the one we saw in the most recent proceeding.
const name = analyses[0]!.proceeding.appName;
const name = analyses[0]?.proceeding.appName || '<unknown app>';
// On iOS, we need the adamId for getAppMeta().
const adamId = analyses[0]!.app.adamId;
const adamId = analyses[0]?.app.adamId;
---

<Base title={t('app-details', 'heading', { name, platform: t('common', platform) })}>
Expand All @@ -42,9 +40,14 @@ const adamId = analyses[0]!.app.adamId;
}
</ul>

<a
<form class="radio-wrapper" method="POST" action={absUrl(`/p/${platform}/${appId}`)}>
<button type="submit" class="button button-secondary">
{t('app-details', 'analyse-again')}
</button>
</form>
<!-- <a
class="button button-secondary"
href={absUrl(`/p/${platform}/${platform === 'android' ? appId : adamId}/confirm-platform`)}>
{t('app-details', 'analyse-again')}
</a>
</a> -->
</Base>
19 changes: 11 additions & 8 deletions src/pages/a/index.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ import { e, client } from '../../lib/db';
import { ratelimit } from '../../lib/ratelimit';

const term = Astro.url.searchParams.get('q');
const platform = (Astro.url.searchParams.get('platform') as 'android' | 'ios') || 'android';
const platform = 'android';
// const platform = (Astro.url.searchParams.get('platform') as 'android' | 'ios') || 'android';

if (term) await ratelimit({ ip: Astro.clientAddress, action: 'search' });

Expand Down Expand Up @@ -69,7 +70,7 @@ const results =
</path>
</svg>
</button>

<!--
<label>
<input type="radio" name="platform" value="android" checked={platform === 'android'} />
{t('common', 'android')}
Expand All @@ -79,6 +80,7 @@ const results =
<input type="radio" name="platform" value="ios" checked={platform === 'ios'} />
{t('common', 'ios')}
</label>
-->
</form>

{
Expand All @@ -89,12 +91,13 @@ const results =
<a
class="no-link-decoration"
href={
r.analysisCount > 0
? absUrl(`/a/${r.platform}/${r.id}`)
: absUrl(
// Annoyingly, on iOS and only for the getAppMeta() endpoint, we need the adamId instead of the bundleId.
`/p/${r.platform}/${r.platform === 'android' ? r.id : r.adamId}/confirm-platform`,
)
absUrl(`/a/${r.platform}/${r.id}`)
// r.analysisCount > 0
// ? absUrl(`/a/${r.platform}/${r.id}`)
// : absUrl(
// // Annoyingly, on iOS and only for the getAppMeta() endpoint, we need the adamId instead of the bundleId.
// `/p/${r.platform}/${r.platform === 'android' ? r.id : r.adamId}/confirm-platform`
// )
}>
<div class="anchor-overlay" aria-hidden="true" />
<h4>{r.name}</h4>
Expand Down
5 changes: 2 additions & 3 deletions src/pages/index.astro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,10 @@ import { absUrl } from '../lib/util';
<a href={absUrl('/background')}>{t('home', 'hero-desc-1')}</a>
{t('home', 'hero-desc-2')}
</div>
</div>
<div class="hero-right-col">

<a class="button" href={absUrl('/a') + '?platform=android'}>{t('home', 'android-button')}</a>
<a class="button" href={absUrl('/a') + '?platform=ios'}>{t('home', 'ios-button')}</a>
</div>
<div class="hero-right-col"></div>
</div>
</div>
</div>
Expand Down