Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
132 commits
Select commit Hold shift + click to select a range
898c8a7
created template for tele-bot project
loskutovanl Jul 1, 2022
169ae9f
deleted rapid-api-key
loskutovanl Jul 2, 2022
3e886d3
test_confic created and fill
VladimirKireev Jul 2, 2022
c547e93
test
Nickolaswux Jul 3, 2022
da6acee
test
Nickolaswux Jul 3, 2022
ccd9357
test
Nickolaswux Jul 3, 2022
fdb17bf
test
Nickolaswux Jul 3, 2022
dab0379
added import to make file visible
loskutovanl Jul 4, 2022
6df0588
renamed russian command to english to fix error
loskutovanl Jul 4, 2022
b4fc9a9
Merge pull request #1 from loskutovanl/Vladimir
loskutovanl Jul 4, 2022
8cc547b
aded functin check new_member and send helo
VladimirKireev Jul 5, 2022
8e2934d
add nvn.db
Nickolaswux Jul 6, 2022
9adb9f1
home test connect
Nickolaswux Jul 6, 2022
207a9d7
cosmetic changes
loskutovanl Jul 6, 2022
4416058
Merge pull request #2 from loskutovanl/Vladimir
loskutovanl Jul 6, 2022
2ec01d0
database added
loskutovanl Jul 6, 2022
e8a358e
added Dockerfile
loskutovanl Jul 6, 2022
86b7858
added instructions for insert\select to db
loskutovanl Jul 6, 2022
345e868
put sql commands into functions
loskutovanl Jul 7, 2022
1d5f4b1
lucky_list moved from default_handlers
loskutovanl Jul 7, 2022
7882248
Merge remote-tracking branch 'origin/main'
Nickolaswux Jul 7, 2022
15439f0
test
Nickolaswux Jul 8, 2022
ca213e9
database/command repair
Nickolaswux Jul 8, 2022
0250329
testing lucky_list.py
Nickolaswux Jul 8, 2022
a887a07
test database by vladimir
VladimirKireev Jul 8, 2022
685de79
Merge branch 'nickolaswux' into vladimir
VladimirKireev Jul 8, 2022
9934890
new nvn.db, test_cnfig update
VladimirKireev Jul 8, 2022
67de6e2
removed spaces
loskutovanl Jul 8, 2022
ccc894f
added Dockerfile and instructions to build and run containers
loskutovanl Jul 8, 2022
a238c6c
Merge remote-tracking branch 'origin/main'
loskutovanl Jul 8, 2022
d8eb50e
added count members check
VladimirKireev Jul 8, 2022
95065d1
Merge remote-tracking branch 'origin/main'
Nickolaswux Jul 8, 2022
43d095d
Merge remote-tracking branch 'origin/main'
Nickolaswux Jul 8, 2022
bddec5b
check count members, check new member is bot
VladimirKireev Jul 8, 2022
7850729
remove hello function from test_config
VladimirKireev Jul 8, 2022
4f7e234
cosmetic changes
VladimirKireev Jul 8, 2022
3ced8ec
added dtime, change insert_lite and insert in Test_config.py
VladimirKireev Jul 8, 2022
45fc35e
created template for setting-up admin settings
loskutovanl Jul 9, 2022
c88ab1c
deleted select_lite as it is not needed
loskutovanl Jul 9, 2022
b806c96
no changes
loskutovanl Jul 9, 2022
5288db7
added emoji in requirements.txt
loskutovanl Jul 9, 2022
0d6d789
deleted obsolete file
loskutovanl Jul 9, 2022
ce0ed8a
no changes
loskutovanl Jul 9, 2022
1c5c425
Merge pull request #3 from loskutovanl/Vladimir
loskutovanl Jul 9, 2022
8259e82
Merge remote-tracking branch 'origin/main'
Nickolaswux Jul 9, 2022
2b52844
nvn v2.db + new func in commands + lucky_list.py mod
Nickolaswux Jul 10, 2022
4247fca
testing lucky_list.py update nvn.db
Nickolaswux Jul 11, 2022
b8262ad
added abs func to fix issue
loskutovanl Jul 11, 2022
ddc489a
removed emoji, moved winners call
loskutovanl Jul 11, 2022
042aaa9
delete insert_lite, rename test_config.py to register_new_user.py, ad…
VladimirKireev Jul 11, 2022
feda311
Merge remote-tracking branch 'origin/Vladimir' into vladimir
VladimirKireev Jul 11, 2022
0db44a1
cosmetic changes
VladimirKireev Jul 11, 2022
a1ed759
buttons added ver1
VladimirKireev Jul 11, 2022
d03e325
Merge pull request #4 from loskutovanl/Vladimir
loskutovanl Jul 11, 2022
d70cb4c
added keyboards for admin commands
loskutovanl Jul 11, 2022
c0bac78
merged Natasha & Kolya changes
loskutovanl Jul 11, 2022
42e2578
added keyboard imports
loskutovanl Jul 11, 2022
e115f50
added admin import
loskutovanl Jul 11, 2022
049f709
updated admin commands
loskutovanl Jul 11, 2022
7c838fc
merged Natasha & Kolya inputs
loskutovanl Jul 11, 2022
56f9e00
merged Natasha & Kolya inputs
loskutovanl Jul 11, 2022
f487846
merged Natasha & Kolya inputs
loskutovanl Jul 11, 2022
2eab8c2
deleted old db
loskutovanl Jul 11, 2022
c05c301
Delete nvn.db
loskutovanl Jul 11, 2022
6d9054d
Merge branch 'main' into nickolaswux
loskutovanl Jul 11, 2022
05ad8e3
Merge pull request #6 from loskutovanl/nickolaswux
loskutovanl Jul 11, 2022
0345a0b
tried to fix conflicts
loskutovanl Jul 11, 2022
0345902
Merge pull request #7 from loskutovanl/nickolaswux
loskutovanl Jul 11, 2022
375a4b1
database.db add to main
Nickolaswux Jul 12, 2022
6d82cf1
database.db add to main
Nickolaswux Jul 12, 2022
6f175a4
delete nvn database, added database 'database'
VladimirKireev Jul 12, 2022
28289c7
change winer to winner, change in commands.py
VladimirKireev Jul 12, 2022
189c07d
button delete after solution about congratulation
VladimirKireev Jul 12, 2022
2c9ca5c
Delete nvn v2.db
loskutovanl Jul 12, 2022
04648e8
Delete database.db
loskutovanl Jul 12, 2022
214e440
tried to fix conflicts
loskutovanl Jul 12, 2022
5591876
Merge pull request #9 from loskutovanl/Vladimir
loskutovanl Jul 12, 2022
12fe775
Add files via upload
loskutovanl Jul 12, 2022
0d8ff32
luckulist ready
Nickolaswux Jul 13, 2022
ff4e4c2
Merge pull request #10 from loskutovanl/nickolaswux
loskutovanl Jul 13, 2022
4ebb445
added admin ids
loskutovanl Jul 13, 2022
c1c15ce
deleted emoji requirements
loskutovanl Jul 13, 2022
59136c5
added admin_ids
loskutovanl Jul 13, 2022
dbf018f
corrected callback
loskutovanl Jul 13, 2022
6ee9235
added commands for admin
loskutovanl Jul 13, 2022
07dcae8
amendments for admin keyabord
loskutovanl Jul 13, 2022
7ab3494
amendments for admin commands
loskutovanl Jul 13, 2022
64c11b9
amendments for admin commands
loskutovanl Jul 13, 2022
61b7f83
database.db add table temp_storage
Nickolaswux Jul 13, 2022
41ef0b2
winner_check update
VladimirKireev Jul 13, 2022
9672ed5
Merge branch 'main' into vladimir
VladimirKireev Jul 13, 2022
5e7fdbc
add emodji to requirments
Nickolaswux Jul 13, 2022
c10adab
select_id_from_user and temp_save was added to commands.py
VladimirKireev Jul 13, 2022
d750b73
minor changes
loskutovanl Jul 14, 2022
141b6e2
Merge remote-tracking branch 'origin/main'
loskutovanl Jul 14, 2022
af1277c
upd select_id_from_users, temp_save
VladimirKireev Jul 14, 2022
b9ec973
minor changes
loskutovanl Jul 14, 2022
502eeb4
temp_save is working
VladimirKireev Jul 14, 2022
ae78546
buttons_remover is working
VladimirKireev Jul 14, 2022
94ac530
buttons_remover is working v2
VladimirKireev Jul 14, 2022
d6a3e31
Aded storage cleaner
VladimirKireev Jul 14, 2022
8377a0b
finalized readme
loskutovanl Jul 15, 2022
db49eb8
upd register_new_user.py in provide to temp_save;
VladimirKireev Jul 15, 2022
dc60d04
is_winner_record working
VladimirKireev Jul 15, 2022
4de16a7
add delete button cicle
VladimirKireev Jul 15, 2022
3e64e46
delete print from is_winner_id_select action
VladimirKireev Jul 15, 2022
d24b198
bot message upd
VladimirKireev Jul 15, 2022
1f71001
finalized readme
loskutovanl Jul 15, 2022
041de8c
Merge pull request #11 from loskutovanl/Vladimir
loskutovanl Jul 15, 2022
b0b9676
fixed commands to be available only for moderator groups
loskutovanl Jul 19, 2022
3962c18
fixed description of adminsetup command
loskutovanl Jul 19, 2022
26bca1e
fixed admin commands to work with negative chat ids
loskutovanl Jul 19, 2022
9a2dd2f
Vova inputs merged
loskutovanl Jul 20, 2022
718c32f
added temp unceleb table
loskutovanl Jul 20, 2022
27ce499
added /unceleb command
loskutovanl Jul 20, 2022
14d9c4a
added commands for /unceleb and /lukylist
loskutovanl Jul 20, 2022
12e362e
changes to improce code readability
loskutovanl Jul 20, 2022
9b0ada8
put keyboards to deticated locations
loskutovanl Jul 20, 2022
a9ae2d2
added HAPPY_NUMBER
loskutovanl Jul 20, 2022
0867523
keyboards added
loskutovanl Jul 20, 2022
17146e9
minor changes
loskutovanl Jul 20, 2022
4b4c6e3
documentation added to commands
loskutovanl Jul 20, 2022
7f71478
logic completed and checked
loskutovanl Jul 20, 2022
dc06c4c
WIP
loskutovanl Jul 20, 2022
2e001cd
adde documentation and fixed some conflicts
loskutovanl Jul 20, 2022
744c36d
adde documentation and fixed some conflicts
loskutovanl Jul 20, 2022
d019da4
adde documentation
loskutovanl Jul 20, 2022
656e985
added message in case of empty lists
loskutovanl Jul 20, 2022
b0d3580
fixed get_all_moderator_id
loskutovanl Jul 20, 2022
23de8f6
fixed get_all_moderator_id
loskutovanl Jul 20, 2022
ea41499
fixed multiple issues
loskutovanl Jul 20, 2022
bb788be
fixed multiple issues and prepaired everything for finall pull request
loskutovanl Jul 21, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
Binary file not shown.
2 changes: 2 additions & 0 deletions .env.template
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
BOT_TOKEN="Ваш токен для бота, полученный от @BotFather"
ADMIN_IDS='["user_id первого админа", "user_id второго админа", "user_id третьего админа"]'
131 changes: 131 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]
*$py.class

