fix: 1.make.md冲突，不能使用ctrl+o打开文件 2.clean code

JuckZ · Sep 14, 2023 · fbca009 · fbca009
2 parents 309add3 + 13c649c
commit fbca009
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/api/weather.ts b/src/api/weather.ts
@@ -191,7 +191,7 @@ class WeatherResponseForJournal {
         this.temp = weather.tempMax;
         this.text = weather.textDay;
         const air = await getair(locationId, API_KEY);
-        this.desc = `${city} ${weather.textDay}, ${weather.tempMin}~${weather.tempMax}℃ ${air.category} ${
+        this.desc = `${city} ${weather.textDay}, ${weather.tempMin}~${weather.tempMax}℃ ${air?.category} ${
             this.windydesc
         }${weather.moonPhase.replace(/[\u4e00-\u9fa5]/g, '')}`;
         this.icon = weather.iconDay;
@@ -266,7 +266,6 @@ async function getWWeather(city: string) {
 
 export async function getWeatherDaily(latitude: number, longitude: number): Promise<WeatherResponse | null> {
     try {
-        // now or 3d
         const url = `https://devapi.qweather.com/v7/weather/3d?location=${longitude},${latitude}&key=${API_KEY}`;
         console.log(url);
 
@@ -333,17 +332,17 @@ export async function getCurrentLocation(): Promise<{
  * @param apiKey API Key
  * @returns
  */
-async function getair(locationId, apiKey): Promise<AirResponse | -1> {
+async function getair(locationId, apiKey) {
     const weatherUrl = `https://devapi.qweather.com/v7/air/now?location=${locationId}&key=${apiKey}`;
     const wUrl = new URL(weatherUrl);
     const res = await request({
         url: wUrl.href,
         method: 'GET',
     });
 
-    const data = JSON.parse(res) as { code: string; now: AirResponse };
+    const data = JSON.parse(res) as AirResponse;
     if (data.code != '200') {
-        return -1;
+        return null;
     }
     const air = data.now;
     return air;

diff --git a/src/main.ts b/src/main.ts
@@ -332,7 +332,9 @@ export default class AwesomeBrainManagerPlugin extends Plugin {
                 getRoot(old) {
                     return function () {
                         const top = old.call(this);
-                        return top.getRoot === this.getRoot ? top : top.getRoot();
+                        top.getRoot === this.getRoot ? top : top.getRoot();
+                        // bugfix make.md冲突，不能使用ctrl+o打开文件 #bug
+                        return top;
                     };
                 },
                 onResize(old) {