self/b-jokes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: self:40287c4e14fb6ff6f2de9cea3c506b133bf1a22a
Branches Tags
self:master self:prod self:dev
...
compare: self:dev
Branches Tags
self:prod self:master self:dev

5 Commits
40287c4e14 ... dev

Author SHA1 Message Date
emmatveev
330848ceeb Merge pull request 'master' (#8) from master into dev 
Reviewed-on: #8
 2025-09-12 20:42:51 +03:00
emmatveev
8cdf0cbd8d Update .deploy/deploy-prod.yaml
All checks were successful
Deploy Dev / Build (pull_request) Successful in 1m20s
Details
Deploy Dev / Push (pull_request) Successful in 22s
Details
Deploy Dev / Deploy dev (pull_request) Successful in 29s
Details
2025-09-12 20:42:31 +03:00
emmatveev
6a1f2d3d09 Update .deploy/deploy-dev.yaml 2025-09-12 20:42:09 +03:00
emmatveev
3fa0b815f3 Merge pull request 'fix' (#7) from master into dev 
Reviewed-on: #7
 2025-07-08 01:07:33 +03:00
Egor Matveev
6509e58b6e fix
All checks were successful
Deploy Dev / Build (pull_request) Successful in 6s
Details
Deploy Dev / Push (pull_request) Successful in 12s
Details
Deploy Dev / Deploy dev (pull_request) Successful in 19s
Details
2025-07-08 02:05:25 +04:00
3 changed files with 7 additions and 6 deletions
Expand all files Collapse all files

6
.deploy/deploy-dev.yaml
View File

@@ -21,7 +21,7 @@ services:
networks: networks:
- b-jokes-net - b-jokes-net
environment: environment:
MONGO_HOST: "mongo.develop.sprinthub.ru" MONGO_HOST: "mongo.dev.chocomarsh.com"
MONGO_PASSWORD: $MONGO_PASSWORD_DEV MONGO_PASSWORD: $MONGO_PASSWORD_DEV
command: api command: api
deploy: deploy:
@@ -35,7 +35,7 @@ services:
poll: poll:
image: mathwave/sprint-repo:b-jokes image: mathwave/sprint-repo:b-jokes
environment: environment:
MONGO_HOST: "mongo.develop.sprinthub.ru" MONGO_HOST: "mongo.dev.chocomarsh.com"
MONGO_PASSWORD: $MONGO_PASSWORD_DEV MONGO_PASSWORD: $MONGO_PASSWORD_DEV
command: poll command: poll
deploy: deploy:
@@ -49,7 +49,7 @@ services:
bot: bot:
image: mathwave/sprint-repo:b-jokes image: mathwave/sprint-repo:b-jokes
environment: environment:
MONGO_HOST: "mongo.develop.sprinthub.ru" MONGO_HOST: "mongo.dev.chocomarsh.com"
MONGO_PASSWORD: $MONGO_PASSWORD_DEV MONGO_PASSWORD: $MONGO_PASSWORD_DEV
STAGE: "development" STAGE: "development"
command: bot command: bot

6
.deploy/deploy-prod.yaml
View File

@@ -21,7 +21,7 @@ services:
networks: networks:
- b-jokes-net - b-jokes-net
environment: environment:
MONGO_HOST: "mongo.sprinthub.ru" MONGO_HOST: "mongo.chocomarsh.com"
MONGO_PASSWORD: $MONGO_PASSWORD_PROD MONGO_PASSWORD: $MONGO_PASSWORD_PROD
DEBUG: "false" DEBUG: "false"
command: api command: api
@@ -36,7 +36,7 @@ services:
poll: poll:
image: mathwave/sprint-repo:b-jokes image: mathwave/sprint-repo:b-jokes
environment: environment:
MONGO_HOST: "mongo.sprinthub.ru" MONGO_HOST: "mongo.chocomarsh.com"
MONGO_PASSWORD: $MONGO_PASSWORD_PROD MONGO_PASSWORD: $MONGO_PASSWORD_PROD
DEBUG: "false" DEBUG: "false"
command: poll command: poll
@@ -51,7 +51,7 @@ services:
bot: bot:
image: mathwave/sprint-repo:b-jokes image: mathwave/sprint-repo:b-jokes
environment: environment:
MONGO_HOST: "mongo.sprinthub.ru" MONGO_HOST: "mongo.chocomarsh.com"
MONGO_PASSWORD: $MONGO_PASSWORD_PROD MONGO_PASSWORD: $MONGO_PASSWORD_PROD
STAGE: "production" STAGE: "production"
command: bot command: bot

1
main.py
View File

@@ -55,6 +55,7 @@ def bot():
text = payload.get('text') text = payload.get('text')
if not text: if not text:
return return
text = text.lower()
for word in configurator.get_config('words'): for word in configurator.get_config('words'):
if word in text: if word in text:
mes = 'Держи шутку!\n' + get_random() mes = 'Держи шутку!\n' + get_random()