From 33631e2b94957a0de8ae84d177f82e2b3bfd006e Mon Sep 17 00:00:00 2001 From: Ching Date: Wed, 19 Jan 2022 09:35:45 +0800 Subject: [PATCH] =?UTF-8?q?fix(dodo):=20=E4=BF=AE=E5=A4=8D=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E5=98=9F=E6=96=87=E6=97=B6=E6=8A=A5=E9=94=99=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复删除嘟文时报错的问题 Signed-off-by: Ching --- a.txt | 0 scripts/dodo.py | 21 +++++++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) delete mode 100644 a.txt diff --git a/a.txt b/a.txt deleted file mode 100644 index e69de29..0000000 diff --git a/scripts/dodo.py b/scripts/dodo.py index 9c88c35..bcd8bad 100644 --- a/scripts/dodo.py +++ b/scripts/dodo.py @@ -26,7 +26,7 @@ KEDAI_ID = '107263380636355825' logging.basicConfig(filename='/root/develop/log/dodo.log', level=logging.INFO) logger = logging.getLogger('/root/develop/log/dodo.log') -mastodon = Mastodon( +mastodon_cli = Mastodon( access_token = 'Ug_bUMWCk3RLamOnqYIytmeB0nO6aNfjdmf06mAj2bE', api_base_url = 'https://nofan.xyz' ) @@ -83,9 +83,10 @@ def get_tenant_access_token(): # 获取token if code != 0: logger.error("get tenant_access_token error, code =%s", code) return "" - token = redis_cli.set('tenant_access_token_%s' % APP_ID, - rsp_dict.get("tenant_access_token", ""), - ex=60*30) + token = rsp_dict.get("tenant_access_token", "") + redis_cli.set('tenant_access_token_%s' % APP_ID, + rsp_dict.get("tenant_access_token", ""), + ex=60*30) return token @@ -113,6 +114,10 @@ def get_group_name(chat_id): class RequestHandler(BaseHTTPRequestHandler): + def do_GET(self): + """Serve a GET request.""" + self.response("") + def do_POST(self): # 解析请求 body req_body = self.rfile.read(int(self.headers['content-length'])) @@ -191,7 +196,7 @@ class RequestHandler(BaseHTTPRequestHandler): return if orig_text == '/last': try: - statuses = mastodon.account_statuses(KEDAI_ID, limit=1) + statuses = mastodon_cli.account_statuses(KEDAI_ID, limit=1) s_text = BeautifulSoup(statuses[0]['content'], 'html.parser') self.msg_compoment(access_token, open_id, s_text.get_text('')) @@ -199,8 +204,8 @@ class RequestHandler(BaseHTTPRequestHandler): logger.error('operation error: %s', str(exc)) elif orig_text == '/del': try: - statuses = mastodon.account_statuses(KEDAI_ID, limit=1) - Mastodon.status_delete(statuses[0]['id']) + statuses = mastodon_cli.account_statuses(KEDAI_ID, limit=1) + mastodon_cli.status_delete(statuses[0]['id']) s_text = BeautifulSoup(statuses[0]['content'], 'html.parser') self.msg_compoment(access_token, open_id, '已删除： ' + s_text.get_text('')) @@ -218,7 +223,7 @@ class RequestHandler(BaseHTTPRequestHandler): return try: - toot_resp = mastodon.status_post(text) + toot_resp = mastodon_cli.status_post(text) if toot_resp.get('id'): self.msg_compoment(access_token, open_id, '📟 dodo 📟') redis_cli.set(event_id, int(time.time()), ex=60*60*7)