# C extensions
*.so

# Distribution / packaging
.Python
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
pip-wheel-metadata/
share/python-wheels/
*.egg-info/
.installed.cfg
*.egg
MANIFEST

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.nox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*.cover
*.py,cover
.hypothesis/
.pytest_cache/

# Translations
*.mo
*.pot

# Django stuff:
*.log
local_settings.py
db.sqlite3
db.sqlite3-journal

# Flask stuff:
instance/
.webassets-cache

# Scrapy stuff:
.scrapy

# Sphinx documentation
docs/_build/

# PyBuilder
target/

# Jupyter Notebook
.ipynb_checkpoints

# IPython
profile_default/
ipython_config.py

# pyenv
.python-version

# pipenv
# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
# However, in case of collaboration, if having platform-specific dependencies or dependencies
# having no cross-platform support, pipenv may install dependencies that don't work, or not
# install all needed dependencies.
#Pipfile.lock

# PEP 582; used by e.g. github.com/David-OConnor/pyflow
__pypackages__/

# Celery stuff
celerybeat-schedule
celerybeat.pid

# SageMath parsed files
*.sage.py

# Environments
.venv
*/.env
env/
venv/
ENV/
env.bak/
venv.bak/

# Spyder project settings
.spyderproject
.spyproject

# Rope project settings
.ropeproject

