fix: reduce twitter image requests (#10867)

* fix: reduce twitter image requests * fix: storage type * fix: cspell
DimensionDev · Sep 26, 2023 · a07c140 · a07c140
1 parent 17f75b8
commit a07c140
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 14 deletions.
diff --git a/packages/mask/src/site-adaptors/twitter.com/utils/url.ts b/packages/mask/src/site-adaptors/twitter.com/utils/url.ts
@@ -13,9 +13,7 @@ export const hostLeadingUrlAutoTwitter = (isMobile: boolean) =>
 // https://developer.twitter.com/en/docs/tweets/data-dictionary/overview/entities-object#photo_format
 export const canonifyImgUrl = (url: string) => {
     const parsed = new URL(url)
-    if (parsed.hostname !== 'pbs.twimg.com') {
-        return url
-    }
+    if (parsed.hostname !== 'pbs.twimg.com') return url
     const { searchParams } = parsed
     searchParams.set('name', 'orig')
     // we can't understand original image format when given url labeled as webp
@@ -24,7 +22,7 @@ export const canonifyImgUrl = (url: string) => {
         const pngURL = parsed.href
         searchParams.set('format', 'jpg')
         const jpgURL = parsed.href
-        return [pngURL, jpgURL]
+        return [jpgURL, pngURL]
     }
     return parsed.href
 }

diff --git a/packages/mask/src/utils/fetcher.ts b/packages/mask/src/utils/fetcher.ts
@@ -38,7 +38,7 @@ function canAccessAsContent(url: string) {
     const target = new URL(url, location.href)
     if (
         location.origin.endsWith('twitter.com') &&
-        ['https://abs.twimg.com', 'https://upload.twitter.com', 'https://api.twitter.com'].includes(target.origin)
+        (target.origin.endsWith('twitter.com') || target.origin.endsWith('twimg.com'))
     )
         return true
 

diff --git a/packages/shared/src/hooks/usePersonaContext.ts b/packages/shared/src/hooks/usePersonaContext.ts
@@ -1,4 +1,7 @@
 import { useCallback, useEffect, useMemo, useState } from 'react'
+import { useAsync } from 'react-use'
+import compareDesc from 'date-fns/compareDesc'
+import isBefore from 'date-fns/isBefore'
 import { unionWith, uniqBy } from 'lodash-es'
 import { createContainer } from 'unstated-next'
 import {
@@ -16,9 +19,6 @@ import {
 } from '@masknet/shared-base'
 import { useValueRef } from '@masknet/shared-base-ui'
 import { usePersonaProofs } from './usePersonaProofs.js'
-import compareDesc from 'date-fns/compareDesc'
-import isBefore from 'date-fns/isBefore'
-import { useAsync } from 'react-use'
 import { Web3Storage } from '@masknet/web3-providers'
 import { PERSONA_AVATAR_DB_NAMESPACE } from '../constants.js'
 import type { PersonaAvatarData } from '../types.js'
@@ -66,11 +66,9 @@ function usePersonaContext(initialState?: {
         const lastUpdateTime = await initialState.queryPersonaAvatarLastUpdateTime(currentPersona.identifier)
         const storage = Web3Storage.createKVStorage(PERSONA_AVATAR_DB_NAMESPACE)
         try {
-            const remote: PersonaAvatarData = await storage.get<PersonaAvatarData>(
-                currentPersona.identifier.rawPublicKey,
-            )
+            const remote = await storage.get<PersonaAvatarData>(currentPersona.identifier.rawPublicKey)
 
-            if (lastUpdateTime && isBefore(lastUpdateTime, remote.updateAt)) {
+            if (remote && lastUpdateTime && isBefore(lastUpdateTime, remote.updateAt)) {
                 return remote.imageUrl
             }
             return currentPersona.avatar

diff --git a/packages/web3-providers/src/Storage/storages/KV.ts b/packages/web3-providers/src/Storage/storages/KV.ts
@@ -34,8 +34,8 @@ export class KVStorage implements StorageAPI.Storage {
     async get<T>(key: string) {
         const cacheKey = `${this.namespace}_${key}`
         const cache = this.cache?.get(cacheKey)
-
-        return cache ?? this.getKV<T>().get(key)
+        const storage = cache ?? this.getKV<T>().get(key)
+        return storage as T | undefined
     }
 
     async set<T>(key: string, value: T) {