Skip to content

All oembeds go to the current API #12

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

Merged
eyeseast merged 1 commit into from
Sep 22, 2025
Merged

All oembeds go to the current API #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.svn
.DS_Store
node_modules

# WordPress Dev Environment
src/wordpress
Expand Down
26 changes: 8 additions & 18 deletions src/documentcloud/documentcloud.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,11 @@ class WP_DocumentCloud {
const CACHING_ENABLED = true,
DEFAULT_EMBED_FULL_WIDTH = 940,
OEMBED_RESOURCE_DOMAIN = 'www.documentcloud.org',
OEMBED_PROVIDER = 'https://www.documentcloud.org/api/oembed.{format}',
OEMBED_DOMAIN_MATCH = '#https?://(www\.)?(beta|embed).documentcloud.org/.*#i',
OEMBED_PROVIDER = 'https://api.www.documentcloud.org/api/oembed/',
DOCUMENT_PATTERN = '^(?P<protocol>https?):\/\/(?P<dc_host>.*documentcloud\.org)\/documents\/(?P<document_slug>[0-9]+-[\p{L}\p{N}%-]+)',
CONTAINER_TEMPLATE_START = '<div class="embed-documentcloud">',
CONTAINER_TEMPLATE_END = '</div>',
BETA_ID_CUTOFF = 20000000,
BETA_OEMBED_RESOURCE_DOMAIN = 'beta.documentcloud.org',
BETA_OEMBED_DOMAIN_MATCH = '#https?://(www\.)?(beta|embed).documentcloud.org/.*#i',
BETA_OEMBED_PROVIDER = 'https://api.beta.documentcloud.org/api/oembed';
CONTAINER_TEMPLATE_END = '</div>';
/**
* Constructor.
*/
Expand Down Expand Up @@ -138,10 +135,10 @@ public function register_dc_oembed_provider() {
wp_oembed_add_provider( 'http://' . $oembed_resource_domain . '/documents/*', $oembed_provider );
wp_oembed_add_provider( 'https://' . $oembed_resource_domain . '/documents/*', $oembed_provider );

// Add oembed provider for the DocumentCloud beta.
// Add oembed matching for beta and embed subdomains.
wp_oembed_add_provider(
self::BETA_OEMBED_DOMAIN_MATCH,
self::BETA_OEMBED_PROVIDER,
self::OEMBED_DOMAIN_MATCH,
$oembed_provider,
true
);
}
Expand Down Expand Up @@ -319,15 +316,9 @@ public function process_dc_shortcode( $atts ) {
if ( empty( $atts['url'] ) ) {
if ( empty( $atts['id'] ) ) {
return '';
// Determine which URL on the basis of the DocumentCloud ID.
} elseif ( intval( $atts['id'] ) >= self::BETA_ID_CUTOFF ) {
// Populate beta URL.
// TODO: use only one URL after the switch.
$url = 'https://' . self::BETA_OEMBED_RESOURCE_DOMAIN . "/documents/{$atts['id']}.html";
$filtered_atts['url'] = $url;
} else {
// Populate legacy URL.
$url = 'https://' . self::OEMBED_RESOURCE_DOMAIN . "/documents/{$atts['id']}.html";
// Populate a placeholder URL for oembed
$url = 'https://' . self::OEMBED_RESOURCE_DOMAIN . "/documents/{$atts['id']}.html";
$filtered_atts['url'] = $url;
}
}
Expand Down Expand Up @@ -408,7 +399,6 @@ public function clean_dc_url( $url ) {
} elseif ( isset( $elements['note_id'] ) ) {
$url .= "/annotations/{$elements['note_id']}";
}
$url .= '.html';
}
return $url;
}
Expand Down
Loading