help: Rename and redirect stream-sending-policy for channel.

This commit is contained in:
Lauryn Menard 2024-05-01 20:45:04 +02:00 committed by Tim Abbott
parent 5342d4ecfb
commit c931966e1b
14 changed files with 29 additions and 28 deletions

View File

@ -39,7 +39,7 @@ The **bot type** determines what the bot can do.
Bot type | Permissions | Common uses Bot type | Permissions | Common uses
---|---|--- ---|---|---
Generic | Like a normal user account | Automating tasks, bots that listen to all messages on a stream Generic | Like a normal user account | Automating tasks, bots that listen to all messages on a channel
Incoming webhook | Limited to only sending messages into Zulip | Automated notifications into Zulip Incoming webhook | Limited to only sending messages into Zulip | Automated notifications into Zulip
Outgoing webhook | Generic bot that also receives new messages via HTTP post requests | Third party integrations, most custom bots Outgoing webhook | Generic bot that also receives new messages via HTTP post requests | Third party integrations, most custom bots
@ -49,16 +49,16 @@ bot can.
A few more details: A few more details:
* Bots can send messages to any stream that their owner can, * Bots can send messages to any channel that their owner can,
inheriting their owner's [sending permissions](/help/stream-sending-policy). inheriting their owner's [sending permissions](/help/channel-posting-policy).
* Bots can be subscribed to streams, and their role can be modified if * Bots can be subscribed to channels, and their role can be modified if
they need to have permission to do administrative actions. they need to have permission to do administrative actions.
* [Channel permissions](/help/channel-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 as for other users. Therefore, for private channels with protected
history, a bot can only access messages sent after it subscribed history, a bot can only access messages sent after it subscribed
to the stream. to the channel.
* **Generic**: A generic bot is like a normal Zulip user account that * **Generic**: A generic bot is like a normal Zulip user account that
cannot log in via a browser. Note that if you truly want to cannot log in via a browser. Note that if you truly want to
@ -66,7 +66,7 @@ A few more details:
account), you'll need to use your **personal API key**. account), you'll need to use your **personal API key**.
* **Outgoing webhook**: The bot can read direct messages where the bot is a * **Outgoing webhook**: The bot can read direct messages where the bot is a
participant, and stream messages where the bot is [mentioned](/help/mention-a-user-or-group). When the participant, and channel messages where the bot is [mentioned](/help/mention-a-user-or-group). When the
bot is DM'd or mentioned, it POSTs the message content to a URL of your bot is DM'd or mentioned, it POSTs the message content to a URL of your
choice. The POST request format can be in a Zulip format or a choice. The POST request format can be in a Zulip format or a
Slack-compatible format. Slack-compatible format.

View File

@ -81,7 +81,7 @@ administrator can access private channel messages:
<span class="legend_symbol">&#9726;</span><span class="legend_label">If subscribed to the channel</span> <span class="legend_symbol">&#9726;</span><span class="legend_label">If subscribed to the channel</span>
<span class="legend_symbol">&#10038;</span><span class="legend_label"> <span class="legend_symbol">&#10038;</span><span class="legend_label">
Configurable. See [Stream posting policy](/help/stream-sending-policy), Configurable. See [Channel posting policy](/help/channel-posting-policy),
[Configure who can add users][add-users], and [Configure who can add users][add-users], and
[Configure who can remove users][remove-users] [Configure who can remove users][remove-users]
for details. for details.
@ -112,7 +112,7 @@ for details.
<span class="legend_symbol">&#10038;</span><span class="legend_label"> <span class="legend_symbol">&#10038;</span><span class="legend_label">
Configurable, but at minimum must be subscribed to the channel. Configurable, but at minimum must be subscribed to the channel.
See [Stream posting policy](/help/stream-sending-policy), See [Channel posting policy](/help/channel-posting-policy),
[Configure who can add users][add-users], and [Configure who can add users][add-users], and
[Configure who can remove users][remove-users] [Configure who can remove users][remove-users]
for details. for details.
@ -121,7 +121,7 @@ for details.
## Related articles ## Related articles
* [Roles and permissions](/help/roles-and-permissions) * [Roles and permissions](/help/roles-and-permissions)
* [Stream sending policy](/help/stream-sending-policy) * [Channel sending policy](/help/channel-posting-policy)
* [Web-public channels](/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 [add-users]: /help/configure-who-can-invite-to-streams#configure-who-can-add-users

View File

@ -1,9 +1,9 @@
# Stream posting policy # Channel posting policy
{!admin-only.md!} {!admin-only.md!}
By default, anyone who belongs to a stream can also send messages to By default, anyone who belongs to a channel can also send messages to
the stream. However, sometimes it's useful to have a stream (often a the channel. However, sometimes it's useful to have a channel (often a
[default stream](/help/set-default-streams-for-new-users)) where only [default stream](/help/set-default-streams-for-new-users)) where only
certain users can send messages. certain users can send messages.
@ -11,11 +11,11 @@ certain users can send messages.
{relative|stream|all} {relative|stream|all}
1. Select a stream. 1. Select a channel.
{!select-channel-view-general.md!} {!select-channel-view-general.md!}
1. Under **Stream permissions**, configure **Who can post to the stream**. 1. Under **Channel permissions**, configure **Who can post to the channel**.
{!save-changes.md!} {!save-changes.md!}

