Merge pull request #150 from tooot-app/main

Candidate release v2.1
2025-02-06 21:33:37 +01:00 · 2021-06-22 15:01:43 +02:00 · 2021-06-22 15:01:43 +02:00 · fdba05e702
commit fdba05e702
parent 04bce7bf36 927e7df4e9
21 changed files with 199 additions and 101 deletions
--- a/.envrc.example
+++ b/.envrc.example
@ -5,7 +5,7 @@ export SENTRY_PROJECT=""
 export SENTRY_AUTH_TOKEN=""
 export SENTRY_DSN=""

-export TRANSLATE_KEY=""
+export TOOOT_API_KEY=""

 # Fastlane start
 export LC_ALL=""
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -40,7 +40,7 @@ jobs:
          SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
          SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
-          TRANSLATE_KEY: ${{ secrets.TRANSLATE_KEY }}
+          TOOOT_API_KEY: ${{ secrets.TOOOT_API_KEY }}
          FASTLANE_USER: ${{ secrets.FASTLANE_USER }}
          MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
          MATCH_GIT_URL: ${{ secrets.MATCH_GIT_URL }}
--- a/app.config.ts
+++ b/app.config.ts
@ -14,7 +14,7 @@ export default (): ExpoConfig => ({
  assetBundlePatterns: ['assets/*'],
  extra: {
    sentryDSN: process.env.SENTRY_DSN,
-    translateKey: process.env.TRANSLATE_KEY
+    toootApiKey: process.env.TOOOT_API_KEY
  },
  hooks: {
    postPublish: [
--- a/package.json
+++ b/package.json
@ -3,8 +3,8 @@
  "versions": {
    "native": "210511",
    "major": 2,
-    "minor": 0,
-    "patch": 4,
+    "minor": 1,
+    "patch": 0,
    "expo": "41.0.0"
  },
  "description": "tooot app for Mastodon",
@ -123,4 +123,4 @@
    "react-test-renderer": "^17.0.2",
    "typescript": "~4.2.4"
  }
-}
+}
--- a/src/api/tooot.ts
+++ b/src/api/tooot.ts
@ -0,0 +1,104 @@
+import axios from 'axios'
+import chalk from 'chalk'
+import { Constants } from 'react-native-unimodules'
+import * as Sentry from 'sentry-expo'
+
+const ctx = new chalk.Instance({ level: 3 })
+
+export type Params = {
+  service: 'push' | 'translate'
+  method: 'get' | 'post'
+  url: string
+  params?: {
+    [key: string]: string | number | boolean | string[] | number[] | boolean[]
+  }
+  headers?: { [key: string]: string }
+  body?: FormData | Object
+  sentry?: boolean
+}
+
+const DOMAIN = __DEV__ ? 'testapi.tooot.app' : 'api.tooot.app'
+
+const apiTooot = async <T = unknown>({
+  service,
+  method,
+  url,
+  params,
+  headers,
+  body,
+  sentry = false
+}: Params): Promise<{ body: T }> => {
+  const key = Constants.manifest.extra?.toootApiKey
+
+  console.log(
+    ctx.bgGreen.bold(' API tooot ') +
+      ' ' +
+      method +
+      ctx.green(' -> ') +
+      `/${url}` +
+      (params ? ctx.green(' -> ') : ''),
+    params ? params : ''
+  )
+
+  return axios({
+    timeout: method === 'post' ? 1000 * 60 : 1000 * 15,
+    method,
+    baseURL: `https://${DOMAIN}/`,
+    url: `${service}/${url}`,
+    params,
+    headers: {
+      ...(key && { 'x-tooot-key': key }),
+      'Content-Type': 'application/json',
+      'User-Agent': `tooot/${Constants.manifest.version}`,
+      Accept: '*/*',
+      ...headers
+    },
+    ...(body && { data: body })
+  })
+    .then(response => {
+      return Promise.resolve({
+        body: response.data
+      })
+    })
+    .catch(error => {
+      if (sentry) {
+        Sentry.Native.setExtras(error.response)
+        Sentry.Native.captureException(error)
+      }
+
+      if (error.response) {
+        // The request was made and the server responded with a status code
+        // that falls out of the range of 2xx
+        console.error(
+          ctx.bold(' API tooot '),
+          ctx.bold('response'),
+          error.response.status,
+          error.response.data.error
+        )
+        return Promise.reject({
+          status: error.response.status,
+          message: error.response.data.error
+        })
+      } else if (error.request) {
+        // The request was made but no response was received
+        // `error.request` is an instance of XMLHttpRequest in the browser and an instance of
+        // http.ClientRequest in node.js
+        console.error(
+          ctx.bold(' API tooot '),
+          ctx.bold('request'),
+          error.request
+        )
+        return Promise.reject()
+      } else {
+        console.error(
+          ctx.bold(' API tooot '),
+          ctx.bold('internal'),
+          error.message,
+          url
+        )
+        return Promise.reject()
+      }
+    })
+}
+
+export default apiTooot
--- a/src/components/Timeline/Conversation.tsx
+++ b/src/components/Timeline/Conversation.tsx
@ -128,7 +128,7 @@ const TimelineConversation: React.FC<Props> = ({
              status={conversation.last_status}
              highlighted={highlighted}
            />
-            {conversation.last_status.poll && (
+            {conversation.last_status.poll ? (
              <TimelinePoll
                queryKey={queryKey}
                statusId={conversation.last_status.id}
@ -138,7 +138,7 @@ const TimelineConversation: React.FC<Props> = ({
                  conversation.last_status.id === instanceAccount?.id
                }
              />
-            )}
+            ) : null}
          </View>
          <TimelineActions
            queryKey={queryKey}
--- a/src/components/Timeline/Default.tsx
+++ b/src/components/Timeline/Default.tsx
@ -116,13 +116,13 @@ const TimelineDefault: React.FC<Props> = ({
        }}
      >
        {typeof actualStatus.content === 'string' &&
-          actualStatus.content.length > 0 && (
-            <TimelineContent
-              status={actualStatus}
-              highlighted={highlighted}
-              disableDetails={disableDetails}
-            />
-          )}
+        actualStatus.content.length > 0 ? (
+          <TimelineContent
+            status={actualStatus}
+            highlighted={highlighted}
+            disableDetails={disableDetails}
+          />
+        ) : null}
        {queryKey && actualStatus.poll ? (
          <TimelinePoll
            queryKey={queryKey}
@ -138,9 +138,9 @@ const TimelineDefault: React.FC<Props> = ({
        actualStatus.media_attachments.length ? (
          <TimelineAttachment status={actualStatus} />
        ) : null}
-        {!disableDetails && actualStatus.card && (
+        {!disableDetails && actualStatus.card ? (
          <TimelineCard card={actualStatus.card} />
-        )}
+        ) : null}
        {!disableDetails ? (
          <TimelineFullConversation queryKey={queryKey} status={actualStatus} />
        ) : null}
@ -148,7 +148,7 @@ const TimelineDefault: React.FC<Props> = ({
        <TimelineActionsUsers status={actualStatus} highlighted={highlighted} />
      </View>

-      {queryKey && !disableDetails && (
+      {queryKey && !disableDetails ? (
        <TimelineActions
          queryKey={queryKey}
          rootQueryKey={rootQueryKey}
@ -162,7 +162,7 @@ const TimelineDefault: React.FC<Props> = ({
          ).map(d => d?.acct)}
          reblog={item.reblog ? true : false}
        />
-      )}
+      ) : null}
    </Pressable>
  )
 }
--- a/src/components/Timeline/Notifications.tsx
+++ b/src/components/Timeline/Notifications.tsx
@ -113,13 +113,13 @@ const TimelineNotifications: React.FC<Props> = ({
                : StyleConstants.Avatar.M + StyleConstants.Spacing.S
            }}
          >
-            {notification.status.content.length > 0 && (
+            {notification.status.content.length > 0 ? (
              <TimelineContent
                status={notification.status}
                highlighted={highlighted}
              />
-            )}
-            {notification.status.poll && (
+            ) : null}
+            {notification.status.poll ? (
              <TimelinePoll
                queryKey={queryKey}
                statusId={notification.status.id}
@ -127,13 +127,13 @@ const TimelineNotifications: React.FC<Props> = ({
                reblog={false}
                sameAccount={notification.account.id === instanceAccount?.id}
              />
-            )}
-            {notification.status.media_attachments.length > 0 && (
+            ) : null}
+            {notification.status.media_attachments.length > 0 ? (
              <TimelineAttachment status={notification.status} />
-            )}
-            {notification.status.card && (
+            ) : null}
+            {notification.status.card ? (
              <TimelineCard card={notification.status.card} />
-            )}
+            ) : null}
            <TimelineFullConversation
              queryKey={queryKey}
              status={notification.status}
--- a/src/components/Timeline/Shared/Actions.tsx
+++ b/src/components/Timeline/Shared/Actions.tsx
@ -182,7 +182,7 @@ const TimelineActions: React.FC<Props> = ({
          color={iconColor}
          size={StyleConstants.Font.Size.L}
        />
-        {status.replies_count > 0 && (
+        {status.replies_count > 0 ? (
          <Text
            style={{
              color: theme.secondary,
@ -192,7 +192,7 @@ const TimelineActions: React.FC<Props> = ({
          >
            {status.replies_count}
          </Text>
-        )}
+        ) : null}
      </>
    ),
    [status.replies_count]
@ -210,7 +210,7 @@ const TimelineActions: React.FC<Props> = ({
          }
          size={StyleConstants.Font.Size.L}
        />
-        {status.reblogs_count > 0 && (
+        {status.reblogs_count > 0 ? (
          <Text
            style={{
              color: color(status.reblogged),
@ -220,7 +220,7 @@ const TimelineActions: React.FC<Props> = ({
          >
            {status.reblogs_count}
          </Text>
-        )}
+        ) : null}
      </>
    )
  }, [status.reblogged, status.reblogs_count])
@ -233,7 +233,7 @@ const TimelineActions: React.FC<Props> = ({
          color={color(status.favourited)}
          size={StyleConstants.Font.Size.L}
        />
-        {status.favourites_count > 0 && (
+        {status.favourites_count > 0 ? (
          <Text
            style={{
              color: color(status.favourited),
@ -244,7 +244,7 @@ const TimelineActions: React.FC<Props> = ({
          >
            {status.favourites_count}
          </Text>
-        )}
+        ) : null}
      </>
    )
  }, [status.favourited, status.favourites_count])
--- a/src/components/Timeline/Shared/Attachment/Audio.tsx
+++ b/src/components/Timeline/Shared/Attachment/Audio.tsx
@ -74,7 +74,7 @@ const AttachmentAudio: React.FC<Props> = ({
          ) : null
        ) : (
          <>
-            {audio.preview_url && (
+            {audio.preview_url ? (
              <GracefullyImage
                uri={{
                  original: audio.preview_url,
@ -82,7 +82,7 @@ const AttachmentAudio: React.FC<Props> = ({
                }}
                style={styles.background}
              />
-            )}
+            ) : null}
            <Button
              type='icon'
              content={audioPlaying ? 'PauseCircle' : 'PlayCircle'}
--- a/src/components/Timeline/Shared/Card.tsx
+++ b/src/components/Timeline/Shared/Card.tsx
@ -27,14 +27,14 @@ const TimelineCard = React.memo(
        }}
        testID='base'
      >
-        {card.image && (
+        {card.image ? (
          <GracefullyImage
            uri={{ original: card.image }}
            blurhash={card.blurhash}
            style={styles.left}
            imageStyle={styles.image}
          />
-        )}
+        ) : null}
        <View style={styles.right}>
          <Text
            numberOfLines={2}
--- a/src/screens/Actions/Root.tsx
+++ b/src/screens/Actions/Root.tsx
@ -107,15 +107,15 @@ const ScreenActionsRoot = React.memo(
        case 'status':
          return (
            <>
-              {!sameAccount && (
+              {!sameAccount ? (
                <ActionsAccount
                  queryKey={params.queryKey}
                  rootQueryKey={params.rootQueryKey}
                  account={params.status.account}
                  dismiss={dismiss}
                />
-              )}
-              {sameAccount && params.status && (
+              ) : null}
+              {sameAccount && params.status ? (
                <ActionsStatus
                  navigation={navigation}
                  queryKey={params.queryKey}
@ -123,22 +123,22 @@ const ScreenActionsRoot = React.memo(
                  status={params.status}
                  dismiss={dismiss}
                />
-              )}
-              {!sameDomain && statusDomain && (
+              ) : null}
+              {!sameDomain && statusDomain ? (
                <ActionsDomain
                  queryKey={params.queryKey}
                  rootQueryKey={params.rootQueryKey}
                  domain={statusDomain}
                  dismiss={dismiss}
                />
-              )}
-              {params.status.visibility !== 'direct' && (
+              ) : null}
+              {params.status.visibility !== 'direct' ? (
                <ActionsShare
                  url={params.status.url || params.status.uri}
                  type={params.type}
                  dismiss={dismiss}
                />
-              )}
+              ) : null}
              <Button
                type='text'
                content={t('common:buttons.cancel')}
@ -152,9 +152,9 @@ const ScreenActionsRoot = React.memo(
        case 'account':
          return (
            <>
-              {!sameAccount && (
+              {!sameAccount ? (
                <ActionsAccount account={params.account} dismiss={dismiss} />
-              )}
+              ) : null}
              <ActionsShare
                url={params.account.url}
                type={params.type}
--- a/src/screens/Compose/Root/Footer/Attachments.tsx
+++ b/src/screens/Compose/Root/Footer/Attachments.tsx
@ -130,7 +130,7 @@ const ComposeAttachments: React.FC<Props> = ({ accessibleRefAttachments }) => {
              uri: item.local?.local_thumbnail || item.remote?.preview_url
            }}
          />
-          {item.remote?.meta?.original?.duration && (
+          {item.remote?.meta?.original?.duration ? (
            <Text
              style={[
                styles.duration,
@ -142,7 +142,7 @@ const ComposeAttachments: React.FC<Props> = ({ accessibleRefAttachments }) => {
            >
              {item.remote.meta.original.duration}
            </Text>
-          )}
+          ) : null}
          {item.uploading ? (
            <View
              style={[
--- a/src/screens/Compose/Root/Header.tsx
+++ b/src/screens/Compose/Root/Header.tsx
@ -18,11 +18,11 @@ const ComposeRootHeader: React.FC = () => {

  return (
    <>
-      {instanceActive !== -1 && localInstances.length > 1 && (
+      {instanceActive !== -1 && localInstances.length > 1 ? (
        <View style={styles.postingAs}>
          <ComposePostingAs />
        </View>
-      )}
+      ) : null}
      {composeState.spoiler.active ? <ComposeSpoilerInput /> : null}
      <ComposeTextInput />
    </>
--- a/src/utils/push/useConnect.ts
+++ b/src/utils/push/useConnect.ts
@ -1,12 +1,9 @@
 import apiGeneral from '@api/general'
+import apiTooot from '@api/tooot'
 import { displayMessage } from '@components/Message'
 import { NavigationContainerRef } from '@react-navigation/native'
 import { Dispatch } from '@reduxjs/toolkit'
-import {
-  disableAllPushes,
-  Instance,
-  PUSH_SERVER
-} from '@utils/slices/instancesSlice'
+import { disableAllPushes, Instance } from '@utils/slices/instancesSlice'
 import * as Notifications from 'expo-notifications'
 import { useEffect } from 'react'
 import { TFunction } from 'react-i18next'
@ -34,10 +31,10 @@ const pushUseConnect = ({
        })
      ).data

-      apiGeneral({
+      apiTooot({
        method: 'post',
-        domain: PUSH_SERVER,
-        url: 'v1/connect',
+        service: 'push',
+        url: 'connect',
        body: {
          expoToken
        },
--- a/src/utils/queryHooks/translate.ts
+++ b/src/utils/queryHooks/translate.ts
@ -1,4 +1,4 @@
-import apiGeneral from '@api/general'
+import apiTooot from '@api/tooot'
 import haptics from '@components/haptics'
 import { AxiosError } from 'axios'
 import { Buffer } from 'buffer'
@ -21,16 +21,7 @@ export type QueryKeyTranslate = [
  }
 ]

-export const TRANSLATE_SERVER = __DEV__
-  ? 'testtranslate.tooot.app'
-  : 'translate.tooot.app'
-
 const queryFunction = async ({ queryKey }: { queryKey: QueryKeyTranslate }) => {
-  const key = Constants.manifest.extra?.translateKey
-  if (!key) {
-    return Promise.reject()
-  }
-
  const { uri, source, target, text } = queryKey[1]

  const uriEncoded = Buffer.from(uri.replace(/https?:\/\//, ''))
@ -42,11 +33,11 @@ const queryFunction = async ({ queryKey }: { queryKey: QueryKeyTranslate }) => {
    'base64'
  )

-  const res = await apiGeneral<Translations>({
-    domain: TRANSLATE_SERVER,
+  const res = await apiTooot<Translations>({
    method: 'get',
-    url: `v1/translate/${uriEncoded}/${target}`,
-    headers: { key, original }
+    service: 'translate',
+    url: `source/${uriEncoded}/target/${target}`,
+    headers: { original }
  })
  haptics('Light')
  return res.body
--- a/src/utils/slices/instances/push/register.ts
+++ b/src/utils/slices/instances/push/register.ts
@ -1,12 +1,8 @@
-import apiGeneral from '@api/general'
 import apiInstance from '@api/instance'
+import apiTooot from '@api/tooot'
 import i18n from '@root/i18n/i18n'
 import { RootState } from '@root/store'
-import {
-  getInstance,
-  Instance,
-  PUSH_SERVER
-} from '@utils/slices/instancesSlice'
+import { getInstance, Instance } from '@utils/slices/instancesSlice'
 import * as Notifications from 'expo-notifications'
 import { Platform } from 'react-native'
 import androidDefaults from './androidDefaults'
@ -22,13 +18,13 @@ const register1 = async ({
  accountId: Mastodon.Account['id']
  accountFull: string
 }) => {
-  return apiGeneral<{
+  return apiTooot<{
    endpoint: string
    keys: { public: string; private: string; auth: string }
  }>({
    method: 'post',
-    domain: PUSH_SERVER,
-    url: 'v1/register1',
+    service: 'push',
+    url: 'register1',
    body: { expoToken, instanceUrl, accountId, accountFull },
    sentry: true
  })
@ -47,10 +43,10 @@ const register2 = async ({
  accountId: Mastodon.Account['id']
  removeKeys: boolean
 }) => {
-  return apiGeneral({
+  return apiTooot({
    method: 'post',
-    domain: PUSH_SERVER,
-    url: 'v1/register2',
+    service: 'push',
+    url: 'register2',
    body: { expoToken, instanceUrl, accountId, serverKey, removeKeys },
    sentry: true
  })
--- a/src/utils/slices/instances/push/unregister.ts
+++ b/src/utils/slices/instances/push/unregister.ts
@ -1,7 +1,7 @@
-import apiGeneral from '@api/general'
 import apiInstance from '@api/instance'
+import apiTooot from '@api/tooot'
 import { RootState } from '@root/store'
-import { getInstance, PUSH_SERVER } from '@utils/slices/instancesSlice'
+import { getInstance } from '@utils/slices/instancesSlice'
 import * as Notifications from 'expo-notifications'
 import { Platform } from 'react-native'

@ -19,10 +19,10 @@ const pushUnregister = async (state: RootState, expoToken: string) => {
    url: 'push/subscription'
  })

-  await apiGeneral<{ endpoint: string; publicKey: string; auth: string }>({
+  await apiTooot<{ endpoint: string; publicKey: string; auth: string }>({
    method: 'post',
-    domain: PUSH_SERVER,
-    url: 'v1/unregister',
+    service: 'push',
+    url: 'unregister',
    body: {
      expoToken,
      instanceUrl: instance.url,
--- a/src/utils/slices/instances/updatePushDecode.ts
+++ b/src/utils/slices/instances/updatePushDecode.ts
@ -1,10 +1,10 @@
-import apiGeneral from '@api/general'
+import apiTooot from '@api/tooot'
 import { createAsyncThunk } from '@reduxjs/toolkit'
 import i18n from '@root/i18n/i18n'
 import { RootState } from '@root/store'
 import * as Notifications from 'expo-notifications'
 import { Platform } from 'react-native'
-import { getInstance, Instance, PUSH_SERVER } from '../instancesSlice'
+import { getInstance, Instance } from '../instancesSlice'
 import androidDefaults from './push/androidDefaults'

 export const updateInstancePushDecode = createAsyncThunk(
@ -25,10 +25,10 @@ export const updateInstancePushDecode = createAsyncThunk(
      })
    ).data

-    await apiGeneral({
+    await apiTooot({
      method: 'post',
-      domain: PUSH_SERVER,
-      url: 'v1/update-decode',
+      service: 'push',
+      url: 'update-decode',
      body: {
        expoToken,
        instanceUrl: instance.url,
--- a/src/utils/slices/instancesSlice.ts
+++ b/src/utils/slices/instancesSlice.ts
@ -11,8 +11,6 @@ import { updateInstancePush } from './instances/updatePush'
 import { updateInstancePushAlert } from './instances/updatePushAlert'
 import { updateInstancePushDecode } from './instances/updatePushDecode'

-export const PUSH_SERVER = __DEV__ ? 'testpush.tooot.app' : 'push.tooot.app'
-
 export type Instance = {
  active: boolean
  appData: {
--- a/yarn.lock
+++ b/yarn.lock
@ -2232,11 +2232,11 @@
    xmldoc "^1.1.2"

 "@react-native-community/cli-platform-ios@^5.0.1-alpha.0":
-  version "5.0.1-alpha.2"
-  resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-ios/-/cli-platform-ios-5.0.1-alpha.2.tgz#58ab0641355cbe68a0d1737dde8c7d66eb0c0e39"
-  integrity sha512-W15A75j+4bx6qbcapFia1A0M+W3JAt7Bc4VgEYvxDDRI62EsSHk1k6ZBNxs/j0cDPSYF9ZXHlRI+CWi3r9bTbQ==
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-ios/-/cli-platform-ios-5.0.1.tgz#efa9c9b3bba0978d0a26d6442eefeffb5006a196"
+  integrity sha512-Nr/edBEYJfElgBNvjDevs2BuDicsvQaM8nYkTGgp33pyuCZRBxsYxQqfsNmnLalTzcYaebjWj6AnjUSxzQBWqg==
  dependencies:
-    "@react-native-community/cli-tools" "^5.0.1-alpha.1"
+    "@react-native-community/cli-tools" "^5.0.1"
    chalk "^3.0.0"
    glob "^7.1.3"
    js-yaml "^3.13.1"
@ -2259,6 +2259,18 @@
    serve-static "^1.13.1"
    ws "^1.1.0"

+"@react-native-community/cli-tools@^5.0.1":
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/@react-native-community/cli-tools/-/cli-tools-5.0.1.tgz#9ee564dbe20448becd6bce9fbea1b59aa5797919"
+  integrity sha512-XOX5w98oSE8+KnkMZZPMRT7I5TaP8fLbDl0tCu40S7Epz+Zz924n80fmdu6nUDIfPT1nV6yH1hmHmWAWTDOR+Q==
+  dependencies:
+    chalk "^3.0.0"
+    lodash "^4.17.15"
+    mime "^2.4.1"
+    node-fetch "^2.6.0"
+    open "^6.2.0"
+    shell-quote "1.6.1"
+
 "@react-native-community/cli-tools@^5.0.1-alpha.1":
  version "5.0.1-alpha.1"
  resolved "https://registry.yarnpkg.com/@react-native-community/cli-tools/-/cli-tools-5.0.1-alpha.1.tgz#b8ceed3ee5f1c2c7d860518da3dd919dc5953870"