.dockerignore

@@ -1,6 +0,0 @@
-.git/
-.vscode/
-.idea/
-
-.DS_Store
-__pycache__

.github/workflows/docker.yaml

@@ -1,49 +0,0 @@
-name: Create and publish a Docker image
-
-on:
-  push:
-    branches:
-      - main
-  release:
-    types:
-      - published
-
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: ${{ github.repository }}
-
-jobs:
-  build-and-push-image:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Log in to the Container registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          platforms: linux/amd64,linux/arm64

Dockerfile

@@ -1,11 +0,0 @@
-FROM python:3.12
-
-WORKDIR /shirino
-
-COPY ./requirements.txt .
-
-RUN pip3 install --no-cache-dir --upgrade -r ./requirements.txt
-
-COPY ./ /shirino/
-
-CMD ["python", "main.py"]

docker-compose.yaml

@@ -1,5 +0,0 @@
-services:
-  shirino:
-    build: .
-    image: ghcr.io/shirino/shirino:latest
-    restart: unless-stopped

main.py

@@ -26,17 +26,12 @@ async def currency(query: types.Message | types.InlineQuery) -> None:
         conv = Converter()
 
         if len(args) <= 1:
-            try:
-                if query.chat.type in ['supergroup', 'group']:
-                    return
-            except:
-                pass
-
-            return await reply(result_id,
-                            "2 or 3 arguments are required.",
-                            "@shirino_bot USD RUB "
-                            "\n@shirino_bot 12 USD RUB",
-                            query)
+            if query.chat.type not in ['supergroup', 'group']:
+                return await reply(result_id,
+                                   "2 or 3 arguments are required.",
+                                   "@shirino_bot USD RUB "
+                                   "\n@shirino_bot 12 USD RUB",
+                                   query)
         if len(args) == 4:
             conv.amount = float(args[0])
             from_currency_alias = args[1].lower()
@@ -49,13 +44,8 @@ async def currency(query: types.Message | types.InlineQuery) -> None:
             from_currency_alias = args[0].lower()
             conv_currency_alias = args[1].lower()
         else:
-            try:
-                if query.chat.type in ['supergroup', 'group']:
-                    return
-            except:
-                pass
-            
-            return await reply(result_id, 'The source and target currency could not be determined.', None, query)
+            if query.chat.type not in ['supergroup', 'group']:
+                return await reply(result_id, 'The source and target currency could not be determined.', None, query)
 
         from_currency, conv_currency = None, None
 
@@ -103,7 +93,7 @@ async def reply(result_id: str | None, title: str | None, desc, query: types.Inl
             is_personal=True,
         )
     else:
-        await query.answer(f'{title} \n{desc}')
+        await query.answer(title)
 
 
 async def main() -> None: