michael/pyfedi
1
0
Fork 0
mirror of https://codeberg.org/rimu/pyfedi synced 2025-01-23 19:36:56 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

handle a variety of date formats for end of ban time

Browse source
This commit is contained in:
rimu 2025-01-14 13:23:30 +13:00
parent 3997567f2f
commit b4664c8ea9
1 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
app/activitypub/util.py
View file

@ -7,6 +7,7 @@ from datetime import timedelta, datetime, timezone
from random import randint from random import randint
from typing import Union, Tuple, List from typing import Union, Tuple, List
import arrow
import httpx import httpx
import redis import redis
from flask import current_app, request, g, url_for, json from flask import current_app, request, g, url_for, json
@ -1454,10 +1455,22 @@ def ban_user(blocker, blocked, community, core_activity):
else: else:
reason = '' reason = ''
new_ban.reason = reason new_ban.reason = reason
if 'expires' in core_activity and datetime.fromisoformat(core_activity['expires']) > datetime.now(timezone.utc):
new_ban.ban_until = core_activity['expires'] ban_until = None
elif 'endTime' in core_activity and datetime.fromisoformat(core_activity['endTime']) > datetime.now(timezone.utc): if 'expires' in core_activity:
new_ban.ban_until = core_activity['endTime'] try:
ban_until = datetime.fromisoformat(core_activity['expires'])
except ValueError as e:
ban_until = arrow.get(core_activity['expires']).datetime
elif 'endTime' in core_activity:
try:
ban_until = datetime.fromisoformat(core_activity['endTime'])
except ValueError as e:
ban_until = arrow.get(core_activity['endTime']).datetime
if ban_until and ban_until > datetime.now(timezone.utc):
new_ban.ban_until = ban_until
db.session.add(new_ban) db.session.add(new_ban)
community_membership_record = CommunityMember.query.filter_by(community_id=community.id, user_id=blocked.id).first() community_membership_record = CommunityMember.query.filter_by(community_id=community.id, user_id=blocked.id).first()