Skip to content
Open

1 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
95 commits
Select commit Hold shift + click to select a range
73ffaf6
news bots
May 11, 2017
2b9b2b6
1
May 11, 2017
4fdad1f
1
May 11, 2017
a3fc411
1
May 11, 2017
5a79f56
1
May 11, 2017
6084530
1
May 11, 2017
5b7ab46
1
May 11, 2017
8ed126d
1
May 11, 2017
5f7f575
1
May 11, 2017
a0a58f5
1
May 11, 2017
2b38178
1
May 11, 2017
66f17da
1
May 11, 2017
fdbb31a
1
May 12, 2017
cb25488
1
May 12, 2017
cadd8ab
1
May 12, 2017
90a23c1
1
May 12, 2017
89360ad
1
May 12, 2017
74124c5
1
May 12, 2017
693f107
1
May 12, 2017
0ec6440
1
May 12, 2017
caee456
1
May 12, 2017
f28a5d5
1
May 12, 2017
383ffaf
1
May 12, 2017
5c9ce43
1
May 12, 2017
979ac3a
1
May 12, 2017
4261ddf
1
May 12, 2017
7e7f2e3
1
May 12, 2017
9d46973
1
May 12, 2017
9f7a4fb
1
May 12, 2017
45fe395
1
May 12, 2017
a5dd64a
1
May 12, 2017
485f8aa
1
May 12, 2017
cc116b5
1
May 12, 2017
9d716d9
1
May 12, 2017
5b60137
1
May 12, 2017
28f307c
1
May 12, 2017
5ae962f
1
May 12, 2017
1fa943c
1
May 13, 2017
58bd7fa
1
May 13, 2017
fd655e1
1
May 13, 2017
5f7e65a
1
May 13, 2017
1317cca
1
May 13, 2017
5da765e
1
May 13, 2017
00ae7f4
1
May 13, 2017
e93f988
1
May 13, 2017
e48337d
1
May 13, 2017
d626606
1
May 13, 2017
8f832dd
1
May 13, 2017
844772f
1
May 13, 2017
bc7618c
1
May 13, 2017
75ab364
1
May 13, 2017
633e7d9
1
May 13, 2017
c81a53f
1
May 13, 2017
bdde4f7
1
May 13, 2017
afe2c80
1
May 13, 2017
af5aa5b
1
May 13, 2017
fa32165
1
May 13, 2017
909622c
1
May 13, 2017
ec8df0f
1
May 13, 2017
db8fefe
1
May 13, 2017
c5e31d4
1
May 13, 2017
e325639
1
May 13, 2017
b7786a0
1
May 13, 2017
551e507
1
May 13, 2017
9e1dc75
1
May 13, 2017
dc1f51d
1
May 13, 2017
a7799d5
1
May 13, 2017
9f5bb09
1
May 13, 2017
f6bc662
1
May 13, 2017
aeaa36a
1
May 13, 2017
1146b72
1
May 13, 2017
23a3995
1
May 13, 2017
76cd0ca
1
May 13, 2017
affe2d8
1
May 13, 2017
9f57e4c
1
May 13, 2017
6bea36f
1
May 13, 2017
285d326
1
May 13, 2017
27c54be
1
May 13, 2017
0a92f67
1
May 13, 2017
abc6cf2
1
May 13, 2017
5b0ad0f
1
May 13, 2017
316caf8
1
May 13, 2017
1abb235
1
May 13, 2017
3e982b5
1
May 13, 2017
2fd6f90
1
May 13, 2017
8bce8aa
1
May 13, 2017
ff2a6fe
1
May 13, 2017
e37ac61
1
May 13, 2017
a94a8d8
1
May 13, 2017
0f831ad
1
May 13, 2017
6b5ed45
2
May 17, 2017
8d94397
2
May 17, 2017
00ecb57
2
May 17, 2017
4383a8b
2
May 17, 2017
0c60a09
2
May 17, 2017
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
4 changes: 4 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions .idea/telegram-bot-example.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

430 changes: 430 additions & 0 deletions .idea/workspace.xml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Procfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
web: gunicorn app.main:api --workers 4
web: python3 main.py
Empty file removed app/__init__.py
Empty file.
1 change: 0 additions & 1 deletion app/classes/__init__.py

This file was deleted.

13 changes: 0 additions & 13 deletions app/classes/chat.py

This file was deleted.

7 changes: 0 additions & 7 deletions app/main.py

This file was deleted.

3 changes: 0 additions & 3 deletions app/resources/__init__.py

This file was deleted.

22 changes: 0 additions & 22 deletions app/resources/hook.py

This file was deleted.

7 changes: 0 additions & 7 deletions app/resources/main.py

This file was deleted.

16 changes: 0 additions & 16 deletions app/resources/set_webhook.py

This file was deleted.

5 changes: 0 additions & 5 deletions app/settings.py

This file was deleted.

35 changes: 35 additions & 0 deletions main.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import os
import telebot
import cherrypy
import time

