mirror of
https://github.com/zulip/zulip.git
synced 2025-11-02 21:13:36 +00:00
30495cec58
This migration applies under the assumption that extra_data_json has been populated for all existing and coming audit log entries. - This removes the manual conversions back and forth for extra_data throughout the codebase including the orjson.loads(), orjson.dumps(), and str() calls. - The custom handler used for converting Decimal is removed since DjangoJSONEncoder handles that for extra_data. - We remove None-checks for extra_data because it is now no longer nullable. - Meanwhile, we want the bouncer to support processing RealmAuditLog entries for remote servers before and after the JSONField migration on extra_data. - Since now extra_data should always be a dict for the newer remote server, which is now migrated, the test cases are updated to create RealmAuditLog objects by passing a dict for extra_data before sending over the analytics data. Note that while JSONField allows for non-dict values, a proper remote server always passes a dict for extra_data. - We still test out the legacy extra_data format because not all remote servers have migrated to use JSONField extra_data. This verifies that support for extra_data being a string or None has not been dropped. Co-authored-by: Siddharth Asthana <siddharthasthana31@gmail.com> Signed-off-by: Zixuan James Li <p359101898@gmail.com>
49 lines
1.6 KiB
Python
49 lines
1.6 KiB
Python
import datetime
|
|
from typing import Optional
|
|
|
|
from django.utils.timezone import now as timezone_now
|
|
|
|
from zerver.actions.message_flags import do_mark_muted_user_messages_as_read
|
|
from zerver.lib.muted_users import add_user_mute, get_user_mutes
|
|
from zerver.models import MutedUser, RealmAuditLog, UserProfile
|
|
from zerver.tornado.django_api import send_event
|
|
|
|
|
|
def do_mute_user(
|
|
user_profile: UserProfile,
|
|
muted_user: UserProfile,
|
|
date_muted: Optional[datetime.datetime] = None,
|
|
) -> None:
|
|
if date_muted is None:
|
|
date_muted = timezone_now()
|
|
add_user_mute(user_profile, muted_user, date_muted)
|
|
do_mark_muted_user_messages_as_read(user_profile, muted_user)
|
|
event = dict(type="muted_users", muted_users=get_user_mutes(user_profile))
|
|
send_event(user_profile.realm, event, [user_profile.id])
|
|
|
|
RealmAuditLog.objects.create(
|
|
realm=user_profile.realm,
|
|
acting_user=user_profile,
|
|
modified_user=user_profile,
|
|
event_type=RealmAuditLog.USER_MUTED,
|
|
event_time=date_muted,
|
|
extra_data={"muted_user_id": muted_user.id},
|
|
)
|
|
|
|
|
|
def do_unmute_user(mute_object: MutedUser) -> None:
|
|
user_profile = mute_object.user_profile
|
|
muted_user = mute_object.muted_user
|
|
mute_object.delete()
|
|
event = dict(type="muted_users", muted_users=get_user_mutes(user_profile))
|
|
send_event(user_profile.realm, event, [user_profile.id])
|
|
|
|
RealmAuditLog.objects.create(
|
|
realm=user_profile.realm,
|
|
acting_user=user_profile,
|
|
modified_user=user_profile,
|
|
event_type=RealmAuditLog.USER_UNMUTED,
|
|
event_time=timezone_now(),
|
|
extra_data={"unmuted_user_id": muted_user.id},
|
|
)
|