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.

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

v2024-11-27 #194

Merged
merged 26 commits into from
Nov 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
b50f3e5
let's use node.js lts
dphiffer Oct 11, 2024
22f5dcc
delete deploy_key after deploy
dphiffer Oct 11, 2024
5f73afd
update npm packages
dphiffer Oct 11, 2024
d8d8768
update docker compose.yaml
dphiffer Oct 11, 2024
43507a5
css tweaks
dphiffer Nov 8, 2024
8fa8b4f
Merge pull request #189 from mediasanctuary/oct-upgrades
dphiffer Nov 8, 2024
d5e6766
add skeleton of feed import plugin
dphiffer Nov 20, 2024
809ca9a
update plugins
dphiffer Nov 20, 2024
f407862
use top-level .nvmrc, update packages
dphiffer Nov 20, 2024
ddbf82b
upgrade sass
dphiffer Nov 20, 2024
2531077
v0.0.3
dphiffer Nov 20, 2024
bcda3b0
upgrade versions
dphiffer Nov 20, 2024
49e6f46
Merge pull request #190 from mediasanctuary/nov-upgrades
dphiffer Nov 20, 2024
eee436c
Merge branch 'main' of github.com:mediasanctuary/mediasanctuary.org i…
dphiffer Nov 21, 2024
01b9abd
remove the rss parser dependency
dphiffer Nov 23, 2024
aefe9e5
import a single post
dphiffer Nov 25, 2024
006a1b1
check if a post has updates before updating
dphiffer Nov 25, 2024
4a941ae
add audio_player function to theme
dphiffer Nov 25, 2024
f8cf4e8
add more post filters
dphiffer Nov 25, 2024
e0d6453
use feed_import filters
dphiffer Nov 26, 2024
a9ef7e0
Merge pull request #191 from mediasanctuary/soundcloud-import
dphiffer Nov 26, 2024
3016307
add 'feed_import_post_saved' action
dphiffer Nov 27, 2024
63a1731
Merge pull request #192 from mediasanctuary/feed-import-notify-slack
dphiffer Nov 27, 2024
06e90a3
improve webhook message
dphiffer Nov 27, 2024
616db9e
upgrade plugins
dphiffer Nov 27, 2024
c66068f
Merge pull request #193 from mediasanctuary/update-plugins
dphiffer Nov 27, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 4 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 'lts/Jod'
- name: Install dependencies
run: |
cd wp-content/themes/mediasanctuary
npm install

- name: Build
run: |
cd wp-content/themes/mediasanctuary
npm run build

- name: Sync
env:
dest: "[email protected]:/home/members/nyma/sites/dev.mediasanctuary.org/web/wp-content/"
Expand All @@ -36,4 +36,6 @@ jobs:
--human-readable \
--filter='P uploads' \
--exclude wp-content/uploads \
--exclude deploy_key \
./wp-content/ ${{env.dest}}
rm deploy_key
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v22
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ This is a WordPress site, the theme `mediasanctuary` and the plugins it depends

## Developer dependencies

