Merge pull request #33 from derogab/dev

v1.6.1

Author: derogab

.github/workflows/docker-publish.yml

@@ -21,7 +21,8 @@ on:
 
 env:
   # Use docker.io for Docker Hub if empty
-  REGISTRY: ghcr.io
+  GITHUB_REGISTRY: ghcr.io
+  DOCKER_REGISTRY: docker.io
   # github.repository as <account>/<repo>
   IMAGE_NAME: ${{ github.repository }}
 
@@ -45,7 +46,7 @@ jobs:
           fi
 
   # Push image to GitHub Packages.
-  push:
+  push-to-github-packages:
 
     # Ensure test job passes before pushing image.
     needs: test
@@ -67,11 +68,11 @@ jobs:
 
       # Login against a Docker registry except on PR
       # https://github.com/docker/login-action
-      - name: Log into registry ${{ env.REGISTRY }}
+      - name: Log into registry ${{ env.GITHUB_REGISTRY }}
         if: github.event_name != 'pull_request'
         uses: docker/login-action@v1
         with:
-          registry: ${{ env.REGISTRY }}
+          registry: ${{ env.GITHUB_REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
@@ -81,7 +82,57 @@ jobs:
         id: meta
         uses: docker/metadata-action@v3
         with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          images: ${{ env.GITHUB_REGISTRY }}/${{ env.IMAGE_NAME }}
+
+      # Build and push Docker image with Buildx (don't push on PR)
+      # https://github.com/docker/build-push-action
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+
+  # Push image to Docker Hub.
+  push-to-docker-hub:
+
+    # Ensure test job passes before pushing image.
+    needs: test
+
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      # Login against a Docker registry except on PR
+      # https://github.com/docker/login-action
+      - name: Log into registry ${{ env.DOCKER_REGISTRY }}
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v1
+        with:
+          registry: ${{ env.DOCKER_REGISTRY }}
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      # Extract metadata (tags, labels) for Docker
+      # https://github.com/docker/metadata-action
+      - name: Extract Docker metadata
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          images: ${{ env.IMAGE_NAME }}
 
       # Build and push Docker image with Buildx (don't push on PR)
       # https://github.com/docker/build-push-action
@@ -92,4 +143,4 @@ jobs:
           platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
+          labels: ${{ steps.meta.outputs.labels }}

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "clownbot",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "description": "A telegram bot to cheer up conversations in own chat groups",
   "main": "bot.js",
   "scripts": {

package.json

@@ -3,8 +3,6 @@
  * =====================
  * If i write "hi" bot response "hello"
  */
-const { Markup } = require('telegraf');
-
 module.exports = function (bot, info, config, auth) {
 
 	bot.hears(/\bping\b/i, (ctx) => {
@@ -63,22 +61,34 @@ module.exports = function (bot, info, config, auth) {
 
 	bot.hears(/(spara|kill|shoot)/i, (ctx) => {
 		if(auth(ctx)) {
+
+			// Set keyboard for telegram message
+			const inlineMessageKeyboard = [[
+				{ text: 'Shoot!', callback_data: 'shoot' }
+			]];
+
+			// Send message with keyboard
 			ctx.replyWithAnimation(
-				'https://media.giphy.com/media/26xopsR7cWySdKNgY/giphy.gif',
-				Markup.inlineKeyboard([
-					Markup.callbackButton('Shoot!', 'shoot')
-				]).extra()
+				'https://media.giphy.com/media/26xopsR7cWySdKNgY/giphy.gif', {
+					reply_markup: JSON.stringify({ inline_keyboard: inlineMessageKeyboard })
+				}
 			);
 		}
 	});
 
 	bot.hears(/(boo*om|bomba|bomb|explosion|esplosione)/i, (ctx) => {
 		if(auth(ctx)) {
+
+			// Set keyboard for telegram message
+			const inlineMessageKeyboard = [[
+				{ text: 'Boom!', callback_data: 'boom' }
+			]];
+
+			// Send message with keyboard
 			ctx.replyWithAnimation(
-				'https://media.giphy.com/media/3o7qEcqN5PjN90jNC0/source.gif',
-				Markup.inlineKeyboard([
-					Markup.callbackButton('Boom!', 'boom')
-				]).extra()
+				'https://media.giphy.com/media/3o7qEcqN5PjN90jNC0/source.gif', {
+					reply_markup: JSON.stringify({ inline_keyboard: inlineMessageKeyboard })
+				}
 			);
 		}
 	});