Merge branch 'develop' of git.tunpok.com:ching/dsite into develop

This commit is contained in:
Ching 2022-01-21 00:14:39 +08:00
commit c8d5195669
2 changed files with 13 additions and 8 deletions

0
a.txt
View File

View File

@ -29,7 +29,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'
)
@ -86,9 +86,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
@ -116,6 +117,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']))
@ -196,7 +201,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(''))
@ -204,8 +209,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(''))
@ -233,7 +238,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)