mirror of
https://github.com/zulip/zulip.git
synced 2025-11-13 10:26:28 +00:00
actions: Split out zerver.actions.uploads.
Signed-off-by: Anders Kaseorg <anders@zulip.com>
(cherry picked from commit e230ea2598)
This commit is contained in:
committed by
Tim Abbott
parent
025219da16
commit
b8567d8d8f
@@ -45,6 +45,7 @@ from zerver.actions.default_streams import (
|
||||
get_default_streams_for_realm,
|
||||
)
|
||||
from zerver.actions.invites import notify_invites_changed, revoke_invites_generated_by_user
|
||||
from zerver.actions.uploads import check_attachment_reference_change, do_claim_attachments
|
||||
from zerver.actions.user_activity import update_user_activity_interval
|
||||
from zerver.actions.user_groups import (
|
||||
do_send_user_group_members_update_event,
|
||||
@@ -172,7 +173,7 @@ from zerver.lib.types import (
|
||||
SubscriptionInfo,
|
||||
SubscriptionStreamDict,
|
||||
)
|
||||
from zerver.lib.upload import claim_attachment, delete_avatar_image, delete_message_image
|
||||
from zerver.lib.upload import delete_avatar_image
|
||||
from zerver.lib.user_counts import realm_user_count, realm_user_count_by_role
|
||||
from zerver.lib.user_groups import (
|
||||
create_system_user_groups_for_realm,
|
||||
@@ -233,7 +234,6 @@ from zerver.models import (
|
||||
get_client,
|
||||
get_fake_email_domain,
|
||||
get_huddle_user_ids,
|
||||
get_old_unclaimed_attachments,
|
||||
get_realm,
|
||||
get_realm_domains,
|
||||
get_stream,
|
||||
@@ -243,7 +243,6 @@ from zerver.models import (
|
||||
get_user_profile_by_id,
|
||||
is_cross_realm_bot_email,
|
||||
query_for_ids,
|
||||
validate_attachment_request,
|
||||
)
|
||||
from zerver.tornado.django_api import send_event
|
||||
|
||||
@@ -6987,87 +6986,6 @@ def do_remove_realm_domain(
|
||||
transaction.on_commit(lambda: send_event(realm, event, active_user_ids(realm.id)))
|
||||
|
||||
|
||||
def notify_attachment_update(
|
||||
user_profile: UserProfile, op: str, attachment_dict: Dict[str, Any]
|
||||
) -> None:
|
||||
event = {
|
||||
"type": "attachment",
|
||||
"op": op,
|
||||
"attachment": attachment_dict,
|
||||
"upload_space_used": user_profile.realm.currently_used_upload_space_bytes(),
|
||||
}
|
||||
send_event(user_profile.realm, event, [user_profile.id])
|
||||
|
||||
|
||||
def do_claim_attachments(message: Message, potential_path_ids: List[str]) -> bool:
|
||||
claimed = False
|
||||
for path_id in potential_path_ids:
|
||||
user_profile = message.sender
|
||||
is_message_realm_public = False
|
||||
is_message_web_public = False
|
||||
if message.is_stream_message():
|
||||
stream = Stream.objects.get(id=message.recipient.type_id)
|
||||
is_message_realm_public = stream.is_public()
|
||||
is_message_web_public = stream.is_web_public
|
||||
|
||||
if not validate_attachment_request(user_profile, path_id):
|
||||
# Technically, there are 2 cases here:
|
||||
# * The user put something in their message that has the form
|
||||
# of an upload, but doesn't correspond to a file that doesn't
|
||||
# exist. validate_attachment_request will return None.
|
||||
# * The user is trying to send a link to a file they don't have permission to
|
||||
# access themselves. validate_attachment_request will return False.
|
||||
#
|
||||
# Either case is unusual and suggests a UI bug that got
|
||||
# the user in this situation, so we log in these cases.
|
||||
logging.warning(
|
||||
"User %s tried to share upload %s in message %s, but lacks permission",
|
||||
user_profile.id,
|
||||
path_id,
|
||||
message.id,
|
||||
)
|
||||
continue
|
||||
|
||||
claimed = True
|
||||
attachment = claim_attachment(
|
||||
user_profile, path_id, message, is_message_realm_public, is_message_web_public
|
||||
)
|
||||
notify_attachment_update(user_profile, "update", attachment.to_dict())
|
||||
return claimed
|
||||
|
||||
|
||||
def do_delete_old_unclaimed_attachments(weeks_ago: int) -> None:
|
||||
old_unclaimed_attachments = get_old_unclaimed_attachments(weeks_ago)
|
||||
|
||||
for attachment in old_unclaimed_attachments:
|
||||
delete_message_image(attachment.path_id)
|
||||
attachment.delete()
|
||||
|
||||
|
||||
def check_attachment_reference_change(
|
||||
message: Message, rendering_result: MessageRenderingResult
|
||||
) -> bool:
|
||||
# For a unsaved message edit (message.* has been updated, but not
|
||||
# saved to the database), adjusts Attachment data to correspond to
|
||||
# the new content.
|
||||
prev_attachments = {a.path_id for a in message.attachment_set.all()}
|
||||
new_attachments = set(rendering_result.potential_attachment_path_ids)
|
||||
|
||||
if new_attachments == prev_attachments:
|
||||
return bool(prev_attachments)
|
||||
|
||||
to_remove = list(prev_attachments - new_attachments)
|
||||
if len(to_remove) > 0:
|
||||
attachments_to_update = Attachment.objects.filter(path_id__in=to_remove).select_for_update()
|
||||
message.attachment_set.remove(*attachments_to_update)
|
||||
|
||||
to_add = list(new_attachments - prev_attachments)
|
||||
if len(to_add) > 0:
|
||||
do_claim_attachments(message, to_add)
|
||||
|
||||
return message.attachment_set.exists()
|
||||
|
||||
|
||||
def notify_realm_custom_profile_fields(realm: Realm) -> None:
|
||||
fields = custom_profile_fields_for_realm(realm.id)
|
||||
event = dict(type="custom_profile_fields", fields=[f.as_dict() for f in fields])
|
||||
|
||||
Reference in New Issue
Block a user