token = "320545030:AAF8okRjCqGkFoylEamUGuN4V9v60StAvgQ"

WEBHOOK_HOST = '0.0.0.0'
WEBHOOK_PORT = int(os.environ.get('PORT', 5000))
WEBHOOK_LISTEN = '0.0.0.0'

bot = telebot.TeleBot(token)


class WebhookServer(object):
@cherrypy.expose
def index(self):
return 0


bot.remove_webhook()

time.sleep(5)


bot.set_webhook("https://myboot1.herokuapp.com/" + token)


cherrypy.config.update({
'server.socket_host': '0.0.0.0',
'server.socket_port': int(os.environ.get('PORT', 5000)),
})


cherrypy.quickstart(WebhookServer(), "https://myboot1.herokuapp.com/" + token)
13 changes: 3 additions & 10 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
certifi==2016.2.28
falcon==1.0.0
future==0.15.2
gunicorn==19.3.0
peewee==2.8.1
python-mimeparse==1.5.2
python-telegram-bot==4.3.2
six==1.10.0
urllib3==1.16
wheel==0.24.0
pyTelegramBotAPI==2.3.2
cherrypy
Flask==0.12.0
1 change: 0 additions & 1 deletion runtime.txt

This file was deleted.

42 changes: 42 additions & 0 deletions test.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
import cherrypy
import os
import telebot

token = "320545030:AAF8okRjCqGkFoylEamUGuN4V9v60StAvgQ"

WEBHOOK_HOST = '0.0.0.0'
WEBHOOK_PORT = 5000
WEBHOOK_LISTEN = '0.0.0.0'

WEBHOOK_URL_BASE = "https://%s:%s" % (WEBHOOK_HOST, WEBHOOK_PORT)
WEBHOOK_URL_PATH = "/%s/" % (token)

bot = telebot.TeleBot(token)
class WebhookServer(object):
@cherrypy.expose
def index(self):
if 'content-length' in cherrypy.request.headers and \
'content-type' in cherrypy.request.headers and \
cherrypy.request.headers['content-type'] == 'application/json':
length = int(cherrypy.request.headers['content-length'])
json_string = cherrypy.request.body.read(length).decode("utf-8")
update = telebot.types.Update.de_json(json_string)

bot.process_new_updates([update])
return ''
else:
raise cherrypy.HTTPError(403)
@bot.message_handler(func=lambda message: True, content_types=['text'])
def echo_message(message):
bot.reply_to(message, message.text)




cherrypy.config.update({
'server.socket_host': '0.0.0.0',
'server.socket_port': int(os.environ.get('PORT', 5000)),
})


