1
0
mirror of https://github.com/eternnoir/pyTelegramBotAPI.git synced 2023-08-10 21:12:57 +03:00

Fixing and upgrading next step and reply handlers. + minor fixes

Rename telebot package to pytelegrambotapi becouse lib named telebot exists and it raising many errors

Add methods:
|     register_for_reply_by_message_id,
|     register_next_step_handler_by_chat_id,
|     clear_reply_handlers,
|     clear_reply_handlers_by_message_id
This commit is contained in:
Waffle
2018-04-12 13:45:32 +03:00
parent 373d4d37ff
commit 7957bc45a8
17 changed files with 192 additions and 155 deletions

View File

@ -9,7 +9,7 @@ import ssl
from aiohttp import web
import telebot
import pytelegrambotapi
API_TOKEN = '<api_token>'
@ -33,10 +33,10 @@ WEBHOOK_URL_BASE = "https://{}:{}".format(WEBHOOK_HOST, WEBHOOK_PORT)
WEBHOOK_URL_PATH = "/{}/".format(API_TOKEN)
logger = telebot.logger
telebot.logger.setLevel(logging.INFO)
logger = pytelegrambotapi.logger
pytelegrambotapi.logger.setLevel(logging.INFO)
bot = telebot.TeleBot(API_TOKEN)
bot = pytelegrambotapi.TeleBot(API_TOKEN)
app = web.Application()
@ -45,7 +45,7 @@ app = web.Application()
async def handle(request):
if request.match_info.get('token') == bot.token:
request_body_dict = await request.json()
update = telebot.types.Update.de_json(request_body_dict)
update = pytelegrambotapi.types.Update.de_json(request_body_dict)
bot.process_new_updates([update])
return web.Response()
else:

View File

@ -5,7 +5,7 @@
# It echoes any incoming text messages and does not use the polling method.
import cherrypy
import telebot
import pytelegrambotapi
import logging
@ -30,10 +30,10 @@ WEBHOOK_URL_BASE = "https://%s:%s" % (WEBHOOK_HOST, WEBHOOK_PORT)
WEBHOOK_URL_PATH = "/%s/" % (API_TOKEN)
logger = telebot.logger
telebot.logger.setLevel(logging.INFO)
logger = pytelegrambotapi.logger
pytelegrambotapi.logger.setLevel(logging.INFO)
bot = telebot.TeleBot(API_TOKEN)
bot = pytelegrambotapi.TeleBot(API_TOKEN)
# WebhookServer, process webhook calls
@ -45,7 +45,7 @@ class WebhookServer(object):
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)
update = pytelegrambotapi.types.Update.de_json(json_string)
bot.process_new_updates([update])
return ''
else:

View File

@ -6,7 +6,7 @@
import BaseHTTPServer
import ssl
import telebot
import pytelegrambotapi
import logging
@ -31,10 +31,10 @@ WEBHOOK_URL_BASE = "https://%s:%s" % (WEBHOOK_HOST, WEBHOOK_PORT)
WEBHOOK_URL_PATH = "/%s/" % (API_TOKEN)
logger = telebot.logger
telebot.logger.setLevel(logging.INFO)
logger = pytelegrambotapi.logger
pytelegrambotapi.logger.setLevel(logging.INFO)
bot = telebot.TeleBot(API_TOKEN)
bot = pytelegrambotapi.TeleBot(API_TOKEN)
# WebhookHandler, process webhook calls
@ -59,7 +59,7 @@ class WebhookHandler(BaseHTTPServer.BaseHTTPRequestHandler):
self.send_response(200)
self.end_headers()
update = telebot.types.Update.de_json(json_string)
update = pytelegrambotapi.types.Update.de_json(json_string)
bot.process_new_messages([update.message])
else:
self.send_error(403)

View File

@ -5,7 +5,7 @@
# It echoes any incoming text messages and does not use the polling method.
import flask
import telebot
import pytelegrambotapi
import logging
@ -30,10 +30,10 @@ WEBHOOK_URL_BASE = "https://%s:%s" % (WEBHOOK_HOST, WEBHOOK_PORT)
WEBHOOK_URL_PATH = "/%s/" % (API_TOKEN)
logger = telebot.logger
telebot.logger.setLevel(logging.INFO)
logger = pytelegrambotapi.logger
pytelegrambotapi.logger.setLevel(logging.INFO)
bot = telebot.TeleBot(API_TOKEN)
bot = pytelegrambotapi.TeleBot(API_TOKEN)
app = flask.Flask(__name__)
@ -49,7 +49,7 @@ def index():
def webhook():
if flask.request.headers.get('content-type') == 'application/json':
json_string = flask.request.get_data().decode('utf-8')
update = telebot.types.Update.de_json(json_string)
update = pytelegrambotapi.types.Update.de_json(json_string)
bot.process_new_updates([update])
return ''
else:

View File

@ -1,10 +1,10 @@
import os
import telebot
import pytelegrambotapi
from flask import Flask, request
TOKEN = '<api_token>'
bot = telebot.TeleBot(TOKEN)
bot = pytelegrambotapi.TeleBot(TOKEN)
server = Flask(__name__)
@ -20,7 +20,7 @@ def echo_message(message):
@server.route('/' + TOKEN, methods=['POST'])
def getMessage():
bot.process_new_updates([telebot.types.Update.de_json(request.stream.read().decode("utf-8"))])
bot.process_new_updates([pytelegrambotapi.types.Update.de_json(request.stream.read().decode("utf-8"))])
return "!", 200

View File

@ -4,7 +4,7 @@
# This example shows webhook echo bot with Tornado web framework
# Documenation to Tornado: http://tornadoweb.org
import telebot
import pytelegrambotapi
import tornado.web
import tornado.ioloop
import tornado.httpserver
@ -27,7 +27,7 @@ WEBHOOK_URL_BASE = "https://{0}:{1}/{2}".format(WEBHOOK_HOST, str(WEBHOOK_PORT),
# When asked for "Common Name (e.g. server FQDN or YOUR name)" you should reply
# with the same value in you put in WEBHOOK_HOST
bot = telebot.TeleBot(API_TOKEN)
bot = pytelegrambotapi.TeleBot(API_TOKEN)
class Root(tornado.web.RequestHandler):
def get(self):
@ -45,7 +45,7 @@ class webhook_serv(tornado.web.RequestHandler):
# length = int(self.request.headers['Content-Length'])
json_data = self.request.body.decode("utf-8")
update = telebot.types.Update.de_json(json_data)
update = pytelegrambotapi.types.Update.de_json(json_data)
bot.process_new_updates([update])
self.write("")
self.finish()