Merge branch 'trunk' into add/fediverse-comments-filter

Author: pfefferle

.githooks/pre-commit

@@ -1,7 +1,9 @@
 #!/usr/bin/env sh
 
-# Get all changed PHP files once.
-PHP_FILES=$(git diff --cached --name-only --diff-filter=ACMR | grep "\.php$" || true)
+# Get all changed files once and filter by type.
+CHANGED_FILES=$(git diff --cached --name-only --diff-filter=ACMR)
+PHP_FILES=$(echo "$CHANGED_FILES" | grep "\.php$" || true)
+CSS_FILES=$(echo "$CHANGED_FILES" | grep -E "\.(css|scss)$" || true)
 
 # Skip if no PHP files are changed.
 if [ -n "$PHP_FILES" ]; then
@@ -54,6 +56,11 @@ if [ -n "$PHP_FILES" ]; then
   echo "$PHP_FILES" | xargs composer lint:fix > /dev/null 2>&1 || { echo "PHP formatting failed"; exit 1; }
 fi
 
+# Run Stylelint with auto-fix on changed CSS/SCSS files.
+if [ -n "$CSS_FILES" ]; then
+  echo "$CSS_FILES" | xargs npx wp-scripts lint-style --fix > /dev/null 2>&1 || { echo "CSS linting failed"; exit 1; }
+fi
+
 # Run the WordPress formatter without showing all file output.
 npm run format > /dev/null 2>&1 || { echo "JavaScript formatting failed"; exit 1; }
 

CHANGELOG.md

