feat: better api

futrime · Nov 7, 2024 · 8f539e4 · 8f539e4
1 parent 38cecc1
commit 8f539e4
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 7 deletions.
diff --git a/apps/bot/endstone-cpp-fetcher.ts b/apps/bot/endstone-cpp-fetcher.ts
@@ -31,7 +31,6 @@ export class EndstoneCppFetcher extends GitHubFetcher {
 
     const contributors: Contributor[] = repositoryContributors.map<Contributor>(contributor => ({
       username: contributor.login ?? '',
-      avatarUrl: contributor.avatar_url,
       contributions: contributor.contributions
     }))
 

diff --git a/apps/bot/endstone-python-fetcher.ts b/apps/bot/endstone-python-fetcher.ts
@@ -35,7 +35,6 @@ export class EndstonePythonFetcher extends GitHubFetcher {
 
     const contributors: Contributor[] = repositoryContributors.map<Contributor>(contributor => ({
       username: contributor.login ?? '',
-      avatarUrl: contributor.avatar_url,
       contributions: contributor.contributions
     }))
 

diff --git a/apps/bot/levilamina-fetcher.ts b/apps/bot/levilamina-fetcher.ts
@@ -42,7 +42,6 @@ export class LeviLaminaFetcher extends GitHubFetcher {
 
     const contributors: Contributor[] = repositoryContributors.map<Contributor>(contributor => ({
       username: contributor.login ?? '',
-      avatarUrl: contributor.avatar_url,
       contributions: contributor.contributions
     }))
 

diff --git a/apps/bot/package.ts b/apps/bot/package.ts
@@ -13,7 +13,6 @@ export interface Package {
 
 export interface Contributor {
   username: string
-  avatarUrl?: string
   contributions: number
 }
 

diff --git a/apps/bot/redis-client.ts b/apps/bot/redis-client.ts
@@ -13,14 +13,14 @@ const schema = new Schema('package', {
   avatarUrl: { type: 'string' },
   hotness: { type: 'number', sortable: true },
   updated: { type: 'string' },
+  contributors_username: { type: 'string[]', path: '$.contributors[*].username' },
+  contributors_contributions: { type: 'number[]', path: '$.contributors[*].contributions' },
   versions_version: { type: 'string[]', path: '$.versions[*].version' },
   versions_releasedAt: { type: 'string[]', path: '$.versions[*].releasedAt' },
   versions_source: { type: 'string[]', path: '$.versions[*].source' },
   versions_packageManager: { type: 'string[]', path: '$.versions[*].packageManager' }
 })
 
-const reconnectTimeout = 500
-
 export class RedisClient implements DatabaseClient {
   private readonly client: RedisClientType
   private readonly repository: Repository
@@ -29,7 +29,7 @@ export class RedisClient implements DatabaseClient {
     this.client = createClient({
       url,
       socket: {
-        reconnectStrategy: () => reconnectTimeout
+        reconnectStrategy: () => 500
       }
     })
     this.client.on('error', (err) => {

diff --git a/openapi.yaml b/openapi.yaml
@@ -111,6 +111,18 @@ paths:
                   - "$ref": "#/components/schemas/PackageInfo"
                   - type: object
                     properties:
+                      contributors:
+                        type: array
+                        items:
+                          type: object
+                          properties:
+                            username:
+                              type: string
+                            contributions:
+                              type: number
+                          required:
+                            - username
+                            - contributions
                       versions:
                         type: array
                         items:
@@ -137,6 +149,7 @@ paths:
                             - source
                             - packageManager
                     required:
+                      - contributors
                       - versions
                 required:
                   - apiVersion