paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-03 05:23:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

request: Move log_data from HttpRequest to ZulipRequestNotes.

Browse Source
This commit is contained in:
PIG208
2021-07-09 16:06:04 +08:00
committed by Tim Abbott
parent 75cde8ebcf
commit da6e5ddcae
9 changed files with 89 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
zerver/views/message_flags.py
View File

@@ -10,6 +10,7 @@ from zerver.lib.actions import (
do_update_message_flags,
)
from zerver.lib.exceptions import JsonableError
from zerver.lib.request import get_request_notes
from zerver.lib.response import json_success
from zerver.lib.streams import access_stream_by_id
from zerver.lib.topic import user_message_exists_for_topic
@@ -35,12 +36,14 @@ def update_message_flags(
operation: str = REQ("op"),
flag: str = REQ(),
) -> HttpResponse:
request_notes = get_request_notes(request)
assert request_notes.log_data is not None
count = do_update_message_flags(user_profile, request.client, operation, flag, messages)
target_count_str = str(len(messages))
log_data_str = f"[{operation} {flag}/{target_count_str}] actually {count}"
request._log_data["extra"] = log_data_str
request_notes.log_data["extra"] = log_data_str
return json_success({"result": "success", "messages": messages, "msg": ""})
@@ -48,9 +51,11 @@ def update_message_flags(
@has_request_variables
def mark_all_as_read(request: HttpRequest, user_profile: UserProfile) -> HttpResponse:
count = do_mark_all_as_read(user_profile, request.client)
request_notes = get_request_notes(request)
log_data_str = f"[{count} updated]"
request._log_data["extra"] = log_data_str
assert request_notes.log_data is not None
request_notes.log_data["extra"] = log_data_str
return json_success({"result": "success", "msg": ""})
@@ -63,7 +68,9 @@ def mark_stream_as_read(
count = do_mark_stream_messages_as_read(user_profile, stream.recipient_id)
log_data_str = f"[{count} updated]"
request._log_data["extra"] = log_data_str
log_data = get_request_notes(request).log_data
assert log_data is not None
log_data["extra"] = log_data_str
return json_success({"result": "success", "msg": ""})
@@ -90,6 +97,8 @@ def mark_topic_as_read(
count = do_mark_stream_messages_as_read(user_profile, stream.recipient_id, topic_name)
log_data_str = f"[{count} updated]"
request._log_data["extra"] = log_data_str
log_data = get_request_notes(request).log_data
assert log_data is not None
log_data["extra"] = log_data_str
return json_success({"result": "success", "msg": ""})