View File

@ -15,7 +15,7 @@ language](/help/change-your-language).
Notices about stream settings changes, such as [name](/help/rename-a-stream), Notices about stream settings changes, such as [name](/help/rename-a-stream),
[description](/help/change-the-stream-description), [description](/help/change-the-stream-description),
[permission](/help/channel-permissions) and [permission](/help/channel-permissions) and
[policy](/help/stream-sending-policy) updates are sent to the [policy](/help/channel-posting-policy) updates are sent to the
“stream events” topic in the stream that was modified. “stream events” topic in the stream that was modified.
### New stream announcements ### New stream announcements

View File

@ -202,7 +202,7 @@
## Stream management ## Stream management
* [Channel permissions](/help/channel-permissions) * [Channel permissions](/help/channel-permissions)
* [Public access option](/help/public-access-option) * [Public access option](/help/public-access-option)
* [Stream posting policy](/help/stream-sending-policy) * [Channel posting policy](/help/channel-posting-policy)
* [Restrict stream creation](/help/configure-who-can-create-streams) * [Restrict stream creation](/help/configure-who-can-create-streams)
* [Restrict stream membership management](/help/configure-who-can-invite-to-streams) * [Restrict stream membership management](/help/configure-who-can-invite-to-streams)
* [Add or remove users from a channel](/help/add-or-remove-users-from-a-channel) * [Add or remove users from a channel](/help/add-or-remove-users-from-a-channel)

View File

@ -53,7 +53,7 @@ problematic behavior.
so only [moderators](/help/roles-and-permissions) can mention everyone in your organization. so only [moderators](/help/roles-and-permissions) can mention everyone in your organization.
* Create a [default stream](/help/set-default-streams-for-new-users) * Create a [default stream](/help/set-default-streams-for-new-users)
for announcements where [only admins can for announcements where [only admins can
post](/help/stream-sending-policy). post](/help/channel-posting-policy).
* Restrict who can [send direct messages](/help/restrict-direct-messages). * Restrict who can [send direct messages](/help/restrict-direct-messages).
## Response ## Response

View File

