Fix editCaption after share

Author: Phoscur

src/cloudStudy.test.ts

@@ -175,7 +175,7 @@ describe('CloudStudy', () => {
     //await Promise.resolve();
     await sunMoon.sleep(0); // = 2x await
     expect(chat.sendMessage).toHaveBeenCalledWith(
-      `🌇 Sunset is soon...\n⤵️ Starting daily timelapse 🎥\nStubbed Temperature\n💾 Storage (-1): -1`
+      `🌇 Sunset is soon...\n⤵️ Starting daily timelapse 🎥\n💾 Storage (-1): -1\nStubbed Temperature`
     );
     expect(chat.createAnimation).toHaveBeenCalledWith(assets.telegramSpinner, {
       caption: undefined,
@@ -232,18 +232,20 @@ describe('CloudStudy', () => {
       messageId,
       publisher.getMarkupPublished(false, true, true)
     );
+    expect(editCaptionLater).toBeCalledTimes(2);
 
     await publisher.saveLike(messageId, author, `like-${like}`);
     await publisher.updateCaptions(chat, messageId);
     expect(editCaptionLater).toBeCalledWith(
       `${cloud}🌇 ${LIKE.GROWING} ${created}`,
       publisher.getMarkupPublished(false, true)
     );
-    expect(editCaptionLater).toBeCalledTimes(2);
+    expect(editCaptionLater).toBeCalledTimes(3);
     expect(editCaptionChannel).toBeCalledWith(
       `${cloud}🌇 ${LIKE.GROWING} ${created}`,
       publisher.getMarkupPublished(false, true)
     );
+    expect(editCaptionChannel).toBeCalledTimes(2);
   });
 });
 
@@ -311,6 +313,16 @@ describe('Publisher', () => {
           message_id: channelMessageId,
         };
       }),
+      getChannelMessage: vi.fn(() => {
+        return {
+          editCaption: vi.fn(),
+        };
+      }),
+      getMessage: vi.fn(() => {
+        return {
+          editCaption: vi.fn(),
+        };
+      }),
     } as unknown as ChatMessenger;
     const messageId = -111;
     const channelMessageId = -222;

src/services/Hardware.ts

@@ -32,7 +32,7 @@ export class Hardware {
     if (!this.temperatureSensorEnabled) return storageMessage;
     try {
       const temperatureMessage = await getTemperatureHumidityMessage();
-      return `${temperatureMessage}\n${storageMessage}`;
+      return `${storageMessage}\n${temperatureMessage}`;
     } catch (error) {
       this.#logger().log('Failed to read temperature', error);
       return storageMessage;
@@ -51,7 +51,7 @@ export const hardwareStubProvider = {
         const status = { size: '-1', percent: '-1' };
         const storageMessage = t('storage.status', status.size, status.percent);
         const temperatureMessage = 'Stubbed Temperature';
-        return `${temperatureMessage}\n${storageMessage}`;
+        return `${storageMessage}\n${temperatureMessage}`;
       }
     }
     return new HardwareStub();

src/services/Publisher.ts

@@ -172,6 +172,7 @@ export class Publisher {
     );
     const pubs = await this.getInventory();
     await pubs.setShared(channelMessage.message_id, messageId);
+    await this.updateCaptions(group, messageId);
 
     return channelMessage.message_id;
   }

src/services/Timelapse.ts

@@ -87,6 +87,7 @@ export class Timelapse {
     const abort = () => {
       clearInterval(this.#intervalId);
       signal.removeEventListener('abort', abort);
+      logger.timeEnd('timelapse');
       return events.emit('stopped', photoDir);
     };
     signal.addEventListener('abort', abort);
@@ -119,8 +120,6 @@ export class Timelapse {
           events.emit('error', error);
           abort();
         }
-      } finally {
-        logger.timeEnd('timelapse');
       }
     };
     setTimeout(() => {
@@ -135,6 +134,7 @@ export class Timelapse {
 
     events.once('captured', async () => {
       try {
+        logger.timeLog('timelapse', 'render', 'started');
         await renderer.stitchImages(
           this.namePrefix,
           videoDir.fs.cwd,
@@ -146,11 +146,14 @@ export class Timelapse {
           },
           logger
         );
+        logger.timeLog('timelapse', 'render', 'finished');
         events.emit('rendered', this.output, videoDir);
       } catch (error) {
         events.emit('error', error);
+      } finally {
+        signal.removeEventListener('abort', abort);
+        logger.timeEnd('timelapse');
       }
-      signal.removeEventListener('abort', abort);
     });
 
     return events;