actions: Split out zerver.actions.streams.

Signed-off-by: Anders Kaseorg <anders@zulip.com>

tools/generate-integration-docs-screenshot

@@ -33,8 +33,9 @@ import zulip
 
 from scripts.lib.zulip_tools import BOLDRED, ENDC
 from tools.lib.test_script import prepare_puppeteer_run
+from zerver.actions.streams import bulk_add_subscriptions
 from zerver.actions.user_settings import do_change_avatar_fields
-from zerver.lib.actions import bulk_add_subscriptions, do_create_user, notify_created_bot
+from zerver.lib.actions import do_create_user, notify_created_bot
 from zerver.lib.integrations import (
     DOC_SCREENSHOT_CONFIG,
     INTEGRATIONS,

zerver/lib/test_classes.py

@@ -48,12 +48,9 @@ from two_factor.models import PhoneDevice
 
 from corporate.models import Customer, CustomerPlan, LicenseLedger
 from zerver.actions.message_send import check_send_message, check_send_stream_message
+from zerver.actions.streams import bulk_add_subscriptions, bulk_remove_subscriptions
 from zerver.decorator import do_two_factor_login
-from zerver.lib.actions import (
-    bulk_add_subscriptions,
-    bulk_remove_subscriptions,
-    do_set_realm_property,
-)
+from zerver.lib.actions import do_set_realm_property
 from zerver.lib.cache import bounce_key_prefix_for_testing
 from zerver.lib.initial_password import initial_password
 from zerver.lib.notification_data import UserMessageNotificationsData

zerver/management/commands/add_users_to_streams.py

@@ -2,7 +2,7 @@ from typing import Any
 
 from django.core.management.base import CommandParser
 
-from zerver.lib.actions import bulk_add_subscriptions
+from zerver.actions.streams import bulk_add_subscriptions
 from zerver.lib.management import ZulipBaseCommand
 from zerver.lib.streams import ensure_stream
 

zerver/management/commands/merge_streams.py

@@ -1,7 +1,7 @@
 from argparse import ArgumentParser
 from typing import Any, List
 
-from zerver.lib.actions import (
+from zerver.actions.streams import (
     bulk_add_subscriptions,
     bulk_remove_subscriptions,
     do_deactivate_stream,

zerver/management/commands/remove_users_from_stream.py

@@ -2,7 +2,7 @@ from typing import Any
 
 from django.core.management.base import CommandParser
 
-from zerver.lib.actions import bulk_remove_subscriptions
+from zerver.actions.streams import bulk_remove_subscriptions
 from zerver.lib.management import ZulipBaseCommand
 from zerver.models import get_stream
 

zerver/management/commands/rename_stream.py

@@ -1,7 +1,7 @@
 from argparse import ArgumentParser
 from typing import Any
 
-from zerver.lib.actions import do_rename_stream
+from zerver.actions.streams import do_rename_stream
 from zerver.lib.management import ZulipBaseCommand
 from zerver.models import get_stream
 

zerver/tests/test_audit_log.py

@@ -8,6 +8,13 @@ from django.utils.timezone import now as timezone_now
 from analytics.models import StreamCount
 from zerver.actions.realm_icon import do_change_icon_source
 from zerver.actions.realm_playgrounds import do_add_realm_playground, do_remove_realm_playground
+from zerver.actions.streams import (
+    bulk_add_subscriptions,
+    bulk_remove_subscriptions,
+    do_change_subscription_property,
+    do_deactivate_stream,
+    do_rename_stream,
+)
 from zerver.actions.user_settings import (
     do_change_avatar_fields,
     do_change_password,
@@ -18,8 +25,6 @@ from zerver.actions.user_settings import (
 )
 from zerver.actions.users import do_change_user_role, do_deactivate_user
 from zerver.lib.actions import (
-    bulk_add_subscriptions,
-    bulk_remove_subscriptions,
     do_activate_mirror_dummy_user,
     do_add_realm_domain,
     do_change_bot_owner,
@@ -27,14 +32,11 @@ from zerver.lib.actions import (
     do_change_default_events_register_stream,
     do_change_default_sending_stream,
     do_change_realm_domain,
-    do_change_subscription_property,
     do_create_user,
     do_deactivate_realm,
-    do_deactivate_stream,
     do_reactivate_realm,
     do_reactivate_user,
     do_remove_realm_domain,
-    do_rename_stream,
     do_set_realm_authentication_methods,
     do_set_realm_message_editing,
     do_set_realm_notifications_stream,

zerver/tests/test_bots.py

@@ -8,8 +8,9 @@ from django.core import mail
 from django.test import override_settings
 from zulip_bots.custom_exceptions import ConfigValidationError
 
+from zerver.actions.streams import do_change_stream_permission
 from zerver.actions.users import do_change_can_create_users, do_deactivate_user
-from zerver.lib.actions import do_change_stream_permission, do_set_realm_property
+from zerver.lib.actions import do_set_realm_property
 from zerver.lib.bot_config import ConfigError, get_bot_config
 from zerver.lib.bot_lib import get_bot_handler
 from zerver.lib.integrations import EMBEDDED_BOTS, WebhookIntegration

zerver/tests/test_email_mirror.py

@@ -11,8 +11,9 @@ import orjson
 from django.conf import settings
 from django.http import HttpResponse
 
+from zerver.actions.streams import do_change_stream_post_policy
 from zerver.actions.users import do_deactivate_user
-from zerver.lib.actions import do_change_stream_post_policy, do_deactivate_realm
+from zerver.lib.actions import do_deactivate_realm
 from zerver.lib.email_mirror import (
     create_missed_message_address,
     filter_footer,

zerver/tests/test_event_queue.py

@@ -5,8 +5,8 @@ from unittest import mock
 import orjson
 from django.http import HttpRequest, HttpResponse
 
+from zerver.actions.streams import do_change_subscription_property
 from zerver.actions.user_topics import do_mute_topic
-from zerver.lib.actions import do_change_subscription_property
 from zerver.lib.test_classes import ZulipTestCase
 from zerver.lib.test_helpers import HostRequestMock, mock_queue_publish
 from zerver.lib.user_groups import create_user_group, remove_user_from_user_group

zerver/tests/test_events.py

@@ -48,6 +48,17 @@ from zerver.actions.realm_linkifiers import (
 )
 from zerver.actions.realm_logo import do_change_logo_source
 from zerver.actions.realm_playgrounds import do_add_realm_playground, do_remove_realm_playground
+from zerver.actions.streams import (
+    bulk_add_subscriptions,
+    bulk_remove_subscriptions,
+    do_change_stream_description,
+    do_change_stream_message_retention_days,
+    do_change_stream_permission,
+    do_change_stream_post_policy,
+    do_change_subscription_property,
+    do_deactivate_stream,
+    do_rename_stream,
+)
 from zerver.actions.submessage import do_add_submessage
 from zerver.actions.typing import check_send_typing_notification, do_send_stream_typing_notification
 from zerver.actions.user_groups import (
@@ -74,8 +85,6 @@ from zerver.actions.users import (
 )
 from zerver.actions.video_calls import do_set_zoom_token
 from zerver.lib.actions import (
-    bulk_add_subscriptions,
-    bulk_remove_subscriptions,
     do_add_reaction,
     do_add_realm_domain,
     do_change_bot_owner,
@@ -84,20 +93,13 @@ from zerver.lib.actions import (
     do_change_default_sending_stream,
     do_change_realm_domain,
     do_change_realm_plan_type,
-    do_change_stream_description,
-    do_change_stream_message_retention_days,
-    do_change_stream_permission,
-    do_change_stream_post_policy,
-    do_change_subscription_property,
     do_create_user,
     do_deactivate_realm,
-    do_deactivate_stream,
     do_delete_messages,
     do_mute_user,
     do_reactivate_user,
     do_remove_reaction,
     do_remove_realm_domain,
-    do_rename_stream,
     do_set_realm_authentication_methods,
     do_set_realm_message_editing,
     do_set_realm_notifications_stream,

zerver/tests/test_message_edit.py

@@ -8,13 +8,12 @@ from django.db import IntegrityError
 from django.http import HttpResponse
 from django.utils.timezone import now as timezone_now
 
+from zerver.actions.streams import do_change_stream_post_policy, do_deactivate_stream
 from zerver.actions.users import do_change_user_role
 from zerver.lib.actions import (
     check_update_message,
     do_add_reaction,
     do_change_realm_plan_type,
-    do_change_stream_post_policy,
-    do_deactivate_stream,
     do_delete_messages,
     do_set_realm_property,
     do_update_message,

zerver/tests/test_message_flags.py

@@ -5,7 +5,8 @@ import orjson
 from django.db import connection
 from django.http import HttpResponse
 
-from zerver.lib.actions import do_change_stream_permission, do_update_message_flags
+from zerver.actions.streams import do_change_stream_permission
+from zerver.lib.actions import do_update_message_flags
 from zerver.lib.fix_unreads import fix, fix_unsubscribed
 from zerver.lib.message import (
     MessageDetailsDict,

zerver/tests/test_message_send.py

@@ -25,10 +25,10 @@ from zerver.actions.message_send import (
     internal_send_stream_message_by_name,
     send_rate_limited_pm_notification_to_bot_owner,
 )
+from zerver.actions.streams import do_change_stream_post_policy
 from zerver.actions.users import do_change_can_forge_sender, do_deactivate_user
 from zerver.lib.actions import (
     do_add_realm_domain,
-    do_change_stream_post_policy,
     do_create_realm,
     do_create_user,
     do_set_realm_property,

zerver/tests/test_message_topics.py

@@ -1,6 +1,6 @@
 from django.utils.timezone import now as timezone_now
 
-from zerver.lib.actions import do_change_stream_permission
+from zerver.actions.streams import do_change_stream_permission
 from zerver.lib.test_classes import ZulipTestCase
 from zerver.models import Message, UserMessage, get_client, get_realm, get_stream
 

zerver/tests/test_reactions.py

@@ -4,7 +4,8 @@ from unittest import mock
 import orjson
 from django.http import HttpResponse
 
-from zerver.lib.actions import do_change_stream_permission, notify_reaction_update
+from zerver.actions.streams import do_change_stream_permission
+from zerver.lib.actions import notify_reaction_update
 from zerver.lib.cache import cache_get, to_dict_cache_key_id
 from zerver.lib.emoji import emoji_name_to_emoji_code
 from zerver.lib.exceptions import JsonableError

zerver/tests/test_realm.py

@@ -9,6 +9,7 @@ from django.conf import settings
 from django.utils.timezone import now as timezone_now
 
 from confirmation.models import Confirmation, create_confirmation_link
+from zerver.actions.streams import do_deactivate_stream
 from zerver.lib.actions import (
     do_add_deactivated_redirect,
     do_change_realm_org_type,
@@ -16,7 +17,6 @@ from zerver.lib.actions import (
     do_change_realm_subdomain,
     do_create_realm,
     do_deactivate_realm,
-    do_deactivate_stream,
     do_scrub_realm,
     do_send_realm_reactivation_email,
     do_set_realm_property,

zerver/tests/test_subs.py

@@ -23,15 +23,17 @@ from zerver.actions.default_streams import (
     get_default_streams_for_realm,
     lookup_default_stream_groups,
 )
-from zerver.actions.users import do_change_user_role, do_deactivate_user
-from zerver.lib.actions import (
+from zerver.actions.streams import (
     bulk_add_subscriptions,
     bulk_remove_subscriptions,
-    do_change_realm_plan_type,
     do_change_stream_post_policy,
     do_change_subscription_property,
-    do_create_realm,
     do_deactivate_stream,
+)
+from zerver.actions.users import do_change_user_role, do_deactivate_user
+from zerver.lib.actions import (
+    do_change_realm_plan_type,
+    do_create_realm,
     do_set_realm_property,
     get_topic_messages,
 )

zerver/tests/test_webhooks_common.py

@@ -5,8 +5,8 @@ from unittest.mock import MagicMock, patch
 from django.http import HttpRequest
 from django.http.response import HttpResponse
 
+from zerver.actions.streams import do_rename_stream
 from zerver.decorator import webhook_view
-from zerver.lib.actions import do_rename_stream
 from zerver.lib.exceptions import InvalidJSONError, JsonableError
 from zerver.lib.send_email import FromAddress
 from zerver.lib.test_classes import WebhookTestCase, ZulipTestCase

zerver/views/streams.py

@@ -26,14 +26,7 @@ from zerver.actions.message_send import (
     internal_prep_private_message,
     internal_prep_stream_message,
 )
-from zerver.context_processors import get_valid_realm_from_request
-from zerver.decorator import (
-    authenticated_json_view,
-    require_non_guest_user,
-    require_post,
-    require_realm_admin,
-)
-from zerver.lib.actions import (
+from zerver.actions.streams import (
     bulk_add_subscriptions,
     bulk_remove_subscriptions,
     do_change_stream_description,
@@ -42,10 +35,17 @@ from zerver.lib.actions import (
     do_change_stream_post_policy,
     do_change_subscription_property,
     do_deactivate_stream,
-    do_delete_messages,
     do_rename_stream,
     get_subscriber_ids,
 )
+from zerver.context_processors import get_valid_realm_from_request
+from zerver.decorator import (
+    authenticated_json_view,
+    require_non_guest_user,
+    require_post,
+    require_realm_admin,
+)
+from zerver.lib.actions import do_delete_messages
 from zerver.lib.exceptions import (
     ErrorCode,
     JsonableError,

zilencer/management/commands/add_mock_conversation.py

@@ -3,8 +3,9 @@ from typing import Any, Dict, List
 from django.core.management.base import BaseCommand
 
 from zerver.actions.message_send import do_send_messages, internal_prep_stream_message
+from zerver.actions.streams import bulk_add_subscriptions
 from zerver.actions.user_settings import do_change_avatar_fields
-from zerver.lib.actions import bulk_add_subscriptions, do_add_reaction, do_create_user
+from zerver.lib.actions import do_add_reaction, do_create_user
 from zerver.lib.emoji import emoji_name_to_emoji_code
 from zerver.lib.streams import ensure_stream
 from zerver.lib.upload import upload_avatar_image