malhuda/fictioneer
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 112 Wiki Activity

Add function to append date query

Browse Source 
And consider the orderby argument because this makes sense to me. Published Last Week should only show what was published last week, not what was updated.
This commit is contained in:
Tetrakern 2023-06-11 03:03:08 +02:00
parent 0ed01cb2a0
commit 5405553c6a
5 changed files with 85 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
chapters.php
View File

@ -38,39 +38,8 @@ $query_args = array (
'meta_value' => '0'
);
// Date query?
if ( is_numeric( $ago ) && $ago > 0 ) {
$query_args['date_query'] = array(
'relation' => 'OR',
array(
'after'=> "{$ago} days ago",
'inclusive' => true,
),
array(
'column' => 'post_modified',
'after'=> "{$ago} days ago",
'inclusive' => true,
)
);
} elseif ( ! empty( $ago ) ) {
$ago = array_intersect( [strtolower( $ago )], ['week', 'month', 'year'] );
$ago = reset( $ago ) ?: 0;
if ( ! empty( $ago ) ) {
$query_args['date_query'] = array(
'relation' => 'OR',
array(
'after'=> "1 {$ago} ago",
'inclusive' => true,
),
array(
'column' => 'post_modified',
'after'=> "1 {$ago} ago",
'inclusive' => true,
)
);
}
}
// Append date query (if any)
$query_args = fictioneer_append_date_query( $query_args, $ago, $order, $orderby );
// Filter query arguments
$query_args = apply_filters( 'fictioneer_filter_chapters_query_args', $query_args, get_the_ID() );

35
collections.php
View File

@ -36,39 +36,8 @@ $query_args = array (
'posts_per_page' => get_option( 'posts_per_page' ) ?? 8
);
// Date query?
if ( is_numeric( $ago ) && $ago > 0 ) {
$query_args['date_query'] = array(
'relation' => 'OR',
array(
'after'=> "{$ago} days ago",
'inclusive' => true,
),
array(
'column' => 'post_modified',
'after'=> "{$ago} days ago",
'inclusive' => true,
)
);
} elseif ( ! empty( $ago ) ) {
$ago = array_intersect( [strtolower( $ago )], ['week', 'month', 'year'] );
$ago = reset( $ago ) ?: 0;
if ( ! empty( $ago ) ) {
$query_args['date_query'] = array(
'relation' => 'OR',
array(
'after'=> "1 {$ago} ago",
'inclusive' => true,
),
array(
'column' => 'post_modified',
'after'=> "1 {$ago} ago",
'inclusive' => true,
)
);
}
}
// Append date query (if any)
$query_args = fictioneer_append_date_query( $query_args, $ago, $order, $orderby );
// Filter query arguments
$query_args = apply_filters( 'fictioneer_filter_collections_query_args', $query_args, get_the_ID() );

77
includes/functions/_utility.php
View File

@ -1569,4 +1569,81 @@ if ( ! function_exists( 'fictioneer_minify_html' ) ) {
}
}
// =============================================================================
// APPEND DATE QUERY
// =============================================================================
if ( ! function_exists( 'fictioneer_append_date_query' ) ) {
/**
* Append date query to query arguments
*
* @since 5.4.0
*
* @param array $query_args The query arguments to modify.
* @param string|int $ago The time range. Default null.
* @param string $order The current order. Default null.
* @param string $orderby The current orderby. Default null.
*
* @return array The modified query arguments.
*/
function fictioneer_append_date_query( $query_args, $ago = null, $order = null, $orderby = null ) {
// Ago?
if ( empty( $ago ) ) {
$ago = $_GET['ago'] ?? 0;
$ago = is_numeric( $ago ) ? absint( $ago ) : sanitize_text_field( $ago );
}
// Order?
if ( empty( $order ) ) {
$order = array_intersect( [strtolower( $_GET['order'] ?? 0 )], ['desc', 'asc'] );
$order = reset( $order ) ?: 'desc';
}
// Orderby?
if ( empty( $orderby ) ) {
$orderby = array_intersect( [strtolower( $_GET['orderby'] ?? 0 )], ['modified', 'date', 'title', 'rand'] );
$orderby = reset( $orderby ) ?: 'modified';
}
// Date queried?
if ( is_numeric( $ago ) && $ago > 0 ) {
$query_args['date_query'] = array(
array(
'column' => $orderby === 'modified' ? 'post_modified' : 'post_date',
'after'=> "{$ago} days ago",
'inclusive' => true,
)
);
} elseif ( ! empty( $ago ) ) {
$ago = array_intersect( [strtolower( $ago )], ['week', 'month', 'year'] );
$ago = reset( $ago ) ?: 0;
if ( ! empty( $ago ) ) {
$query_args['date_query'] = array(
array(
'column' => $orderby === 'modified' ? 'post_modified' : 'post_date',
'after'=> "1 {$ago} ago",
'inclusive' => true,
)
);
}
}
// Non-date related order?
if ( isset( $query_args['date_query'] ) && in_array( $orderby, ['title', 'rand'] ) ) {
$modified_arg = $query_args['date_query'][0];
$modified_arg['column'] = 'post_modified';
$query_args['date_query'] = array(
'relation' => 'OR',
$query_args['date_query'][0],
$modified_arg
);
}
return $query_args;
}
}
?>

35
recommendations.php
View File

@ -36,39 +36,8 @@ $query_args = array (
'posts_per_page' => get_option( 'posts_per_page', 8 )
);
// Date query?
if ( is_numeric( $ago ) && $ago > 0 ) {
$query_args['date_query'] = array(
'relation' => 'OR',
array(
'after'=> "{$ago} days ago",
'inclusive' => true,
),
array(
'column' => 'post_modified',
'after'=> "{$ago} days ago",
'inclusive' => true,
)
);
} elseif ( ! empty( $ago ) ) {
$ago = array_intersect( [strtolower( $ago )], ['week', 'month', 'year'] );
$ago = reset( $ago ) ?: 0;
if ( ! empty( $ago ) ) {
$query_args['date_query'] = array(
'relation' => 'OR',
array(
'after'=> "1 {$ago} ago",
'inclusive' => true,
),
array(
'column' => 'post_modified',
'after'=> "1 {$ago} ago",
'inclusive' => true,
)
);
}
}
// Append date query (if any)
$query_args = fictioneer_append_date_query( $query_args, $ago, $order, $orderby );
// Filter query arguments
$query_args = apply_filters( 'fictioneer_filter_recommendations_query_args', $query_args, get_the_ID() );

35
stories.php
View File

@ -48,39 +48,8 @@ $query_args = array (
)
);
// Date query?
if ( is_numeric( $ago ) && $ago > 0 ) {
$query_args['date_query'] = array(
'relation' => 'OR',
array(
'after'=> "{$ago} days ago",
'inclusive' => true,
),
array(
'column' => 'post_modified',
'after'=> "{$ago} days ago",
'inclusive' => true,
)
);
} elseif ( ! empty( $ago ) ) {
$ago = array_intersect( [strtolower( $ago )], ['week', 'month', 'year'] );
$ago = reset( $ago ) ?: 0;
if ( ! empty( $ago ) ) {
$query_args['date_query'] = array(
'relation' => 'OR',
array(
'after'=> "1 {$ago} ago",
'inclusive' => true,
),
array(
'column' => 'post_modified',
'after'=> "1 {$ago} ago",
'inclusive' => true,
)
);
}
}
// Append date query (if any)
$query_args = fictioneer_append_date_query( $query_args, $ago, $order, $orderby );
// Filter query arguments
$query_args = apply_filters( 'fictioneer_filter_stories_query_args', $query_args, get_the_ID() );