Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Social: Fix Mastodon Fediverse creator og fatals #38612

Merged
merged 6 commits into from
Jul 30, 2024
Merged

Social: Fix Mastodon Fediverse creator og fatals #38612

merged 6 commits into from
Jul 30, 2024

Conversation

gmjuhasz
Copy link
Contributor

@gmjuhasz gmjuhasz commented Jul 30, 2024 •
edited
Loading

Fixes fatals introduced in #38198

Proposed changes:

Other information:

  • Have you written new tests for your changes, if applicable?
  • Have you checked the E2E test CI results, and verified that your changes do not break them?
  • Have you tested your changes on WordPress.com, if applicable (if so, you'll see a generated comment below with a script to run)?

Jetpack product discussion

p1722326166790739-slack-C034JEXD1RD

Does this pull request change what data or activity we track or use?

No.

Testing instructions:

  • Sandbox this change to WP.com
  • Enable Jetpack Social, and connect your site to a test Mastodon account.
  • Go to Posts > Add New
  • Write a post and publish it. In the post sidebar, ensure the post is shared to Mastodon.
  • Open the post. Make sure you don't get any fatals in the logs. Without this change fatals should be present

@gmjuhasz gmjuhasz requested a review from a team July 30, 2024 11:28
@gmjuhasz gmjuhasz self-assigned this Jul 30, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jul 30, 2024 •
edited
Loading

Are you an Automattician? Please test your changes on all WordPress.com environments to help mitigate accidental explosions.

  • To test on WoA, go to the Plugins menu on a WordPress.com Simple site. Click on the "Upload" button and follow the upgrade flow to be able to upload, install, and activate the Jetpack Beta plugin. Once the plugin is active, go to Jetpack > Jetpack Beta, select your plugin, and enable the fix/mastodon-fediverse-creator-og-fatals branch.

    • For jetpack-mu-wpcom changes, also add define( 'JETPACK_MU_WPCOM_LOAD_VIA_BETA_PLUGIN', true ); to your wp-config.php file.

  • To test on Simple, run the following command on your sandbox:

    bin/jetpack-downloader test jetpack fix/mastodon-fediverse-creator-og-fatals

    bin/jetpack-downloader test jetpack-mu-wpcom-plugin fix/mastodon-fediverse-creator-og-fatals

Interested in more tips and information?

  • In your local development environment, use the jetpack rsync command to sync your changes to a WoA dev blog.
  • Read more about our development workflow here: PCYsg-eg0-p2
  • Figure out when your changes will be shipped to customers here: PCYsg-eg5-p2

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jul 30, 2024 •
edited
Loading

Thank you for your PR!

When contributing to Jetpack, we have a few suggestions that can help us test and review your patch:

  • ✅ Include a description of your PR changes.
  • ✅ Add a "[Status]" label (In Progress, Needs Team Review, ...).
  • ✅ Add testing instructions.
  • ✅ Specify whether this PR includes any changes to data or privacy.
  • ✅ Add changelog entries to affected projects

This comment will be updated as you work on your PR and make changes. If you think that some of those checks are not needed for your PR, please explain why you think so. Thanks for cooperation 🤖

The e2e test report can be found here. Please note that it can take a few minutes after the e2e tests checks are complete for the report to be available.

Once your PR is ready for review, check one last time that all required checks appearing at the bottom of this PR are passing or skipped.
Then, add the "[Status] Needs Team Review" label and ask someone from your team review the code. Once reviewed, it can then be merged.
If you need an extra review from someone familiar with the codebase, you can update the labels from "[Status] Needs Team Review" to "[Status] Needs Review", and in that case Jetpack Approvers will do a final review of your PR.

Mu Wpcom plugin:

  • Next scheduled release: WordPress.com Simple releases happen daily.

If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack.

Wpcomsh plugin:

  • Next scheduled release: on demand (usually Mondays if not sooner).

If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack.

@github-actions github-actions bot added [JS Package] AI Client [JS Package] Publicize Components [Package] Jetpack mu wpcom WordPress.com Features [Package] My Jetpack [Package] VideoPress [Plugin] mu wpcom jetpack-mu-wpcom plugin [Plugin] Wpcomsh RNA [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you! labels Jul 30, 2024
spsiddarthan
spsiddarthan approved these changes Jul 30, 2024
View reviewed changes
Copy link
Contributor

@spsiddarthan spsiddarthan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tested this by adding a Masoton connection and sharing to it and also ensuring the front-end of the post on the site loads fine. This should stop the fatals for now.

@spsiddarthan spsiddarthan merged commit 19941e2 into trunk Jul 30, 2024
70 of 71 checks passed
@spsiddarthan spsiddarthan deleted the fix/mastodon-fediverse-creator-og-fatals branch July 30, 2024 13:55
@github-actions github-actions bot removed [Status] Needs Team Review [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you! labels Jul 30, 2024
@spsiddarthan spsiddarthan mentioned this pull request Jul 30, 2024
Closed
3 tasks
jeherve added a commit that referenced this pull request Aug 9, 2024
@jeherve
Publicize: add Fediverse creator meta tag from Mastodon connection
6a40c60 
This is a follow-up to #38198, which was partially reverted in #38612.
It's an alternative to #38565, to ensure better compatibility with WordPress.com Simple.

1. It takes into account the ActivityPub plugin, and ensure we're not adding a tag when the ActivityPub plugin already adds one.
2. It takes into account that on WordPress.com Simple, `get_services()` may return a `Keyring_Access_Token` object instead of an array.
3. It adds the 2 necessary methods directly to the `functions.opengraph.php` file, since we know it is loaded on the frontend on WordPress.com Simple (see conversation here to find out more: #38565 (comment) )
@jeherve jeherve mentioned this pull request Aug 9, 2024
Merged
3 tasks
jeherve added a commit that referenced this pull request Aug 12, 2024
@jeherve
Publicize: add Fediverse creator meta tag from Mastodon connection (#…
3c68c42 
…38809)

* Publicize: add Fediverse creator meta tag from Mastodon connection

This is a follow-up to #38198, which was partially reverted in #38612.
It's an alternative to #38565, to ensure better compatibility with WordPress.com Simple.

1. It takes into account the ActivityPub plugin, and ensure we're not adding a tag when the ActivityPub plugin already adds one.
2. It takes into account that on WordPress.com Simple, `get_services()` may return a `Keyring_Access_Token` object instead of an array.
3. It adds the 2 necessary methods directly to the `functions.opengraph.php` file, since we know it is loaded on the frontend on WordPress.com Simple (see conversation here to find out more: #38565 (comment) )

* Add missing since parameter
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@spsiddarthan spsiddarthan spsiddarthan approved these changes

Assignees

@gmjuhasz gmjuhasz

Labels
[JS Package] AI Client [JS Package] Publicize Components [Package] Jetpack mu wpcom WordPress.com Features [Package] My Jetpack [Package] Publicize [Package] VideoPress [Plugin] mu wpcom jetpack-mu-wpcom plugin [Plugin] Wpcomsh RNA
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@gmjuhasz @spsiddarthan