@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [7.8.1] - 2025-12-18
+### Added
+- Hide comments from specific post types in the WordPress admin comments list. [#2669]
+
+### Fixed
+- Prevent comment email notifications for ap_post. [#2667]
+- Prevent post creation when Reader is deactivated. [#2666]
+
 ## [7.8.0] - 2025-12-17
 ### Added
 - Add blocklist subscriptions for automatic weekly synchronization of remote blocklists. [#2590]
@@ -1603,6 +1611,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - initial
 
+[7.8.1]: https://github.com/Automattic/wordpress-activitypub/compare/7.8.0...7.8.1
 [7.8.0]: https://github.com/Automattic/wordpress-activitypub/compare/7.7.1...7.8.0
 [7.7.1]: https://github.com/Automattic/wordpress-activitypub/compare/7.7.0...7.7.1
 [7.7.0]: https://github.com/Automattic/wordpress-activitypub/compare/7.6.1...7.7.0

activitypub.php

@@ -3,7 +3,7 @@
  * Plugin Name: ActivityPub
  * Plugin URI: https://github.com/Automattic/wordpress-activitypub
  * Description: The ActivityPub protocol is a decentralized social networking protocol based upon the ActivityStreams 2.0 data format.
- * Version: 7.8.0
+ * Version: 7.8.1
  * Author: Matthias Pfefferle & Automattic
  * Author URI: https://automattic.com/
  * License: MIT
@@ -17,7 +17,7 @@
 
 namespace Activitypub;
 
-\define( 'ACTIVITYPUB_PLUGIN_VERSION', '7.8.0' );
+\define( 'ACTIVITYPUB_PLUGIN_VERSION', '7.8.1' );
 
 // Plugin related constants.
 \define( 'ACTIVITYPUB_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );

assets/css/activitypub-admin.css

@@ -73,9 +73,9 @@
 	display: block;
 	text-decoration: none;
 	color: inherit;
-	padding: .5rem 1rem 1rem;
+	padding: 0.5rem 1rem 1rem;
 	margin: 0 1rem;
-	transition: box-shadow .5s ease-in-out;
+	transition: box-shadow 0.5s ease-in-out;
 	white-space: nowrap;
 }
 
@@ -165,13 +165,6 @@ summary {
 	user-select: auto;
 }
 
-.activitypub-settings-accordion-trigger {
-	color: #2c3338;
-	cursor: pointer;
-	font-weight: 400;
-	text-align: left;
-}
-
 .activitypub-settings-accordion-trigger .title {
 	pointer-events: none;
 	font-weight: 600;
@@ -182,13 +175,13 @@ summary {
 .activitypub-settings-accordion-viewed .icon {
 	border: solid #50575e medium;
 	border-width: 0 2px 2px 0;
-	height: .5rem;
+	height: 0.5rem;
 	pointer-events: none;
 	position: absolute;
 	right: 1.5em;
 	top: 50%;
 	transform: translateY(-70%) rotate(45deg);
-	width: .5rem;
+	width: 0.5rem;
 }
 
 .activitypub-settings-accordion-trigger[aria-expanded="true"] .icon {
@@ -226,8 +219,8 @@ input.blog-user-identifier {
 	position: relative;
 	display: block;
 	margin-bottom: 40px;
-	background-image: rgb(168,165,175);
-	background-image: linear-gradient(180deg, red, yellow);
+	background-image: rgb(168, 165, 175);
+	background-image: linear-gradient(180deg, #f00, #ff0);
 	background-size: cover;
 }
 
@@ -244,8 +237,10 @@ input.blog-user-identifier {
 	margin-bottom: 0;
 }
 
+/* stylelint-disable-next-line selector-id-pattern -- WordPress core ID */
 #dashboard_right_now li a.activitypub-followers::before {
 	content: "\f307";
+	/* stylelint-disable-next-line font-family-no-missing-generic-family-keyword */
 	font-family: dashicons;
 }
 
@@ -260,6 +255,7 @@ input.blog-user-identifier {
 .extra-fields-nav a + a {
 	margin-left: 8px;
 }
+
 .rtl .extra-fields-nav a + a {
 	margin-left: auto;
 	margin-right: 8px;
@@ -268,16 +264,19 @@ input.blog-user-identifier {
 .contextual-help-tabs-wrap dt {
 	font-weight: 600;
 }
+
 .contextual-help-tabs-wrap .activitypub-block-screenshot {
 	margin: 10px 0;
 }
+
 .contextual-help-tabs-wrap .activitypub-block-screenshot img {
 	border: 1px solid #ddd;
 	border-radius: 4px;
 	box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
 	height: auto;
 	max-width: 100%;
 }
+
 .contextual-help-tabs-wrap .activitypub-block-screenshot figcaption {
 	color: #555;
 	font-style: italic;
@@ -310,7 +309,7 @@ input.blog-user-identifier {
 	color: #50575e;
 }
 
-.contextual-help-tabs-wrap blockquote cite:before {
+.contextual-help-tabs-wrap blockquote cite::before {
 	content: "—";
 }
 
@@ -337,8 +336,11 @@ input.blog-user-identifier {
 }
 
 .plugin-list .plugin-action-buttons li {
+	display: inline-block;
+	vertical-align: middle;
 	margin: 0 0 10px 0;
 }
+
 .plugin-list .plugin-card .action-links {
 	position: static;
 	margin-left: 148px;
@@ -351,11 +353,6 @@ input.blog-user-identifier {
 	text-align: left;
 }
 
-.plugin-list .plugin-action-buttons li {
-	display: inline-block;
-	vertical-align: middle;
-}
-
 .plugin-list .plugin-action-buttons li .button {
 	margin-right: 20px;
 }
@@ -364,11 +361,13 @@ input.blog-user-identifier {
 	margin-right: 24px;
 }
 
+/* stylelint-disable no-descending-specificity */
 .plugin-list .plugin-card .name,
 .plugin-list .plugin-card .desc,
 .plugin-card .desc > p {
 	margin-right: 0;
 }
+/* stylelint-enable no-descending-specificity */
 
 .plugin-list .plugin-card .desc p:first-of-type {
 	margin-top: 0;
@@ -388,11 +387,13 @@ input.blog-user-identifier {
 }
 
 @keyframes highlight-fade {
+
 	0% {
 		background-color: #e7f3ff;
 		border-color: #3582c4;
 		box-shadow: 0 0 0 1px #3582c4;
 	}
+
 	100% {
 		background-color: #fff;
 		border-color: #8c8f94;
@@ -401,6 +402,7 @@ input.blog-user-identifier {
 }
 
 @media screen and (max-width: 782px) {
+
 	.activitypub-settings {
 		margin: 0 22px;
 	}

assets/css/activitypub-embed.css

@@ -66,17 +66,6 @@
 
 .activitypub-embed-content .ap-preview {
 	border: 1px solid #e6e6e6;
-	border-radius: 8px;
-	overflow: hidden;
-}
-
-.activitypub-embed-content .ap-preview img {
-	width: 100%;
-	height: auto;
-	display: block;
-}
-
-.activitypub-embed-content .ap-preview {
 	border-radius: 8px;
 	box-sizing: border-box;
 	display: grid;
@@ -90,25 +79,10 @@
 	width: 100%;
 }
 
-.activitypub-embed-content .ap-preview.layout-1 {
-	grid-template-columns: 1fr;
-	grid-template-rows: 1fr;
-}
-
-.activitypub-embed-content .ap-preview.layout-2 {
-	aspect-ratio: auto;
-	grid-template-rows: 1fr;
-	height: auto;
-}
-
-.activitypub-embed-content .ap-preview.layout-3 > img:first-child {
-	grid-row: span 2;
-}
-
 .activitypub-embed-content .ap-preview img {
 	border: 0;
 	box-sizing: border-box;
-	display: inline-block;
+	display: block;
 	height: 100%;
 	object-fit: cover;
 	overflow: hidden;
@@ -127,6 +101,21 @@
 	width: 100%;
 }
 
+.activitypub-embed-content .ap-preview.layout-1 {
+	grid-template-columns: 1fr;
+	grid-template-rows: 1fr;
+}
+
+.activitypub-embed-content .ap-preview.layout-2 {
+	aspect-ratio: auto;
+	grid-template-rows: 1fr;
+	height: auto;
+}
+
+.activitypub-embed-content .ap-preview.layout-3 > img:first-child {
+	grid-row: span 2;
+}
+
 .activitypub-embed-content .ap-preview-text {
 	padding: 15px;
 }
@@ -145,7 +134,9 @@
 	align-items: center;
 	gap: 5px;
 }
+
 @media only screen and (max-width: 399px) {
+
 	.activitypub-embed-meta span.ap-stat {
 		display: none !important;
 	}

assets/css/activitypub-post-preview.css

@@ -84,25 +84,25 @@ main address {
 	font-style: normal;
 }
 
-main address .name,
-main address .webfinger {
-	color: #000;
-}
-
 .name {
 	color: #ccc;
-	font-weight: bold;
+	font-weight: 700;
 	display: block;
 }
 
 .webfinger {
 	color: #ccc;
 	font-size: 0.8em;
-	font-weight: bold;
+	font-weight: 700;
 	display: block;
 	margin-top: 0.5em;
 }
 
+main address .name,
+main address .webfinger {
+	color: #000;
+}
+
 address img,
 .sidebar .fake-image {
 	border-radius: 8px;
@@ -150,10 +150,6 @@ main .attachments.layout-2 {
 	height: auto;
 }
 
-main .attachments.layout-3 > img:first-child {
-	grid-row: span 2;
-}
-
 main .attachments img {
 	border: 0;
 	box-sizing: border-box;
@@ -165,6 +161,10 @@ main .attachments img {
 	width: 100%;
 }
 
+main .attachments.layout-3 > img:first-child {
+	grid-row: span 2;
+}
+
 main .attachments video,
 main .attachments audio {
 	max-width: 100%;