mirror of
https://github.com/Redume/Shirino.git
synced 2024-11-23 16:56:23 +03:00
Compare commits
No commits in common. "0c1a42791ad9be7acbe334d41436834d99d0fb1b" and "c07fba01ad69a77ce0411973e0a2fd2b5f2d7102" have entirely different histories.
0c1a42791a
...
c07fba01ad
5 changed files with 9 additions and 90 deletions
|
@ -1,6 +0,0 @@
|
||||||
.git/
|
|
||||||
.vscode/
|
|
||||||
.idea/
|
|
||||||
|
|
||||||
.DS_Store
|
|
||||||
__pycache__
|
|
49
.github/workflows/docker.yaml
vendored
49
.github/workflows/docker.yaml
vendored
|
@ -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
|
|
11
Dockerfile
11
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"]
|
|
|
@ -1,5 +0,0 @@
|
||||||
services:
|
|
||||||
shirino:
|
|
||||||
build: .
|
|
||||||
image: ghcr.io/shirino/shirino:latest
|
|
||||||
restart: unless-stopped
|
|
16
main.py
16
main.py
|
@ -26,12 +26,7 @@ async def currency(query: types.Message | types.InlineQuery) -> None:
|
||||||
conv = Converter()
|
conv = Converter()
|
||||||
|
|
||||||
if len(args) <= 1:
|
if len(args) <= 1:
|
||||||
try:
|
if query.chat.type not in ['supergroup', 'group']:
|
||||||
if query.chat.type in ['supergroup', 'group']:
|
|
||||||
return
|
|
||||||
except:
|
|
||||||
pass
|
|
||||||
|
|
||||||
return await reply(result_id,
|
return await reply(result_id,
|
||||||
"2 or 3 arguments are required.",
|
"2 or 3 arguments are required.",
|
||||||
"@shirino_bot USD RUB "
|
"@shirino_bot USD RUB "
|
||||||
|
@ -49,12 +44,7 @@ async def currency(query: types.Message | types.InlineQuery) -> None:
|
||||||
from_currency_alias = args[0].lower()
|
from_currency_alias = args[0].lower()
|
||||||
conv_currency_alias = args[1].lower()
|
conv_currency_alias = args[1].lower()
|
||||||
else:
|
else:
|
||||||
try:
|
if query.chat.type not in ['supergroup', 'group']:
|
||||||
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)
|
return await reply(result_id, 'The source and target currency could not be determined.', None, query)
|
||||||
|
|
||||||
from_currency, conv_currency = None, None
|
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,
|
is_personal=True,
|
||||||
)
|
)
|
||||||
else:
|
else:
|
||||||
await query.answer(f'{title} \n{desc}')
|
await query.answer(title)
|
||||||
|
|
||||||
|
|
||||||
async def main() -> None:
|
async def main() -> None:
|
||||||
|
|
Loading…
Add table
Reference in a new issue