* [node.js](https://nodejs.org/) v16
* [node.js](https://nodejs.org/) v22
* [Docker Desktop](https://www.docker.com/products/docker-desktop)

## How to run locally
Expand Down
8 changes: 7 additions & 1 deletion bin/start
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash

set -o errexit
set -o pipefail
Expand All @@ -7,6 +7,12 @@ set -o nounset
dir="$( cd "$(dirname "$( dirname "${BASH_SOURCE[0]}" )" )" >/dev/null 2>&1 && pwd )"
mkdir -p "$dir/wp-content/uploads"

# use nvm if it's installed
if [ -f ~/.nvm/nvm.sh ] ; then
source ~/.nvm/nvm.sh
nvm use
fi

stop_containers() {
echo "Shutting off containers..."
echo
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml → compose.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3.5"
services:
web:
build:
Expand All @@ -13,6 +12,7 @@ services:
WORDPRESS_CONFIG_EXTRA: |
define( 'WP_DEBUG_LOG', true );
define( 'WP_DEBUG_DISPLAY', false );
define( 'FEED_IMPORT', ['https://feeds.soundcloud.com/users/soundcloud:users:164222112/sounds.rss'] );
WORDPRESS_DEBUG: "true"
volumes:
- ./wp-content/plugins:/var/www/html/wp-content/plugins
Expand All @@ -22,7 +22,7 @@ services:
db:
image: mariadb:10.5.8
ports:
- 3307:3306
- 3306:3306
restart: always
environment:
MYSQL_DATABASE: wordpress
Expand Down
91 changes: 87 additions & 4 deletions wp-content/plugins/advanced-custom-fields-pro/acf.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
* Plugin Name: Advanced Custom Fields PRO
* Plugin URI: https://www.advancedcustomfields.com
* Description: Customize WordPress with powerful, professional and intuitive fields.
* Version: 6.3.1
* Version: 6.3.11
* Author: WP Engine
* Author URI: https://wpengine.com/?utm_source=wordpress.org&utm_medium=referral&utm_campaign=plugin_directory&utm_content=advanced_custom_fields
* Update URI: https://www.advancedcustomfields.com/pro
* Update URI: false
* Text Domain: acf
* Domain Path: /lang
* Requires PHP: 7.4
Expand All @@ -36,7 +36,7 @@ class ACF {
*
* @var string
*/
public $version = '6.3.1';
public $version = '6.3.11';

/**
* The plugin settings array.
Expand Down Expand Up @@ -130,6 +130,7 @@ public function initialize() {
'enable_shortcode' => true,
'enable_bidirection' => true,
'enable_block_bindings' => true,
'enable_meta_box_cb_edit' => true,
);

// Include utility functions.
Expand Down Expand Up @@ -227,6 +228,9 @@ public function initialize() {
// Include legacy.
acf_include( 'includes/legacy/legacy-locations.php' );

// Include updater.
acf_include( 'includes/Updater/Updater.php' );

// Include PRO.
acf_include( 'pro/acf-pro.php' );

Expand Down Expand Up @@ -391,12 +395,24 @@ public function init() {
*/
do_action( 'acf/include_taxonomies', ACF_MAJOR_VERSION );

// If we're on 6.5 or newer, load block bindings. This will move to an autoloader in 6.3.
// If we're on 6.5 or newer, load block bindings. This will move to an autoloader in 6.4.
if ( version_compare( get_bloginfo( 'version' ), '6.5-beta1', '>=' ) ) {
acf_include( 'includes/Blocks/Bindings.php' );
new ACF\Blocks\Bindings();
}

// If we're ACF free, register the updater.
if ( function_exists( 'acf_is_pro' ) && ! acf_is_pro() ) {
acf_register_plugin_update(
array(
'id' => 'acf',
'slug' => acf_get_setting( 'slug' ),
'basename' => acf_get_setting( 'basename' ),
'version' => acf_get_setting( 'version' ),
)
);
}

/**
* Fires after ACF is completely "initialized".
*
Expand Down Expand Up @@ -783,6 +799,73 @@ public function acf_plugin_activated() {
}
}

if ( ! class_exists( 'ACF_Updates' ) ) {
/**
* The main function responsible for returning the acf_updates singleton.
* Use this function like you would a global variable, except without needing to declare the global.
*
* Example: <?php $acf_updates = acf_updates(); ?>
*
* @since 5.5.12
*
* @return ACF\Updater The singleton instance of Updater.
*/
function acf_updates() {
global $acf_updates;
if ( ! isset( $acf_updates ) ) {
$acf_updates = new ACF\Updater();
}
return $acf_updates;
}

/**
* Alias of acf_updates()->add_plugin().
*
* @since 5.5.10
*
* @param array $plugin Plugin data array.
*/
function acf_register_plugin_update( $plugin ) {
acf_updates()->add_plugin( $plugin );
}

/**
* Register a dummy ACF_Updates class for back compat.
*/
class ACF_Updates {} //phpcs:ignore -- Back compat.
}

/**
* An ACF specific getter to replace `home_url` in our license checks to ensure we can avoid third party filters.
*
* @since 6.0.1
* @since 6.2.8 - Renamed to acf_pro_get_home_url to match pro exclusive function naming.
* @since 6.3.10 - Renamed to acf_get_home_url now updater logic applies to free.
*
* @return string $home_url The output from home_url, sans known third party filters which cause license activation issues.
*/
function acf_get_home_url() {
if ( acf_is_pro() ) {
// Disable WPML and TranslatePress's home url overrides for our license check.
add_filter( 'wpml_get_home_url', 'acf_pro_license_ml_intercept', 99, 2 );
add_filter( 'trp_home_url', 'acf_pro_license_ml_intercept', 99, 2 );

if ( acf_pro_is_legacy_multisite() && acf_is_multisite_sub_site() ) {
$home_url = get_home_url( get_main_site_id() );
} else {
$home_url = home_url();
}

// Re-enable WPML and TranslatePress's home url overrides.
remove_filter( 'wpml_get_home_url', 'acf_pro_license_ml_intercept', 99 );
remove_filter( 'trp_home_url', 'acf_pro_license_ml_intercept', 99 );
} else {
$home_url = home_url();
}

return $home_url;
}

/**
* The main function responsible for returning the one true acf Instance to functions everywhere.
* Use this function like you would a global variable, except without needing to declare the global.
Expand Down
Loading