@ -229,9 +229,9 @@ channel](/help/create-a-channel#channel-options).
For most classes, the following streams are recommended: For most classes, the following streams are recommended:
- **#announcements**: For general announcements about the class. When - **#announcements**: For general announcements about the class. When
creating this stream, [restrict posting creating this channel, [restrict posting
permissions](/help/stream-sending-policy) so that only course staff permissions](/help/channel-posting-policy) so that only course staff
([Administrators and moderators](/help/roles-and-permissions) are ([administrators and moderators](/help/roles-and-permissions)) are
allowed to post. allowed to post.
- **#staff (private)**: For discussions among course staff. - **#staff (private)**: For discussions among course staff.
- **#general**: For random topics, e.g. students forming study groups. - **#general**: For random topics, e.g. students forming study groups.

View File

@ -880,7 +880,7 @@
</tr> </tr>
<tr> <tr>
<td class="comparison-table-feature"> <td class="comparison-table-feature">
<a href="/help/stream-sending-policy">Stream posting permissions</a> <a href="/help/channel-posting-policy">Stream posting permissions</a>
</td> </td>
<td class="comparison-value-positive cloud-cell"><i class="icon icon-check"></i></td> <td class="comparison-value-positive cloud-cell"><i class="icon icon-check"></i></td>
<td class="comparison-value-positive cloud-cell"><i class="icon icon-check"></i></td> <td class="comparison-value-positive cloud-cell"><i class="icon icon-check"></i></td>

View File

@ -28,7 +28,7 @@
<div class="input-group"> <div class="input-group">
<label class="settings-field-label">{{t 'Who can post to the channel?'}} <label class="settings-field-label">{{t 'Who can post to the channel?'}}
{{> ../help_link_widget link="/help/stream-sending-policy" }} {{> ../help_link_widget link="/help/channel-posting-policy" }}
</label> </label>
<select name="stream-post-policy" class="stream_post_policy_setting prop-element settings_select bootstrap-focus-style" id="id_stream_post_policy" data-setting-widget-type="number"> <select name="stream-post-policy" class="stream_post_policy_setting prop-element settings_select bootstrap-focus-style" id="id_stream_post_policy" data-setting-widget-type="number">
{{#each stream_post_policy_values}} {{#each stream_post_policy_values}}

View File

@ -1359,7 +1359,7 @@ def send_change_stream_post_policy_notification(
) )
notification_string = notification_string.format( notification_string = notification_string.format(
user=user_mention, user=user_mention,
help_link="/help/stream-sending-policy", help_link="/help/channel-posting-policy",
old_policy=Stream.POST_POLICIES[old_post_policy], old_policy=Stream.POST_POLICIES[old_post_policy],
new_policy=Stream.POST_POLICIES[new_post_policy], new_policy=Stream.POST_POLICIES[new_post_policy],
) )

View File

@ -180,7 +180,7 @@ def convert_channel_data(
# If the channel is read-only, then only admins and moderators # If the channel is read-only, then only admins and moderators
# should be allowed to post in the converted Zulip stream. # should be allowed to post in the converted Zulip stream.
# For more details: https://zulip.com/help/stream-sending-policy # For more details: https://zulip.com/help/channel-posting-policy
# #
# See `Stream` model in `zerver/models/streams.py` to know about what each # See `Stream` model in `zerver/models/streams.py` to know about what each
# number represent. # number represent.

View File

@ -104,6 +104,7 @@ HELP_DOCUMENTATION_REDIRECTS: List[URLRedirect] = [
"/help/manage-user-stream-subscriptions", "/help/manage-user-channel-subscriptions" "/help/manage-user-stream-subscriptions", "/help/manage-user-channel-subscriptions"
), ),
URLRedirect("/help/stream-permissions", "/help/channel-permissions"), URLRedirect("/help/stream-permissions", "/help/channel-permissions"),
URLRedirect("/help/stream-sending-policy", "/help/channel-posting-policy"),
] ]
LANDING_PAGE_REDIRECTS = [ LANDING_PAGE_REDIRECTS = [

View File

@ -17868,7 +17868,7 @@ paths:
- Stream [name](/help/rename-a-stream) and [description](/help/change-the-stream-description) - Stream [name](/help/rename-a-stream) and [description](/help/change-the-stream-description)
- Stream [permissions](/help/channel-permissions), including - Stream [permissions](/help/channel-permissions), including
[privacy](/help/change-the-privacy-of-a-stream) and [who can [privacy](/help/change-the-privacy-of-a-stream) and [who can
send](/help/stream-sending-policy). send](/help/channel-posting-policy).
Note that an organization administrator's ability to change a Note that an organization administrator's ability to change a
[private stream's permissions](/help/channel-permissions#private-channels) [private stream's permissions](/help/channel-permissions#private-channels)

View File

@ -1990,7 +1990,7 @@ class StreamAdminTest(ZulipTestCase):
messages = get_topic_messages(user_profile, stream, "channel events") messages = get_topic_messages(user_profile, stream, "channel events")
expected_notification = ( expected_notification = (
f"@_**{user_profile.full_name}|{user_profile.id}** changed the " f"@_**{user_profile.full_name}|{user_profile.id}** changed the "
"[posting permissions](/help/stream-sending-policy) for this channel:\n\n" "[posting permissions](/help/channel-posting-policy) for this channel:\n\n"
"* **Old permissions**: All channel members can post.\n" "* **Old permissions**: All channel members can post.\n"
"* **New permissions**: Only organization administrators can post." "* **New permissions**: Only organization administrators can post."
) )
@ -2053,7 +2053,7 @@ class StreamAdminTest(ZulipTestCase):
messages = get_topic_messages(user_profile, stream, "channel events") messages = get_topic_messages(user_profile, stream, "channel events")
expected_notification = ( expected_notification = (
f"@_**{user_profile.full_name}|{user_profile.id}** changed the " f"@_**{user_profile.full_name}|{user_profile.id}** changed the "
"[posting permissions](/help/stream-sending-policy) for this channel:\n\n" "[posting permissions](/help/channel-posting-policy) for this channel:\n\n"
f"* **Old permissions**: {Stream.POST_POLICIES[old_post_policy]}.\n" f"* **Old permissions**: {Stream.POST_POLICIES[old_post_policy]}.\n"
f"* **New permissions**: {Stream.POST_POLICIES[policy]}." f"* **New permissions**: {Stream.POST_POLICIES[policy]}."
) )