Fix minor

Phoscur · Phoscur · commit eb5892b7ba45 · 2024-11-24T22:38:50.000+01:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,3 +1,7 @@
+on:
+  push:
+  workflow_dispatch:
+  pull_request:
 jobs:
   oxlint:
     name: Lint
diff --git a/ecosystem.config.cjs b/ecosystem.config.cjs
@@ -8,7 +8,16 @@ module.exports = {
       watch: true,
       // Delay between restart
       watch_delay: 1000,
-      ignore_watch: ['node_modules', 'src', 'sun*', 'ecosystem.config.js', 'README.md'],
+      ignore_watch: [
+        'node_modules',
+        'src',
+        'stora*',
+        'sun*',
+        'time*',
+        'photo*',
+        'ecosystem.config.js',
+        'README.md',
+      ],
       watch_options: {
         followSymlinks: false,
       },
diff --git a/jest.config.js b/jest.config.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -7,10 +7,10 @@
   "scripts": {
     "start": "tsx --env-file=.env src/main.ts",
     "command": "tsx --env-file=.env src/commands/index.ts",
-    "production": "npm run build && npm run run-built",
-    "run-built": "node --env-file=.env dist/main.js",
-    "lint": "oxlint",
+    "production": "npm run build && npm run built",
     "build": "tsc -b",
+    "built": "node --env-file=.env dist/main.js",
+    "lint": "oxlint",
     "clean-build": "tsc -b --clean",
     "watch": "tsx watch --env-file=.env src/main.ts",
     "test": "vitest",
diff --git a/src/commands/index.ts b/src/commands/index.ts
@@ -8,6 +8,7 @@ const logger = di.get(Logger);
 const args = process.argv.slice(3);
 const command = process.argv[2];
 /*
+Full backup & restore
 
 1. Tar/Gzip & Upload 
 
diff --git a/src/context.ts b/src/context.ts
@@ -79,7 +79,7 @@ export function createTelegramMessengerChat(
     getMessage: messageFactory.bind(null, bot, chatId),
     getChannelMessage: messageFactory.bind(null, bot, copyTargetChatId),
     sendMessage: bot.telegram.sendMessage.bind(bot.telegram, chatId),
-    sendMessageCopy: bot.telegram.copyMessage.bind(bot.telegram, chatId, copyTargetChatId),
+    sendMessageCopy: bot.telegram.copyMessage.bind(bot.telegram, copyTargetChatId, chatId),
     sendPhoto: bot.telegram.sendPhoto.bind(bot.telegram, chatId),
     sendAnimation: bot.telegram.sendAnimation.bind(bot.telegram, chatId),
     createAnimation: async (
diff --git a/src/i18n.ts b/src/i18n.ts
@@ -27,7 +27,7 @@ const base = {
   },
   de: {
     'action.presetSwitch': 'Einstellung wechseln 📷',
-    'action.shotSingle': 'Einzelschuss 🥃',
+    'action.shotSingle': 'Schüsschen 🥃',
     'action.timelapse': 'Zeitraffer jetzt 🎥',
     'action.timelapse-half': 'Halber 🎥',
     'action.timelapse-third': 'Drittel 🎥',
@@ -51,7 +51,9 @@ type BasicEntry = keyof BasicIndex;
 export type SlottedTranslate = (index: BasicIndex, ...args: BasicEntry[]) => string;
 
 export function dateFormat(d = new Date()) {
-  return `${d.getDate()}.${d.getMonth() + 1}.${d.getFullYear()} ${d.getHours()}:${d.getMinutes()}`;
+  const clock = d.toLocaleTimeString().slice(0, 5);
+  // js dates are the best, I don't regret to have removed dayjs at all!!11
+  return `${d.getDate()}.${d.getMonth() + 1}.${d.getFullYear()} ${clock}`;
 }
 
 const composite = {
diff --git a/src/lib/ffmpeg.ts b/src/lib/ffmpeg.ts
@@ -54,7 +54,6 @@ export async function stitchImages(
     //'-filter:v "crop=iw-400:ih-40,scale=1920:1080"',
     //'-filter:v "crop=iw-216:ih-888,scale=1920:1080"',
     //'-filter:v "crop=iw-216:ih-628,scale=1920:1200"',
-    //'-vf crop=iw-216:ih-628,scale=1920:1200',
     //'-vf scale=2028:-1', // rescale width (and height relatively)
     // input file's resolution: 4056x3048 (1920*2=3840+216; 1080*2=2160+888)
     '-an',
diff --git a/src/main.ts b/src/main.ts
@@ -41,4 +41,8 @@ async function setupBot() {
   process.once('SIGTERM', () => bot.stop('SIGTERM'));
 }
 
-setupBot().then(() => console.log('🚀 Bot is running!'));
+setupBot().then(() =>
+  console.log(
+    `🚀 Bot is running!\n(In chat [${process.env.TELEGRAM_CHAT_ID}], sharing to channel [${process.env.TELEGRAM_CHANNEL_ID}])`
+  )
+);
diff --git a/src/photoStage.ts b/src/photoStage.ts
@@ -67,6 +67,7 @@ export function buildStage(bot: Telegraf<PhiloContext>) {
 
   // ---------------------------------------------------------------------------------------------------
   // Sharing / Publishing: Collecting Appraisals
+  // TODO? let clickLock = false;
 
   scene.action(Publisher.ACTION.SHARE, async (ctx, next) => {
     const publisher = ctx.di.get(Publisher);
@@ -76,9 +77,8 @@ export function buildStage(bot: Telegraf<PhiloContext>) {
     if (!~ADMINS.indexOf(user)) {
       return ctx.answerCbQuery(publisher.callbackMessageNoPermission);
     }
+    if (!isActionableMessage(message)) return next();
 
-    if (!message) return next();
-    if (isTextMessage(message)) return next();
     await publisher.share(ctx.group, message.message_id);
     await ctx.answerCbQuery(publisher.callbackMessageShare);
   });
@@ -89,7 +89,7 @@ export function buildStage(bot: Telegraf<PhiloContext>) {
 
     const { message } = ctx.callbackQuery;
     const user = ctx.from?.username || 'Anonymous';
-    if (!(isPhotoMessage(message) || isVideoMessage(message))) return next();
+    if (!isActionableMessage(message)) return next();
 
     const liked = await publisher.saveLike(message.message_id, user, data);
     await publisher.updateCaptions(ctx.group, message.message_id);
@@ -102,7 +102,7 @@ export function buildStage(bot: Telegraf<PhiloContext>) {
 
     const { message } = ctx.callbackQuery;
     const user = ctx.from?.username || '';
-    if (!(isPhotoMessage(message) || isVideoMessage(message))) return next();
+    if (!isActionableMessage(message)) return next();
 
     if (!~ADMINS.indexOf(user)) {
       return ctx.answerCbQuery(publisher.callbackMessageNoPermission);
@@ -236,12 +236,18 @@ export function buildStage(bot: Telegraf<PhiloContext>) {
   };
 }
 
-function isTextMessage(message: any): message is Message.TextMessage {
+/* unused function isTextMessage(message: any): message is Message.TextMessage {
   return 'text' in message;
-}
+}*/
 function isVideoMessage(message: any): message is Message.VideoMessage {
   return 'video' in message;
 }
+function isAnimationMessage(message: any): message is Message.AnimationMessage {
+  return 'animation' in message;
+}
 function isPhotoMessage(message: any): message is Message.PhotoMessage {
-  return 'video' in message;
+  return 'photo' in message;
+}
+function isActionableMessage(message: any) {
+  return isAnimationMessage(message) || isVideoMessage(message) || isPhotoMessage(message);
 }
diff --git a/src/services/Camera.ts b/src/services/Camera.ts
@@ -9,7 +9,7 @@ export class Camera {
   name = 'still-test';
   options: StillOptions = {
     roi: '', // x,y,w,h
-    height: 1080,
+    // height: 1080,
   };
 
   #mutex: Promise<unknown> | false = false;
diff --git a/src/services/Producer.ts b/src/services/Producer.ts
@@ -35,8 +35,8 @@ export class Producer {
     { count: 420, intervalMS: 12000, prefix: 'timelapse' },
     { count: 210, intervalMS: 12000, prefix: 'timelapse-half' },
     { count: 140, intervalMS: 12000, prefix: 'timelapse-third' },
-    { count: 30, intervalMS: 2000, prefix: 'timelapse-short' },
-    { count: 14, intervalMS: 2000, prefix: 'timelapse-super-short' },
+    { count: 30, intervalMS: 3000, prefix: 'timelapse-short' },
+    { count: 14, intervalMS: 3000, prefix: 'timelapse-super-short' },
   ] as const;
 
   #logger = inject(Logger);
diff --git a/src/services/Timelapse.ts b/src/services/Timelapse.ts
@@ -119,6 +119,8 @@ export class Timelapse {
           events.emit('error', error);
           abort();
         }
+      } finally {
+        logger.timeEnd('timelapse');
       }
     };
     setTimeout(() => {

Original file line number	Diff line number	Diff line change
`@@ -41,4 +41,8 @@ async function setupBot() {`
`41`	`41`	`process.once('SIGTERM', () => bot.stop('SIGTERM'));`
`42`	`42`	`}`
`43`	`43`
`44`		`-setupBot().then(() => console.log('🚀 Bot is running!'));`
	`44`	`+setupBot().then(() =>`
	`45`	`+ console.log(`
	`46`	+ `🚀 Bot is running!\n(In chat [${process.env.TELEGRAM_CHAT_ID}], sharing to channel [${process.env.TELEGRAM_CHANNEL_ID}])`
	`47`	`+ )`
	`48`	`+);`