More powerful interaction limits 💪🏻 (#16335)

content/github/building-a-strong-community/index.md

@@ -37,6 +37,7 @@ versions:
     {% link_in_list /managing-disruptive-comments %}
     {% link_in_list /locking-conversations %}
     {% link_in_list /limiting-interactions-in-your-repository %}
+    {% link_in_list /limiting-interactions-for-your-user-account %}
     {% link_in_list /limiting-interactions-in-your-organization %}
     {% link_in_list /tracking-changes-in-a-comment %}
     {% link_in_list /managing-how-contributors-report-abuse-in-your-organizations-repository %}

content/github/building-a-strong-community/limiting-interactions-for-your-user-account.md

@@ -0,0 +1,27 @@
+---
+title: Limiting interactions for your user account
+intro: 'You can temporarily enforce a period of limited activity for certain users in all public repositories owned by your user account.'
+versions:
+  free-pro-team: '*'
+permissions: Anyone can limit interactions for their own user account.
+---
+
+### About temporary interaction limits
+
+Limiting interactions for your user account enables temporary interaction limits for all public repositories owned by your user account. {% data reusables.community.interaction-limits-restrictions %}
+
+{% data reusables.community.interaction-limits-duration %} After the duration of your limit passes, users can resume normal activity in your public repositories.
+
+{% data reusables.community.types-of-interaction-limits %}
+
+When you enable user-wide activity limitations, you can't enable or disable interaction limits on individual repositories. For more information on limiting activity for an individual repository, see "[Limiting interactions in your repository](/articles/limiting-interactions-in-your-repository)."
+
+You can also block users. For more information, see "[Blocking a user from your personal account](/github/building-a-strong-community/blocking-a-user-from-your-personal-account)." 
+
+### Limiting interactions for your user account
+
+{% data reusables.user_settings.access_settings %}
+1. In your user settings sidebar, under "Moderation settings", click **Interaction limits**.
+  !["Interaction limits" tab in the user settings sidebar](/assets/images/help/settings/settings-sidebar-interaction-limits.png)
+{% data reusables.community.set-interaction-limit %}
+  ![Temporary interaction limit options](/assets/images/help/settings/user-account-temporary-interaction-limits-options.png)

content/github/building-a-strong-community/limiting-interactions-in-your-organization.md

@@ -1,31 +1,39 @@
 ---
 title: Limiting interactions in your organization
-intro: 'Organization owners can temporarily restrict certain users from commenting, opening issues, or creating pull requests in the organization''s public repositories to enforce a period of limited activity.'
+intro: 'You can temporarily enforce a period of limited activity for certain users in all public repositories owned by your organization.'
 redirect_from:
   - /github/setting-up-and-managing-organizations-and-teams/limiting-interactions-in-your-organization
   - /articles/limiting-interactions-in-your-organization
 versions:
   free-pro-team: '*'
+permissions: Organization owners can limit interactions in an organization.
 ---
 
-After 24 hours, users can resume normal activity in your organization's public repositories. When you enable organization-wide activity limitations, you can't enable or disable interaction limits on individual repositories. For more information on per-repository activity limitation, see "[Limiting interactions in your repository](/articles/limiting-interactions-in-your-repository)."
+### About temporary interaction limits
 
-{% tip %}
+Limiting interactions in your organization enables temporary interaction limits for all public repositories owned by the organization. {% data reusables.community.interaction-limits-restrictions %}
 
-**Tip:** Organization owners can also block users for a specific amount of time. After the block expires, the user is automatically unblocked. For more information, see "[Blocking a user from your organization](/articles/blocking-a-user-from-your-organization)." 
+{% data reusables.community.interaction-limits-duration %} After the duration of your limit passes, users can resume normal activity in your organization's public repositories.
 
-{% endtip %}
+{% data reusables.community.types-of-interaction-limits %}
+
+Members of the organization are not affected by any of the limit types.
+
+When you enable organization-wide activity limitations, you can't enable or disable interaction limits on individual repositories. For more information on limiting activity for an individual repository, see "[Limiting interactions in your repository](/articles/limiting-interactions-in-your-repository)."
+
+Organization owners can also block users for a specific amount of time. After the block expires, the user is automatically unblocked. For more information, see "[Blocking a user from your organization](/articles/blocking-a-user-from-your-organization)." 
+
+### Limiting interactions in your organization
 
 {% data reusables.profile.access_profile %}
 {% data reusables.profile.access_org %}
 {% data reusables.organizations.org_settings %}
-4. In your organization's Settings sidebar, click **Interaction limits**.
-![Interaction limits in organization settings ](/assets/images/help/organizations/org-settings-interaction-limits.png)
-5. Under "Temporary interaction limits", click one or more options.
+1. In the organization settings sidebar, click **Moderation settings**.
+  !["Moderation settings" in the organization settings sidebar](/assets/images/help/organizations/org-settings-moderation-settings.png)
+1. Under "Moderation settings", click **Interaction limits**.
+  !["Interaction limits" in the organization settings sidebar](/assets/images/help/organizations/org-settings-interaction-limits.png)
+{% data reusables.community.set-interaction-limit %}
   ![Temporary interaction limit options](/assets/images/help/organizations/organization-temporary-interaction-limits-options.png)
-   - **Limit to existing users**: Limits activity for organization users with accounts that are less than 24 hours old who do not have prior contributions and are not collaborators.
-   - **Limit to prior contributors**: Limits activity for organization users who have not previously contributed and are not collaborators.
-   - **Limit to repository collaborators**: Limits activity for organization users who do not have write access or are not collaborators.
 
 ### Further reading
 - "[Reporting abuse or spam](/articles/reporting-abuse-or-spam)"

content/github/building-a-strong-community/limiting-interactions-in-your-repository.md

@@ -1,30 +1,34 @@
 ---
 title: Limiting interactions in your repository
-intro: 'People with owner or admin access can temporarily restrict certain users from commenting, opening issues, or creating pull requests in your public repository to enforce a period of limited activity.'
+intro: 'You can temporarily enforce a period of limited activity for certain users on a public repository.'
 redirect_from:
   - /articles/limiting-interactions-with-your-repository/
   - /articles/limiting-interactions-in-your-repository
 versions:
   free-pro-team: '*'
+permissions: People with admin permissions to a repository can temporarily limit interactions in that repository.
 ---
 
-After 24 hours, users can resume normal activity in your repository.
+### About temporary interaction limits
 
-{% tip %}
+{% data reusables.community.interaction-limits-restrictions %}
 
-**Tip:** Organization owners can enable organization-wide activity limitations. If organization-wide activity limitations are enabled, you can't limit activity for individual repositories. For more information, see "[Limiting interactions in your organization](/articles/limiting-interactions-in-your-organization)."
+{% data reusables.community.interaction-limits-duration %} After the duration of your limit passes, users can resume normal activity in your repository.
 
-{% endtip %}
+{% data reusables.community.types-of-interaction-limits %}
+
+You can also enable activity limitations on all repositories owned by your user account or an organization. If a user-wide or organization-wide limit is enabled, you can't limit activity for individual repositories owned by the account. For more information, see "[Limiting interactions for your user account](/github/building-a-strong-community/limiting-interactions-for-your-user-account)" and "[Limiting interactions in your organization](/github/building-a-strong-community/limiting-interactions-in-your-organization)."
+
+### Limiting interactions in your repository
 
 {% data reusables.repositories.navigate-to-repo %}
 {% data reusables.repositories.sidebar-settings %}
-3. In your repository's Settings sidebar, click **Interaction limits**.
-![Interaction limits in repository settings ](/assets/images/help/repository/repo-settings-interaction-limits.png)
-4. Under "Temporary interaction limits", click one or more options:
+1. In the left sidebar, click **Moderation settings**.
+  !["Moderation settings" in repository settings sidebar](/assets/images/help/repository/repo-settings-moderation-settings.png)
+1. Under "Moderation settings", click **Interaction limits**.
+  ![Interaction limits in repository settings ](/assets/images/help/repository/repo-settings-interaction-limits.png)
+{% data reusables.community.set-interaction-limit %}
   ![Temporary interaction limit options](/assets/images/help/repository/temporary-interaction-limits-options.png)
-    - **Limit to existing users**: Limits activity for users with accounts that are less than 24 hours old who do not have prior contributions and are not collaborators.
-    - **Limit to prior contributors**: Limits activity for users who have not previously contributed and are not collaborators.
-    - **Limit to repository collaborators**: Limits activity for users who do not have write access or are not collaborators.
 
 ### Further reading
 - "[Reporting abuse or spam](/articles/reporting-abuse-or-spam)"

data/reusables/community/interaction-limits-duration.md

@@ -0,0 +1 @@
+When you enable an interaction limit, you can choose a duration for the limit: 24 hours, 3 days, 1 week, 1 month, or 6 months.

data/reusables/community/interaction-limits-restrictions.md

@@ -0,0 +1 @@
+Enabling an interaction limit for a repository restricts certain users from commenting, opening issues, creating pull requests, reacting with emojis, editing existing comments, and editing titles of issues and pull requests.

data/reusables/community/set-interaction-limit.md

@@ -0,0 +1 @@
+5. Under "Temporary interaction limits", to the right of the type of interaction limit you want to set, use the **Enable** drop-down menu, then click the duration you want for your interaction limit.

data/reusables/community/types-of-interaction-limits.md

@@ -0,0 +1,4 @@
+There are three types of interaction limits.
+   - **Limit to existing users**: Limits activity for users with accounts that are less than 24 hours old who do not have prior contributions and are not collaborators.
+   - **Limit to prior contributors**: Limits activity for users who have not previously contributed to the default branch of the repository and are not collaborators.
+   - **Limit to repository collaborators**: Limits activity for users who do not have write access to the repository.