Merge branch 'refs/heads/rainbowcat' into feat/napcat

# Conflicts: # main/src/utils/urls.ts
clansty · Jul 11, 2024 · 747b4de · 747b4de
2 parents 75f22b0 + f8c5907
commit 747b4de
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/main/src/models/posthog.ts b/main/src/models/posthog.ts
@@ -18,7 +18,7 @@ else {
 
 export default {
   capture(event: string, properties: Record<string, any>) {
-    if (typeof properties?.error === 'object' && properties.error.stack) {
+    if (typeof properties?.error === 'object' && properties.error.stack && JSON.stringify(properties.error) === '{}') {
       properties.error = properties.error.stack;
     }
     properties.repo = env.REPO;

diff --git a/main/src/utils/urls.ts b/main/src/utils/urls.ts
@@ -1,5 +1,6 @@
 import axios from 'axios';
 import { Friend, Group } from '../client/QQClient';
+import * as https from 'node:https';
 
 export function getAvatarUrl(room: number | bigint | Friend | Group): string {
   if (!room) return '';
@@ -22,9 +23,14 @@ export function getBigFaceUrl(file: string) {
   return `https://gxh.vip.qq.com/club/item/parcel/item/${file.substring(0, 2)}/${file.substring(0, 32)}/300x300.png`;
 }
 
+const httpsAgent = new https.Agent({
+  rejectUnauthorized: false,
+});
+
 export async function fetchFile(url: string): Promise<Buffer> {
   const res = await axios.get(url, {
     responseType: 'arraybuffer',
+    httpsAgent,
   });
   return res.data;
 }