cherrypy.quickstart(WebhookServer(), WEBHOOK_URL_PATH, {'/bot': {}})
23 changes: 23 additions & 0 deletions webhook_cert.pem
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
-----BEGIN CERTIFICATE-----
MIIDzzCCAregAwIBAgIJAOxioDn/TPeAMA0GCSqGSIb3DQEBCwUAMH4xCzAJBgNV
BAYTAmRmMQ0wCwYDVQQIDARkZmRmMQwwCgYDVQQHDANkZmYxDDAKBgNVBAoMA2Rm
ZDEMMAoGA1UECwwDZGZkMR4wHAYDVQQDDBVteWJvb3QxLmhlcm9rdWFwcC5jb20x
FjAUBgkqhkiG9w0BCQEWB3NkZmRzZmQwHhcNMTcwNTEzMTk1NjE4WhcNMjcwNTEx
MTk1NjE4WjB+MQswCQYDVQQGEwJkZjENMAsGA1UECAwEZGZkZjEMMAoGA1UEBwwD
ZGZmMQwwCgYDVQQKDANkZmQxDDAKBgNVBAsMA2RmZDEeMBwGA1UEAwwVbXlib290
MS5oZXJva3VhcHAuY29tMRYwFAYJKoZIhvcNAQkBFgdzZGZkc2ZkMIIBIjANBgkq
hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzxD4IqyGIqxx/VxeP21ieEK/W4XxmIAO
LPLM4kOROGDKkq/aaDLju4KRtC7RqFHrI2s6qpY1q1FNrO9o209Q5nes5v4HxhOg
BBCr3HpbwNDcYdEg6QRifPiQ+l2meOMvO6Kr/Yfs4ttwo4zwZ9hV+CDSkpsEtlM7
TlQcpDTB1wdTjrWuNcdLs9MXuL35WlWsD4qY5h+1yLO4h6Q4WeZoRrEFyHtpgJy9
yEqAlyKVfgRhAvZAA4vXUUw9YWfy+azYcZKxBwBi6AQ44a5IzAoNrrZlZXWt3snv
FNicB9z7hpl7VHT41kIHw8+Hmz0BjEbjFmL9yUtZ9KvNlNJ/ryqLZwIDAQABo1Aw
TjAdBgNVHQ4EFgQU5Ng5PdYpSOz1JTu+rWjgu9vz7g8wHwYDVR0jBBgwFoAU5Ng5
PdYpSOz1JTu+rWjgu9vz7g8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOC
AQEAUWcXFT5SNh1sxYOYd3Wk90sbxlv5aNx1CB3ez8ee8w/Pnccv8RqgHVij8WqC
vJTWxc/N74oeY3w1fVi9go8tKlUC8uGS7buovWlEQHVBMK5LGu0AtYPGV5SBiy8I
9LnOdm4XMf8YPpb0mIIaZuasEjlxAmHh7W1Rv/oq/3O8G24LozJXuCgYqhwkF1Gy
GBwa/tu/kinfc7TWwihhxllYUXG00nUvTISEn7vtzIVg0z+ju5b3ndXt99B4VwD+
DcMt4tr8T9znslTtzw9mpbV2err6Fb4K0yKcfKkEbEkqQgtDxKdAm32Q7MY7DceC
6vyl0Q/snHVh47rXgYU+D2sygA==
-----END CERTIFICATE-----
27 changes: 27 additions & 0 deletions webhook_pkey.pem
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
MIIEpAIBAAKCAQEAzxD4IqyGIqxx/VxeP21ieEK/W4XxmIAOLPLM4kOROGDKkq/a
aDLju4KRtC7RqFHrI2s6qpY1q1FNrO9o209Q5nes5v4HxhOgBBCr3HpbwNDcYdEg
6QRifPiQ+l2meOMvO6Kr/Yfs4ttwo4zwZ9hV+CDSkpsEtlM7TlQcpDTB1wdTjrWu
NcdLs9MXuL35WlWsD4qY5h+1yLO4h6Q4WeZoRrEFyHtpgJy9yEqAlyKVfgRhAvZA
A4vXUUw9YWfy+azYcZKxBwBi6AQ44a5IzAoNrrZlZXWt3snvFNicB9z7hpl7VHT4
1kIHw8+Hmz0BjEbjFmL9yUtZ9KvNlNJ/ryqLZwIDAQABAoIBACsaMyy0kO9iyg+d
TJkTYe36pu6cQSAnd8vvdqqauf3sV/6U0HfkL/d2RHInVMke1D15MqsTvXQ95ldb
No6AQizXOIyU0HVw3Fw8RCoO5k6Kq3VJHPqkSQQOkc8r810ynUBiqj6KLstCNn40
9k4HgE24N10BG8gAJ1Y0uAmOWdMyeQxQCWWj9AeGKv7HO4FypNkD7ieRpE/idTxD
yNgHxmUDaD0LeL6KnukD1GqqaGQLaXdhSisdI8M7AzGd8jbR0Xws8deX0nD7HoUE
MtSc+hSaZhbKmW5Bek8sEg5zx2ZixlWQcyNd8tCWoNbD7ylUPv9FcqidH0Cbog+y
7KvWYHECgYEA+c7lh+MVfpry+atK2hQZEed0DlDqtcpEcS3yaXrtzTBsNfAOX0MP
gXGHAtppaXj4Sm2tdxgGLqpnOCaxr/Db6mcx7pEp6hZls7nfIIfLKJV8nXaBT5ev
FJiYpGgO95dQYxAkXH/OyUQciuWVhXXEJrfWCnL8kOjMZAdVE1PhQeMCgYEA1DLc
/aUzQJcgZgUAO+XamlAoHxpfExsrSe0sQF5gtZG2ZSxjeThFj71vW2MLwhkq6RSd
A2LPINt2EgQB9yHPr4OFPVPECyNB+kmmGeB90ldBdj5IUkBx4Kpxj3cpXnTuQYHZ
7IuS6sG6F146y74saHVvrXP2I6bSfTGrlGNV960CgYAvYyAHdvxM1/ffhK7eT5Gx
48YQMSlU8tmo3p5tg/Q4SEc+tBsF1yLJ209RKz1z1I7FD6koPlZt48VQ0YZDad1N
yeWe68qXrUf9n/TDpv7S5AiPljtRbeS4c3oBNfwg24NUR2ueYGBJrbH8ZzDF8GEV
NypTMRzYIFElaH6q++5vIQKBgQDAKAss+fNukyw4lmC+3QfXY6zhdY0RDTJnMIo5
A/4Jjhkgh1DRDd8YKlBz7j5Ql1/fT9ZboZe1xmamK9DnzUt4Qd5fScKm31e44gaz
OjJWTsOt4vq02T0GWPKbGypwKe0zjvYcGcyCH8p3rNILfHxUX7ww02jaog/MZTVe
G5JWxQKBgQDHmcPUofzaqQqOYxEeplUSYTB6rHz3PyV6109CSYiLbpV2eCI9+6y/
TtPVj4x0SG6IdLCbmleOOwuGY/lsdIEzRvtbjokj+Xk0Jl/dwpJP6Lmcm/v4mSNE
KERoEYUNb3oA3UA9vws+Izvec7G+smS0DfzTmY1aaELC1V86LUNQew==
-----END RSA PRIVATE KEY-----