# mkdocs documentation
/site

# mypy
.mypy_cache/
.dmypy.json
dmypy.json

# Pyre type checker
.pyre/
.idea/*
.env
11 changes: 11 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# создаем образ
FROM python:3.9-alpine3.16

#копируем все файлы в директорию /app докер-контейнера
COPY . /app

# устанавливаем все необходимые зависимости для работы приложения
RUN pip install -r /app/requirements.txt

# запускаем приложение
CMD [ "python", "/app/main.py" ]
178 changes: 178 additions & 0 deletions README.md

Large diffs are not rendered by default.

Empty file added __init__.py
Empty file.
Empty file added config_data/__init__.py
Empty file.
21 changes: 21 additions & 0 deletions config_data/config.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import os
from dotenv import load_dotenv, find_dotenv

if not find_dotenv():
exit('Переменные окружения не загружены т.к отсутствует файл .env')
else:
load_dotenv()

BOT_TOKEN = os.getenv('BOT_TOKEN')
ADMIN_IDS = os.getenv('ADMIN_IDS')
HAPPY_NUMBER = 500

DEFAULT_COMMANDS = (
('start', "Запустить бота"),
('help', "Вывести справку"),
('adminsetup', "Установить настройки админки"),
('adminshow', "Вывести текущие настройки админки"),
('luckylist', "Запросить юбилейный список"),
('unceleb', "Вывести последних не поздравленных"),

)
Binary file added database/.DS_Store
Binary file not shown.
Empty file added database/__init__.py
Empty file.
Loading