From 5342d4ecfbfa5580bbf04fc478e3c4edd4d4c681 Mon Sep 17 00:00:00 2001 From: Lauryn Menard Date: Wed, 1 May 2024 20:36:10 +0200 Subject: [PATCH] help: Rename and redirect stream-permissions for channel. --- api_docs/roles-and-permissions.md | 2 +- help/archive-a-stream.md | 2 +- help/bots-overview.md | 2 +- help/change-the-privacy-of-a-stream.md | 2 +- ...-permissions.md => channel-permissions.md} | 62 +++++++++---------- help/channels-and-topics.md | 2 +- help/configure-automated-notices.md | 6 +- help/create-a-channel.md | 6 +- help/create-channels.md | 2 +- help/export-your-organization.md | 8 +-- help/include/sidebar_index.md | 2 +- help/manage-user-channel-subscriptions.md | 4 +- help/move-content-to-another-channel.md | 4 +- help/public-access-option.md | 2 +- help/roles-and-permissions.md | 18 +++--- help/search-for-messages.md | 2 +- help/view-someones-profile.md | 6 +- .../comparison_table_integrated.html | 4 +- templates/corporate/for/business.html | 2 +- templates/corporate/for/education.html | 6 +- templates/corporate/for/events.html | 2 +- templates/corporate/for/open-source.html | 2 +- templates/corporate/for/research.html | 2 +- templates/corporate/policies/privacy.md | 2 +- templates/corporate/pricing_model.html | 2 +- templates/corporate/self-hosting.html | 2 +- .../stream_settings/stream_types.hbs | 2 +- zerver/actions/streams.py | 2 +- zerver/lib/url_redirects.py | 1 + zerver/openapi/zulip.yaml | 30 ++++----- zerver/tests/test_subs.py | 16 ++--- 31 files changed, 104 insertions(+), 103 deletions(-) rename help/{stream-permissions.md => channel-permissions.md} (71%) diff --git a/api_docs/roles-and-permissions.md b/api_docs/roles-and-permissions.md index 769cbde75c..662ae6513d 100644 --- a/api_docs/roles-and-permissions.md +++ b/api_docs/roles-and-permissions.md @@ -76,7 +76,7 @@ event](/api/get-events#realm_user-add), and the Many areas of Zulip are customizable by the roles above, such as (but not limited to) [restricting message editing and deletion](/help/restrict-message-editing-and-deletion) and -[streams permissions](/help/stream-permissions). The potential +[streams permissions](/help/channel-permissions). The potential permission levels are: * Everyone / Any user including Guests (least restrictive) diff --git a/help/archive-a-stream.md b/help/archive-a-stream.md index 9dcab4c700..b5c98c4beb 100644 --- a/help/archive-a-stream.md +++ b/help/archive-a-stream.md @@ -58,5 +58,5 @@ https://zulip.readthedocs.io/en/latest/production/management-commands.html#other * [Delete a message](/help/delete-a-message) * [Delete a topic](/help/delete-a-topic) * [Message retention policy](/help/message-retention-policy) -* [Stream permissions](/help/stream-permissions) +* [Channel permissions](/help/channel-permissions) * [Zulip Cloud or self-hosting?](/help/zulip-cloud-or-self-hosting) diff --git a/help/bots-overview.md b/help/bots-overview.md index c63aa46cf6..72bd850aef 100644 --- a/help/bots-overview.md +++ b/help/bots-overview.md @@ -55,7 +55,7 @@ A few more details: * Bots can be subscribed to streams, and their role can be modified if they need to have permission to do administrative actions. -* [Stream permissions](/help/stream-permissions) are the same for bots +* [Channel permissions](/help/channel-permissions) are the same for bots as for other users. Therefore, for private streams with protected history, a bot can only access messages sent after it subscribed to the stream. diff --git a/help/change-the-privacy-of-a-stream.md b/help/change-the-privacy-of-a-stream.md index 832dd92609..fa215cd7cd 100644 --- a/help/change-the-privacy-of-a-stream.md +++ b/help/change-the-privacy-of-a-stream.md @@ -4,7 +4,7 @@ Streams can be [web-public](/help/public-access-option), public or private, and private streams can have shared or protected history. -See [stream permissions](/help/stream-permissions) for +See [channel permissions](/help/channel-permissions) for details on stream privacy settings. As an organization administrator, you can always make a public stream diff --git a/help/stream-permissions.md b/help/channel-permissions.md similarity index 71% rename from help/stream-permissions.md rename to help/channel-permissions.md index f108b6da7f..d9c45e9606 100644 --- a/help/stream-permissions.md +++ b/help/channel-permissions.md @@ -1,21 +1,21 @@ -# Stream privacy settings +# Channel privacy settings -Streams are similar to chat rooms, IRC channels, or email lists in that they -determine who receives a message. Zulip supports a few types of streams: +Channels are similar to chat rooms, IRC channels, or email lists in that they +determine who receives a message. Zulip supports a few types of channels: * **Public** (): Members can join and view the complete message history. - Public streams are visible to [guest users](/help/guest-users) - only if they are subscribed (exactly like private streams with + Public channels are visible to [guest users](/help/guest-users) + only if they are subscribed (exactly like private channels with shared history). * **Private** (): New subscribers must be added by an existing subscriber. Only subscribers - and organization administrators can see the stream's name and description, - and only subscribers can view topics and messages with the stream: - * In **private streams with shared history**, new subscribers can - access the stream's full message history. - * In **private streams with protected history**, new subscribers + and organization administrators can see the channel's name and description, + and only subscribers can view topics and messages with the channel: + * In **private channels with shared history**, new subscribers can + access the channel's full message history. + * In **private channels with protected history**, new subscribers can only see messages sent after they join. * [**Web-public**](/help/public-access-option) ( | | Owners and admins | Moderators | Members | Guests |--- |--- | |--- |--- -| View stream name | ✔ | ✔ | ✔ | ◾ +| View channel name | ✔ | ✔ | ✔ | ◾ | Join | ✔ | ✔ | ✔ | | Unsubscribe | ◾ | ◾ | ◾ | ◾ | Add others | ✔ | ✶ | ✶ | @@ -78,7 +78,7 @@ administrator can access private stream messages: ✔Always -◾If subscribed to the stream +◾If subscribed to the channel ✶ Configurable. See [Stream posting policy](/help/stream-sending-policy), @@ -87,12 +87,12 @@ Configurable. See [Stream posting policy](/help/stream-sending-policy), for details. -### Private streams +### Private channels
| | Owners and admins | Moderators | Members | Guests |--- |--- | |--- |--- -| View stream name | ✔ | ◾ | ◾ | ◾ +| View channel name | ✔ | ◾ | ◾ | ◾ | Join | | | | | Unsubscribe | ◾ | ◾ | ◾ | ◾ | Add others | ◾ | ✶ | ✶ | @@ -108,10 +108,10 @@ for details. ✔Always -◾If subscribed to the stream +◾If subscribed to the channel ✶ -Configurable, but at minimum must be subscribed to the stream. +Configurable, but at minimum must be subscribed to the channel. See [Stream posting policy](/help/stream-sending-policy), [Configure who can add users][add-users], and [Configure who can remove users][remove-users] @@ -122,7 +122,7 @@ for details. * [Roles and permissions](/help/roles-and-permissions) * [Stream sending policy](/help/stream-sending-policy) -* [Web-public streams](/help/public-access-option) +* [Web-public channels](/help/public-access-option) [add-users]: /help/configure-who-can-invite-to-streams#configure-who-can-add-users [remove-users]: /help/configure-who-can-invite-to-streams#configure-who-can-remove-users diff --git a/help/channels-and-topics.md b/help/channels-and-topics.md index 75aca5b39c..02752b12e9 100644 --- a/help/channels-and-topics.md +++ b/help/channels-and-topics.md @@ -11,6 +11,6 @@ * [Starting a new topic](/help/starting-a-new-topic) * [Replying to messages](/help/replying-to-messages) * [Creating channels for your organization](/help/getting-your-organization-started-with-zulip#create-channels) -* [Stream permissions](/help/stream-permissions) +* [Channel permissions](/help/channel-permissions) * Browse the articles under **Channels & topics** and **Channel management** on the left sidebar. diff --git a/help/configure-automated-notices.md b/help/configure-automated-notices.md index 78e483b328..bfa5b8f1a0 100644 --- a/help/configure-automated-notices.md +++ b/help/configure-automated-notices.md @@ -14,7 +14,7 @@ language](/help/change-your-language). Notices about stream settings changes, such as [name](/help/rename-a-stream), [description](/help/change-the-stream-description), -[permission](/help/stream-permissions) and +[permission](/help/channel-permissions) and [policy](/help/stream-sending-policy) updates are sent to the “stream events” topic in the stream that was modified. @@ -22,13 +22,13 @@ Notices about stream settings changes, such as [name](/help/rename-a-stream), {!admin-only.md!} -When creating a new [public stream](/help/stream-permissions), the +When creating a new [public channel](/help/channel-permissions), the stream creator can choose to advertise the new stream via an automated notice. You can configure what stream Zulip uses for these notices, or disable these notices entirely. The topic for these messages is “new streams”. -New [private](/help/stream-permissions) streams are never announced. +New [private](/help/channel-permissions) channels are never announced. {start_tabs} diff --git a/help/create-a-channel.md b/help/create-a-channel.md index afe77d19a1..65b4103a9a 100644 --- a/help/create-a-channel.md +++ b/help/create-a-channel.md @@ -26,12 +26,12 @@ There are several parameters you can set while creating a channel. All but * **Announce new stream in the [stream configured by your organization](/help/configure-automated-notices#new-stream-announcements)**: Posts a message in the "new streams" topic advertising the new stream. -* **Who can access the stream?**: See [Stream permissions](/help/stream-permissions). +* **Who can access the stream?**: See [Channel permissions](/help/channel-permissions). * **Default stream for new users**: Whether new users will be [automatically subscribed](/help/set-default-streams-for-new-users) to the new stream. -* **Who can post to the stream?**: See [Stream permissions](/help/stream-permissions). +* **Who can post to the stream?**: See [Channel permissions](/help/channel-permissions). * **Who can unsubscribe others from this stream?**: See [Restrict stream membership management](/help/configure-who-can-invite-to-streams#configure-who-can-remove-users). @@ -45,6 +45,6 @@ There are several parameters you can set while creating a channel. All but ## Related articles * [Create channels for a new organization](/help/create-channels) -* [Stream permissions](/help/stream-permissions) +* [Channel permissions](/help/channel-permissions) * [Set default streams for new users](/help/set-default-streams-for-new-users) * [Browse and subscribe to channels](/help/browse-and-subscribe-to-channels) diff --git a/help/create-channels.md b/help/create-channels.md index bda9d546d3..68cbbd3599 100644 --- a/help/create-channels.md +++ b/help/create-channels.md @@ -16,6 +16,6 @@ For more details about channel settings, see [Create a channel](/help/create-a-c * [Setting up your organization](/help/getting-your-organization-started-with-zulip) * [Create a channel](/help/create-a-channel#channel-options) -* [Stream permissions](/help/stream-permissions) +* [Channel permissions](/help/channel-permissions) * [Set default streams for new users](/help/set-default-streams-for-new-users) * [Getting started with Zulip](/help/getting-started-with-zulip) diff --git a/help/export-your-organization.md b/help/export-your-organization.md index 39e26a1c5e..46ba7363cd 100644 --- a/help/export-your-organization.md +++ b/help/export-your-organization.md @@ -12,12 +12,12 @@ Zulip Cloud service to your own servers. Two types of data exports are available to all Zulip Cloud organizations: * [**Export of public data**](#export-of-public-data): Complete data for your - organization *other than* [private stream](/help/stream-permissions) messages + organization *other than* [private channel](/help/channel-permissions) messages and [direct messages](/help/direct-messages). * [**Full export with member consent**](#full-export-with-member-consent): Everything in the export of public data, plus all the [private - stream](/help/stream-permissions) messages and [direct + channel](/help/channel-permissions) messages and [direct messages](/help/direct-messages) of members who opt in to have their data exported. @@ -66,7 +66,7 @@ file from that page. In addition to your organization's public data, this export includes all the messages received by any user in the organization who consents to the data export. In particular, it includes any [private -stream](/help/stream-permissions) messages and [direct +channel](/help/channel-permissions) messages and [direct messages](/help/direct-messages) where *at least one of the recipients* has given consent. @@ -88,7 +88,7 @@ subscriptions exported, but will have no personalized message history. 1. You will receive an archive in the `.tar.gz` format containing all public information for your organization, plus [private - stream](/help/stream-permissions) messages and [direct + channel](/help/channel-permissions) messages and [direct messages](/help/direct-messages) for users who gave consent. 1. Import the tarball using [Zulip's logical data import tool][import-only]. diff --git a/help/include/sidebar_index.md b/help/include/sidebar_index.md index 00c44d948d..f744ea88fa 100644 --- a/help/include/sidebar_index.md +++ b/help/include/sidebar_index.md @@ -200,7 +200,7 @@ * [Restrict permissions of new members](/help/restrict-permissions-of-new-members) ## Stream management -* [Stream permissions](/help/stream-permissions) +* [Channel permissions](/help/channel-permissions) * [Public access option](/help/public-access-option) * [Stream posting policy](/help/stream-sending-policy) * [Restrict stream creation](/help/configure-who-can-create-streams) diff --git a/help/manage-user-channel-subscriptions.md b/help/manage-user-channel-subscriptions.md index ca3a8f4e42..53855e17e2 100644 --- a/help/manage-user-channel-subscriptions.md +++ b/help/manage-user-channel-subscriptions.md @@ -5,7 +5,7 @@ !!! warn "" **Note**: The list of a user's **Subscribed channels** will be limited to - channels for which [you can see all subscribers](/help/stream-permissions). + channels for which [you can see all subscribers](/help/channel-permissions). {start_tabs} @@ -87,7 +87,7 @@ channel](/help/unsubscribe-from-a-channel). ## Related articles -* [Stream permissions](/help/stream-permissions) +* [Channel permissions](/help/channel-permissions) * [Roles and permissions](/help/roles-and-permissions) * [Add or remove users from a channel](/help/add-or-remove-users-from-a-channel) * [Unsubscribe from a channel](/help/unsubscribe-from-a-channel) diff --git a/help/move-content-to-another-channel.md b/help/move-content-to-another-channel.md index f79154e106..bb97f48c42 100644 --- a/help/move-content-to-another-channel.md +++ b/help/move-content-to-another-channel.md @@ -78,7 +78,7 @@ Access to messages moved to another channel will immediately be controlled by th access policies for the destination channel. Content moved to a private channel will thus appear to be deleted to users who are not subscribers of the destination channel. -Content moved to a [private channel with protected history](/help/stream-permissions) +Content moved to a [private channel with protected history](/help/channel-permissions) will only be accessible to users who both: * Were subscribed to the *original* channel when the content was *sent*. @@ -86,7 +86,7 @@ will only be accessible to users who both: ## Moving content out of private channels -In [private channels with protected history](/help/stream-permissions), +In [private channels with protected history](/help/channel-permissions), Zulip determines whether to treat the entire topic as moved using the access permissions of the user requesting the topic move. This means that the automated notices sent by the notification bot will report diff --git a/help/public-access-option.md b/help/public-access-option.md index b4dea4dacc..9e7bf4d7db 100644 --- a/help/public-access-option.md +++ b/help/public-access-option.md @@ -173,5 +173,5 @@ with [Zulip's Rules of Use](https://zulip.com/policies/rules). ## Related articles * [Moderating open organizations](/help/moderating-open-organizations) -* [Stream permissions](/help/stream-permissions) +* [Channel permissions](/help/channel-permissions) * [Restrict stream creation](/help/configure-who-can-create-streams) diff --git a/help/roles-and-permissions.md b/help/roles-and-permissions.md index cc5052e3f9..0fe3b2d0fb 100644 --- a/help/roles-and-permissions.md +++ b/help/roles-and-permissions.md @@ -9,14 +9,14 @@ role](/help/roles-and-permissions#change-a-users-role) if needed. !!! tip "" - Learn about [stream permissions](/help/stream-permissions), including - **public** and **private** streams. + Learn about [channel permissions](/help/channel-permissions), including + **public** and **private** channels. -* **Organization owner**: Can manage users, public streams, organization +* **Organization owner**: Can manage users, public channels, organization settings, and billing. Organization owners can do anything that an organization administrator can do. -* **Organization administrator**: Can manage users, public streams, and +* **Organization administrator**: Can manage users, public channels, and organization settings. Cannot make someone an owner, or change an existing owner's role. @@ -25,15 +25,15 @@ role](/help/roles-and-permissions#change-a-users-role) if needed. your organization. * **Member**: This is the default role for most users. Members have access to - all public streams. You can [configure different + all public channels. You can [configure different permissions](/help/restrict-permissions-of-new-members) for **new members** and **full members**, which is especially useful for [moderating open organizations](/help/moderating-open-organizations). New members automatically become full members after a configurable waiting period. -* **Guest**: Can view and send messages in streams they have been added to. - Guests cannot see other streams, unless they have been specifically added to - the stream. See [guest users documentation](/help/guest-users) for additional +* **Guest**: Can view and send messages in channels they have been added to. + Guests cannot see other channels, unless they have been specifically added to + the channel. See [guest users documentation](/help/guest-users) for additional details and configuration options. * **Billing administrator**: The user who upgrades the organization to @@ -65,7 +65,7 @@ role](/help/roles-and-permissions#change-a-users-role) if needed. ## Related articles * [Change a user's role](/help/change-a-users-role) -* [Stream permissions](/help/stream-permissions) +* [Channel permissions](/help/channel-permissions) * [Inviting new users](/help/invite-new-users) * [Zulip Cloud billing](/help/zulip-cloud-billing) * [Guest users](/help/guest-users) diff --git a/help/search-for-messages.md b/help/search-for-messages.md index 719ec2af7b..6fac90c52f 100644 --- a/help/search-for-messages.md +++ b/help/search-for-messages.md @@ -140,7 +140,7 @@ the specified rule. For example: ## Searching shared history -Zulip's [stream permissions](/help/stream-permissions) model allows access to +Zulip's [channel permissions](/help/channel-permissions) model allows access to the full history of public streams and private streams with shared history, including messages sent before you joined the stream (or organization), or those sent to public streams you are not subscribed to. diff --git a/help/view-someones-profile.md b/help/view-someones-profile.md index ab96353d01..be21b830cb 100644 --- a/help/view-someones-profile.md +++ b/help/view-someones-profile.md @@ -20,9 +20,9 @@ A user's profile displays key information about the user. Additional tabs showing: -- The streams that the user is subscribed to. Note that the list is limited to - streams for which you have [permission to see all - subscribers](/help/stream-permissions). +- The channel that the user is subscribed to. Note that the list is limited to + channel for which you have [permission to see all + subscribers](/help/channel-permissions). - The [user groups](/help/user-groups) to which they belong. {tab|mobile} diff --git a/templates/corporate/comparison_table_integrated.html b/templates/corporate/comparison_table_integrated.html index 958aaf65e7..816fa976aa 100644 --- a/templates/corporate/comparison_table_integrated.html +++ b/templates/corporate/comparison_table_integrated.html @@ -854,7 +854,7 @@ - Private streams with shared history + Private streams with shared history @@ -867,7 +867,7 @@ - Private streams with private history + Private streams with private history diff --git a/templates/corporate/for/business.html b/templates/corporate/for/business.html index 70cee45395..cad5ac2369 100644 --- a/templates/corporate/for/business.html +++ b/templates/corporate/for/business.html @@ -425,7 +425,7 @@
  • Automatically subscribe users to streams when they join, subscribe a group of users, or copy membership from another stream. Add users to the right streams for their team and role with custom invitation links.
    • -
  • Manage your organization with fine-grained permission settings for administrators and moderators, and custom viewing and posting permissions for streams.
    • +
  • Manage your organization with fine-grained permission settings for administrators and moderators, and custom viewing and posting permissions for streams.
  • Add partners, vendors and temporary contractors as guest users in your organization. diff --git a/templates/corporate/for/education.html b/templates/corporate/for/education.html index cfc0beee64..e2345cfb2a 100644 --- a/templates/corporate/for/education.html +++ b/templates/corporate/for/education.html @@ -167,8 +167,8 @@
    @@ -279,7 +279,7 @@
  • File storage up to 5 GB total
  • Complete team chat solution
  • Hundreds of integrations
    • -
  • Advanced roles and permissions
    • +
  • Advanced roles and permissions
  • Guest accounts
    • diff --git a/templates/corporate/for/events.html b/templates/corporate/for/events.html index 6faf5d5382..8f9ea1f8eb 100644 --- a/templates/corporate/for/events.html +++ b/templates/corporate/for/events.html @@ -228,7 +228,7 @@
  • Signing up for Zulip is quick and easy. Participants can make an account, or log in with Google, Apple, etc.
  • Automatically subscribe members to streams when they join, subscribe a group of users, or copy membership from another stream.
    • -
  • Make an announcement stream where only organizers can post messages. Use private streams to plan the event.
    • +
  • Make an announcement stream where only organizers can post messages. Use private streams to plan the event.
    • diff --git a/templates/corporate/for/open-source.html b/templates/corporate/for/open-source.html index e5af85b629..d2248596f5 100644 --- a/templates/corporate/for/open-source.html +++ b/templates/corporate/for/open-source.html @@ -566,7 +566,7 @@
  • Manage your community with - + fine-grained permission settings for administrators and moderators. diff --git a/templates/corporate/for/research.html b/templates/corporate/for/research.html index bc9580f8d3..2ec269ea91 100644 --- a/templates/corporate/for/research.html +++ b/templates/corporate/for/research.html @@ -308,7 +308,7 @@ they join.
    • -
  • Manage your community with fine-grained permission settings for administrators and moderators.
    • +
  • Manage your community with fine-grained permission settings for administrators and moderators.
  • Zulip offers dozens of features diff --git a/templates/corporate/policies/privacy.md b/templates/corporate/policies/privacy.md index aa69956ba4..9772fdacca 100644 --- a/templates/corporate/policies/privacy.md +++ b/templates/corporate/policies/privacy.md @@ -195,7 +195,7 @@ parties listed in this section. We do not sell Personal Data. otherwise provide data to Zulip, it may be shared with some or all other users in that Zulip Organization. Please note that some Zulip streams [may be accessible to the general - public](/help/stream-permissions), in addition to the + public](/help/channel-permissions), in addition to the stream’s current subscribers. For more information, please review our [Terms of Service](/policies/terms). - Zulip Organization Administrators may export all Zulip data for a Zulip diff --git a/templates/corporate/pricing_model.html b/templates/corporate/pricing_model.html index 22d43834da..75b0a77b3d 100644 --- a/templates/corporate/pricing_model.html +++ b/templates/corporate/pricing_model.html @@ -40,7 +40,7 @@
  • File storage up to 5 GB total
  • Complete team chat solution
  • Hundreds of integrations
    • -
  • Advanced roles and permissions
    • +
  • Advanced roles and permissions
  • Guest accounts
  • Many organizations are eligible for a free Standard plan
    • diff --git a/templates/corporate/self-hosting.html b/templates/corporate/self-hosting.html index 7dbf746a98..0fc9208d80 100644 --- a/templates/corporate/self-hosting.html +++ b/templates/corporate/self-hosting.html @@ -50,7 +50,7 @@ Unlike the competition, you don't pay for SAML authentication, LDAP - sync, or advanced roles and permissions. There + sync, or advanced roles and permissions. There is no “open core” catch — just freely available world-class software.

    diff --git a/web/templates/stream_settings/stream_types.hbs b/web/templates/stream_settings/stream_types.hbs index dbc0be6fcb..e7ac8768f6 100644 --- a/web/templates/stream_settings/stream_types.hbs +++ b/web/templates/stream_settings/stream_types.hbs @@ -1,7 +1,7 @@
    diff --git a/zerver/actions/streams.py b/zerver/actions/streams.py index e1b2151e7b..c3181a8aa6 100644 --- a/zerver/actions/streams.py +++ b/zerver/actions/streams.py @@ -1181,7 +1181,7 @@ def send_change_stream_permission_notification( ) notification_string = notification_string.format( user=user_mention, - help_link="/help/stream-permissions", + help_link="/help/channel-permissions", old_policy=old_policy_name, new_policy=new_policy_name, ) diff --git a/zerver/lib/url_redirects.py b/zerver/lib/url_redirects.py index 6079500dfa..778ddb152d 100644 --- a/zerver/lib/url_redirects.py +++ b/zerver/lib/url_redirects.py @@ -103,6 +103,7 @@ HELP_DOCUMENTATION_REDIRECTS: List[URLRedirect] = [ URLRedirect( "/help/manage-user-stream-subscriptions", "/help/manage-user-channel-subscriptions" ), + URLRedirect("/help/stream-permissions", "/help/channel-permissions"), ] LANDING_PAGE_REDIRECTS = [ diff --git a/zerver/openapi/zulip.yaml b/zerver/openapi/zulip.yaml index 6dbe98f386..670dd32391 100644 --- a/zerver/openapi/zulip.yaml +++ b/zerver/openapi/zulip.yaml @@ -813,7 +813,7 @@ paths: When a user subscribes to a stream, the current user will receive this event only if they [have permission to see the stream's subscriber - list](/help/stream-permissions). When the current user gains permission + list](/help/channel-permissions). When the current user gains permission to see a given stream's subscriber list, they will receive this event for the existing subscriptions to the stream. @@ -1274,7 +1274,7 @@ paths: organization administrators will receive this event). This event is also sent when a user gains access to a stream they - previously [could not access](/help/stream-permissions), such as + previously [could not access](/help/channel-permissions), such as when their [role](/help/roles-and-permissions) changes, a private stream is made public, or a guest user is subscribed to a public (or private) stream. @@ -1345,7 +1345,7 @@ paths: Event sent to all users who can see a stream when it is deactivated. This event is also sent when a user loses access to a stream they - previously [could access](/help/stream-permissions) because they + previously [could access](/help/channel-permissions) because they are unsubscribed from a private stream or their [role](/help/roles-and-permissions) has changed. @@ -2068,7 +2068,7 @@ paths: `recipient_id` fields. [message-move-stream]: /help/move-content-to-another-channel - [stream-access]: /help/stream-permissions + [stream-access]: /help/channel-permissions properties: id: $ref: "#/components/schemas/EventIdSchema" @@ -7996,7 +7996,7 @@ paths: a target message ID of `first_message_id_allowed_to_move`, if the user desires to move only the portion of the topic that they can. - Note that in a stream with [protected history](/help/stream-permissions), + Note that in a stream with [protected history](/help/channel-permissions), the Zulip security model requires that the above calculations only include messages the acting user has access to. So in the rare case of a user attempting to move a topic that started before the user joined a private @@ -9084,7 +9084,7 @@ paths: Get all topics the user has access to in a specific stream. Note that for private streams with [protected - history](/help/stream-permissions), the user will only have access to + history](/help/channel-permissions), the user will only have access to topics of messages sent after they [subscribed to](/api/subscribe) the stream. Similarly, a user's [bot](/help/bots-overview#bot-type) will only have access to messages sent after the bot was subscribed to @@ -9242,7 +9242,7 @@ paths: by the optional parameters, like `invite_only`, detailed below. Note that the ability to subscribe oneself and/or other users to a specified - stream depends on the [stream's privacy settings](/help/stream-permissions). + stream depends on the [stream's privacy settings](/help/channel-permissions). **Changes**: Before Zulip 8.0 (feature level 208), if a user specified by the [`principals`][principals-param] parameter was @@ -9609,9 +9609,9 @@ paths: - Organization administrators can remove any user from any stream. - Users can remove a bot that they own from any stream that - the user [can access](/help/stream-permissions). + the user [can access](/help/channel-permissions). - Users can unsubscribe any user from a stream if they [have - access](/help/stream-permissions) to the stream and are a + access](/help/channel-permissions) to the stream and are a member of the [user group](/api/get-user-groups) specified by the [`can_remove_subscribers_group`][can-remove-parameter] for the stream. @@ -17571,7 +17571,7 @@ paths: summary: Get all streams tags: ["streams"] description: | - Get all streams that the user [has access to](/help/stream-permissions). + Get all streams that the user [has access to](/help/channel-permissions). x-curl-examples-parameters: oneOf: - type: include @@ -17866,12 +17866,12 @@ paths: including: - Stream [name](/help/rename-a-stream) and [description](/help/change-the-stream-description) - - Stream [permissions](/help/stream-permissions), including + - Stream [permissions](/help/channel-permissions), including [privacy](/help/change-the-privacy-of-a-stream) and [who can send](/help/stream-sending-policy). Note that an organization administrator's ability to change a - [private stream's permissions](/help/stream-permissions#private-streams) + [private stream's permissions](/help/channel-permissions#private-channels) depends on them being subscribed to the stream. x-curl-examples-parameters: oneOf: @@ -17951,7 +17951,7 @@ paths: newly subscribed members, or users can only access messages they actually received while subscribed to the stream. - Corresponds to the [shared history](/help/stream-permissions) + Corresponds to the [shared history](/help/channel-permissions) option in documentation. It's an error for this parameter to be false for a public or @@ -21658,7 +21658,7 @@ components: newly subscribed members, or users can only access messages they actually received while subscribed to the stream. - Corresponds to the [shared history](/help/stream-permissions) + Corresponds to the [shared history](/help/channel-permissions) option in documentation. type: boolean example: false @@ -21746,7 +21746,7 @@ components: ID of the [user group](/api/get-user-groups) whose members are allowed to unsubscribe others from the stream. Note that a user who is a member of the specified user group must also [have - access](/help/stream-permissions) to the stream in order to + access](/help/channel-permissions) to the stream in order to unsubscribe others. This setting can currently only be set to user groups that are diff --git a/zerver/tests/test_subs.py b/zerver/tests/test_subs.py index 7e784c94f0..89c736f9db 100644 --- a/zerver/tests/test_subs.py +++ b/zerver/tests/test_subs.py @@ -679,7 +679,7 @@ class StreamAdminTest(ZulipTestCase): messages = get_topic_messages(user_profile, stream, "channel events") self.assert_length(messages, 1) expected_notification = ( - f"@_**King Hamlet|{user_profile.id}** changed the [access permissions](/help/stream-permissions) " + f"@_**King Hamlet|{user_profile.id}** changed the [access permissions](/help/channel-permissions) " "for this channel from **Private, protected history** to **Public**." ) self.assertEqual(messages[0].content, expected_notification) @@ -740,7 +740,7 @@ class StreamAdminTest(ZulipTestCase): messages = get_topic_messages(user_profile, stream, "channel events") self.assert_length(messages, 1) expected_notification = ( - f"@_**King Hamlet|{user_profile.id}** changed the [access permissions](/help/stream-permissions) " + f"@_**King Hamlet|{user_profile.id}** changed the [access permissions](/help/channel-permissions) " "for this channel from **Public** to **Private, protected history**." ) self.assertEqual(messages[0].content, expected_notification) @@ -857,7 +857,7 @@ class StreamAdminTest(ZulipTestCase): messages = get_topic_messages(user_profile, stream, "channel events") self.assert_length(messages, 1) expected_notification = ( - f"@_**{user_profile.full_name}|{user_profile.id}** changed the [access permissions](/help/stream-permissions) " + f"@_**{user_profile.full_name}|{user_profile.id}** changed the [access permissions](/help/channel-permissions) " "for this channel from **Private, protected history** to **Public, protected history**." ) self.assertEqual(messages[0].content, expected_notification) @@ -896,7 +896,7 @@ class StreamAdminTest(ZulipTestCase): messages = get_topic_messages(user_profile, stream, "channel events") self.assert_length(messages, 1) expected_notification = ( - f"@_**King Hamlet|{user_profile.id}** changed the [access permissions](/help/stream-permissions) " + f"@_**King Hamlet|{user_profile.id}** changed the [access permissions](/help/channel-permissions) " "for this channel from **Public** to **Private, shared history**." ) self.assertEqual(messages[0].content, expected_notification) @@ -935,7 +935,7 @@ class StreamAdminTest(ZulipTestCase): messages = get_topic_messages(user_profile, stream, "channel events") self.assert_length(messages, 1) expected_notification = ( - f"@_**King Hamlet|{user_profile.id}** changed the [access permissions](/help/stream-permissions) " + f"@_**King Hamlet|{user_profile.id}** changed the [access permissions](/help/channel-permissions) " "for this channel from **Private, protected history** to **Private, shared history**." ) self.assertEqual(messages[0].content, expected_notification) @@ -1018,7 +1018,7 @@ class StreamAdminTest(ZulipTestCase): messages = get_topic_messages(user_profile, stream, "channel events") self.assert_length(messages, 1) expected_notification = ( - f"@_**King Hamlet|{user_profile.id}** changed the [access permissions](/help/stream-permissions) " + f"@_**King Hamlet|{user_profile.id}** changed the [access permissions](/help/channel-permissions) " "for this channel from **Public** to **Web-public**." ) self.assertEqual(messages[0].content, expected_notification) @@ -1055,7 +1055,7 @@ class StreamAdminTest(ZulipTestCase): messages = get_topic_messages(user_profile, stream, "channel events") self.assert_length(messages, 1) expected_notification = ( - f"@_**Iago|{user_profile.id}** changed the [access permissions](/help/stream-permissions) " + f"@_**Iago|{user_profile.id}** changed the [access permissions](/help/channel-permissions) " "for this channel from **Private, protected history** to **Private, shared history**." ) self.assertEqual(messages[0].content, expected_notification) @@ -1085,7 +1085,7 @@ class StreamAdminTest(ZulipTestCase): messages = get_topic_messages(user_profile, stream, "channel events") self.assert_length(messages, 2) expected_notification = ( - f"@_**Iago|{user_profile.id}** changed the [access permissions](/help/stream-permissions) " + f"@_**Iago|{user_profile.id}** changed the [access permissions](/help/channel-permissions) " "for this channel from **Private, shared history** to **Private, protected history**." ) self.assertEqual(messages[1].content, expected_notification)