Skip to content

Commit bf6053a

Browse files
authored
Merge branch 'trunk' into dependabot/npm_and_yarn/wordpress/components-29.0.0
2 parents 4f788ee + 56308cd commit bf6053a

File tree

98 files changed

+2882
-416
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+2882
-416
lines changed

.distignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ _site
1616
bin
1717
CHANGELOG.md
1818
CODE_OF_CONDUCT.md
19+
CONTRIBUTING.md
1920
composer.json
2021
composer.lock
2122
Dockerfile
@@ -40,4 +41,4 @@ readme.md
4041
SECURITY.md
4142
src
4243
tests
43-
vendor
44+
vendor

.github/workflows/deploy.yml

+4
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- uses: actions/checkout@master
12+
- name: Install SVN
13+
run: |
14+
sudo apt-get update
15+
sudo apt-get install subversion
1216
- name: WordPress Plugin Deploy
1317
uses: 10up/action-wordpress-plugin-deploy@stable
1418
env:

.wp-env.json

+14-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,17 @@
11
{
22
"core": null,
3-
"plugins": [ "." ]
3+
"plugins": [ "." ],
4+
"env": {
5+
"tests": {
6+
"config": {
7+
"WP_TESTS_DOMAIN": "example.org",
8+
"WP_SITEURL": "http://example.org",
9+
"WP_HOME": "http://example.org"
10+
},
11+
"mappings": {
12+
"wp-content/plugins/activitypub": ".",
13+
"wp-content/plugins/activitypub/tests": "./tests"
14+
}
15+
}
16+
}
417
}

CHANGELOG.md

+35-2
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,46 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99

1010
### Added
1111

12+
* `@mentions` in the JSON representation of the reply
13+
14+
### Improved
15+
16+
* Direct Messages: Improve HTML to e-mail text conversion
17+
18+
## [4.5.1] - 2024-12-18
19+
20+
### Improved
21+
22+
* Reactions block: Remove the `wp-block-editor` dependency for frontend views
23+
24+
### Fixed
25+
26+
* Direct Messages: Don't send notification for received public activities
27+
28+
## [4.5.0] - 2024-12-17
29+
30+
### Added
31+
32+
* Reactions block to display likes and reposts
1233
* `icon` support for `Audio` and `Video` attachments
1334
* Send "new follower" emails
1435
* Send "direct message" emails
36+
* Account for custom comment types when calculating comment counts
37+
* Plugin upgrade routine that automatically updates comment counts
1538

1639
### Improved
1740

41+
* Likes and Reposts enabled by default
1842
* Email templates for Likes and Reposts
1943
* Improve Interactions moderation
2044
* Compatibility with Akismet
45+
* Comment type mapping for `Like` and `Announce`
46+
* Signature verification for API endpoints
47+
* Changed priority of Attachments, to favor `Image` over `Audio` and `Video`
48+
49+
### Fixed
50+
51+
* Empty `url` attributes in the Reply block no longer cause PHP warnings
2152

2253
## [4.4.0] - 2024-12-09
2354

@@ -514,7 +545,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
514545

515546
* Normalize attributes that can have mixed value types
516547

517-
## [1.3.0] 2023-12-05
548+
## [1.3.0] - 2023-12-05
518549

519550
### Added
520551

@@ -1139,8 +1170,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
11391170

11401171
* initial
11411172

1142-
[Unreleased]: https://github.com/Automattic/wordpress-activitypub/compare/4.4.0...trunk
1173+
[Unreleased]: https://github.com/Automattic/wordpress-activitypub/compare/4.5.0...trunk
11431174
<!-- Add new release below and update "Unreleased" link -->
1175+
[4.5.1]: https://github.com/Automattic/wordpress-activitypub/compare/4.5.0...4.5.1
1176+
[4.5.0]: https://github.com/Automattic/wordpress-activitypub/compare/4.4.0...4.5.0
11441177
[4.4.0]: https://github.com/Automattic/wordpress-activitypub/compare/4.3.0...4.4.0
11451178
[4.3.0]: https://github.com/Automattic/wordpress-activitypub/compare/4.2.1...4.3.0
11461179
[4.2.1]: https://github.com/Automattic/wordpress-activitypub/compare/4.2.0...4.2.1

