fix: Properly fetch second page

Author: richardscull

server/src/core/domains/osu.ppy.sh/bancho.client.ts

@@ -207,26 +207,40 @@ export class BanchoClient extends BaseClient {
     }
 
     let { beatmapsets } = result.data;
-    let additionalBeatmapsets: BanchoBeatmapset[] = [];
 
     if (ctx.limit && ctx.limit <= BEATMAPS_SEARCH_MAX_RESULTS_LIMIT) {
       if (ctx.limit < BANCHO_SEARCH_PAGE_SIZE) {
         beatmapsets = beatmapsets.slice(0, ctx.limit);
       }
 
       if (ctx.limit > BANCHO_SEARCH_PAGE_SIZE && page < BANCHO_SEARCH_PAGES_LIMIT) {
-        additionalBeatmapsets = await this.searchBeatmapsets({
-          ...ctx,
-          limit: ctx.limit - beatmapsets.length,
-          offset: (ctx.offset ?? 0) + beatmapsets.length,
-        }).then(result => result.result ?? []);
+        const resultForAdditionalBeatmaps = await this.api.get<BanchoBeatmapsetSearchResult>(`api/v2/beatmapsets/search`, {
+          config: {
+            headers: {
+              Authorization: `Bearer ${await this.osuApiKey}`,
+            },
+            params: {
+              q: ctx.query,
+              page: page + 1,
+              s: ctx.status ? ctx.status.map(status => this.mapStatusToRankStatus(status).toString()) : undefined,
+              m: ctx.mode,
+              nsfw: true, // TODO: Maybe make this configurable?
+            },
+            paramsSerializer: params =>
+              qs.stringify(params, { indices: false }),
+          },
+        });
+
+        if (resultForAdditionalBeatmaps && resultForAdditionalBeatmaps.status === 200 && resultForAdditionalBeatmaps.data) {
+          beatmapsets = beatmapsets.concat(resultForAdditionalBeatmaps.data.beatmapsets.slice(0, ctx.limit - BANCHO_SEARCH_PAGE_SIZE));
+        }
       }
     }
 
     return {
-      result: [...additionalBeatmapsets, ...(beatmapsets.map((b: BanchoBeatmapset) =>
+      result: beatmapsets.map((b: BanchoBeatmapset) =>
         this.convertService.convertBeatmapset(b),
-      ))],
+      ),
       status: result.status,
     };
   }