Compare commits

...

2 Commits

Author SHA1 Message Date
Ching
027b1f597d fix: 修复可能导致脚本重复运行的问题 2024-03-26 17:40:00 +08:00
Ching
e9d94961fa fix: Fix logger.info format in mas2ff2.py 2024-03-26 17:19:16 +08:00

View File

@ -157,15 +157,13 @@ def run(instance, access_token, fanfou_cookie, fanfou_token):
time.sleep(10) time.sleep(10)
while True: # get every new status
requests.get('https://up.tunpok.com/api/push/sQLwSpeiUH?msg=OK&ping=') while min_id:
# get new status
me_timeline = mastodon_cli.account_statuses( me_timeline = mastodon_cli.account_statuses(
me_id, exclude_replies=True, min_id=min_id) me_id, exclude_replies=True, min_id=min_id)
# if no new status # if no new status
if not me_timeline: if not me_timeline:
time.sleep(10) break
continue
statuses = [] statuses = []
for status in me_timeline: for status in me_timeline:
statuses.append(status) statuses.append(status)
@ -175,7 +173,7 @@ def run(instance, access_token, fanfou_cookie, fanfou_token):
if str(status['id']) not in posted_ids: if str(status['id']) not in posted_ids:
content = status['content'].replace('<br />', '\n') content = status['content'].replace('<br />', '\n')
content = re.sub('<.*?>', '', content) content = re.sub('<.*?>', '', content)
logger.info(status['id'], content) logger.info(status['id'] + ' ' + content)
post_fanfou(fanfou_cookie, fanfou_token, content, status['media_attachments']) post_fanfou(fanfou_cookie, fanfou_token, content, status['media_attachments'])
with open('last_id.txt', 'a') as f: with open('last_id.txt', 'a') as f:
f.write(str(status['id']) + '\n') f.write(str(status['id']) + '\n')
@ -185,6 +183,8 @@ def run(instance, access_token, fanfou_cookie, fanfou_token):
# update min_id # update min_id
if statuses: if statuses:
min_id = statuses[-1]['id'] min_id = statuses[-1]['id']
else:
min_id = None
if __name__ == '__main__': if __name__ == '__main__':
cookie = 'u=stokesia; uuid=24edfe42401cbb03cf1f.1676446846.21; PHPSESSID=d4l9m3tp09gasff6r3u8mv9p12; m=yvettezhong%40gmail.com; tgw_l7_route=f174d6f255742a6ee2e9a07cf9cca0fa' cookie = 'u=stokesia; uuid=24edfe42401cbb03cf1f.1676446846.21; PHPSESSID=d4l9m3tp09gasff6r3u8mv9p12; m=yvettezhong%40gmail.com; tgw_l7_route=f174d6f255742a6ee2e9a07cf9cca0fa'