CODE_OF_CONDUCT.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ representative at an online or offline event.
6060

6161
Instances of abusive, harassing, or otherwise unacceptable behavior may be
6262
reported to the community leaders responsible for enforcement at
63-
https://developer.wordpress.com/contact/?g21-subject=Code%20of%20Conduct.
63+
<https://developer.wordpress.com/contact/?g21-subject=Code%20of%20Conduct>.
6464
All complaints will be reviewed and investigated promptly and fairly.
6565

6666
All community leaders are obligated to respect the privacy and security of the
@@ -116,13 +116,13 @@ the community.
116116

117117
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
118118
version 2.0, available at
119-
https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
119+
<https://www.contributor-covenant.org/version/2/0/code_of_conduct.html>.
120120

121121
Community Impact Guidelines were inspired by [Mozilla's code of conduct
122122
enforcement ladder](https://github.com/mozilla/diversity).
123123

124124
[homepage]: https://www.contributor-covenant.org
125125

126126
For answers to common questions about this code of conduct, see the FAQ at
127-
https://www.contributor-covenant.org/faq. Translations are available at
128-
https://www.contributor-covenant.org/translations.
127+
<https://www.contributor-covenant.org/faq>. Translations are available at
128+
<https://www.contributor-covenant.org/translations>.

CONTRIBUTING.md

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# Contributing to ActivityPub for WordPress
2+
3+
👍🎉 First off, thanks for taking the time to contribute! 🎉👍
4+
5+
Developers of all levels can help — whether you can barely recognize a filter (or don’t know what that means) or you’ve already authored your own plugins, there are ways for you to pitch in.
6+
7+
## Create Bug Reports
8+
9+
If you find a bug, please [file a GitHub issue](https://github.com/Automattic/wordpress-activitypub/issues/). If you have write access, add the appropriate labels.
10+
11+
If you’re filing a bug, specific steps to reproduce are helpful. Please include the URL of the page that has the bug, along with what you expected to see and what happened instead.
12+
13+
## Write and submit a patch
14+
15+
If you'd like to fix a bug or make an enhancement, you can submit a Pull Request. Before you get started, you'll want to **[set up your development environment.](docs/development-environment.md)**
16+
17+
Once your development environment is ready, you can get started and [create your first Pull Request!](docs/pull-request.md)
18+
19+
### Get started
20+
21+
If you'd like to contribute but don't know where to get started, you can take a look at existing issues:
22+
23+
- ["Good First Issues"](https://github.com/Automattic/wordpress-activitypub/labels/%5BType%5D%20Good%20First%20Issue) are a good entry point to get familiar with ActivityPub plugin's code base.
24+
- All issues labeled with [the "Good For Community" label](https://github.com/Automattic/wordpress-activitypub/issues?q=is%3Aopen+sort%3Aupdated-desc+label%3A%22Good+For+Community%22) are fair game. That's a great way to contribute new features and fix small issues within the ActivityPub plugin.
25+
26+
### We’re Here To Help
27+
28+
We encourage you to ask for help at any point. We want your first experience with the ActivityPub plugin to be a good one, so don’t be shy. If you’re wondering why something is the way it is, or how a decision was made, please create an issue and prefix it with “Question:”.
29+
30+
## Translate the plugin
31+
32+
If you speak a foreign language, you can help translate the ActivityPub plugin into your own language. [here is how.](docs/translations)
33+
34+
## License
35+
36+
The ActivityPub plugin is licensed under the [MIT](https://github.com/Automattic/wordpress-activitypub/blob/trunk/LICENSE) license.
37+
38+
All materials contributed should be compatible with the MIT and GPLv2 license. This means that if you own the material, you agree to license it under the MIT license. If you are contributing code that is not your own, such as adding a component from another Open Source project, or adding an `npm` package, you need to make sure you follow these steps:
39+
40+
1. Check that the code has a license. If you can't find one, you can try to contact the original author and get permission to use, or ask them to release under a compatible Open Source license.
41+
2. Check the license is compatible with MIT and [GPLv2](http://www.gnu.org/licenses/license-list.en.html#GPLCompatibleLicenses), note that the Apache 2.0 license is *not* compatible.

FEDERATION.md

+3-6
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,9 @@ In order to authenticate activities, Mastodon relies on HTTP Signatures, signing
3131

3232
Mastodon requires all `POST` requests to be signed, and MAY require `GET` requests to be signed, depending on the configuration of the Mastodon server.
3333

34-
More information on HTTP Signatures, as well as examples, can be found here: https://docs.joinmastodon.org/spec/security/#http
34+
More information on HTTP Signatures, as well as examples, can be found here: <https://docs.joinmastodon.org/spec/security/#http>
3535

3636
## Additional documentation
3737

38-
- Plugin Description: https://github.com/Automattic/wordpress-activitypub?tab=readme-ov-file#description
39-
- Frequently Asked Questions: https://github.com/Automattic/wordpress-activitypub?tab=readme-ov-file#frequently-asked-questions
40-
- Installation Instructions: https://github.com/Automattic/wordpress-activitypub?tab=readme-ov-file#installation
41-
- Upgrade Notice: https://github.com/Automattic/wordpress-activitypub?tab=readme-ov-file#upgrade-notice
42-
- Changelog: https://github.com/Automattic/wordpress-activitypub/blob/trunk/CHANGELOG.md
38+
- Plugin Documentation: [docs/readme.md](docs/readme.md)
39+
- Changelog: <https://github.com/Automattic/wordpress-activitypub/blob/trunk/CHANGELOG.md>

activitypub.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Plugin Name: ActivityPub
44
* Plugin URI: https://github.com/Automattic/wordpress-activitypub
55
* Description: The ActivityPub protocol is a decentralized social networking protocol based upon the ActivityStreams 2.0 data format.
6-
* Version: 4.4.0
6+
* Version: 4.5.1
77
* Author: Matthias Pfefferle & Automattic
88
* Author URI: https://automattic.com/
99
* License: MIT
@@ -19,7 +19,7 @@
1919

2020
use WP_CLI;
2121

22-
\define( 'ACTIVITYPUB_PLUGIN_VERSION', '4.4.0' );
22+
\define( 'ACTIVITYPUB_PLUGIN_VERSION', '4.5.1' );
2323

2424
// Plugin related constants.
2525
\define( 'ACTIVITYPUB_PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
@@ -49,6 +49,7 @@ function rest_init() {
4949
Rest\Server::init();
5050
Rest\Collection::init();
5151
Rest\Interaction::init();
52+
Rest\Post::init();
5253

5354
// Load NodeInfo endpoints only if blog is public.
5455
if ( is_blog_public() ) {

build/editor-plugin/plugin.asset.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<?php return array('dependencies' => array('react', 'wp-components', 'wp-core-data', 'wp-data', 'wp-editor', 'wp-element', 'wp-i18n', 'wp-plugins', 'wp-primitives', 'wp-url'), 'version' => '4d5e9ed82e8448bb4fd1');
1+
<?php return array('dependencies' => array('react', 'wp-components', 'wp-core-data', 'wp-data', 'wp-editor', 'wp-element', 'wp-i18n', 'wp-plugins', 'wp-primitives', 'wp-url'), 'version' => '6b15195803d2f5a2c116');

build/editor-plugin/plugin.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/follow-me/index.asset.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-element', 'wp-i18n', 'wp-primitives'), 'version' => '62610556ba8e5f129fdf');
1+
<?php return array('dependencies' => array('react', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-element', 'wp-i18n', 'wp-primitives'), 'version' => '9ba472502cdfebc07309');

0 commit comments

Comments
 (0)