Make bonus rules visible: highlighted BONUS line on the alerts overlay, streamgoals_bonus action
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
1e2ca96eed
commit
c7f2dcffeb
9 files changed
+187
-3
No files matched your search
@@ -28,4 +28,13 @@ interface OverlayDataSource {
|
||||
* @return array<int,array<string,mixed>>
|
||||
*/
|
||||
public function donations( ?int $sinceId, int $limit ): array;
|
||||
|
||||
/**
|
||||
* Bonus event names that fired (and were not reversed) per donation, in firing order. One lookup
|
||||
* for the whole page. Raw stored strings; Payloads sanitizes them. Donations without bonuses may be omitted.
|
||||
*
|
||||
* @param int[] $donationIds
|
||||
* @return array<int,string[]> donation id => event names
|
||||
*/
|
||||
public function bonusesFor( array $donationIds ): array;
|
||||
}
|
||||
@@ -26,7 +26,13 @@ final class OverlayService {
|
||||
$c = $gid ? $this->source->counter( $gid ) : array( 'label' => '', 'value' => 0 );
|
||||
return Payloads::counter( $c['label'], $c['value'] );
|
||||
case 'alerts':
|
||||
return Payloads::alerts( $this->source->donations( $since, 20 ), $since );
|
||||
$rows = $this->source->donations( $since, 20 );
|
||||
$ids = array_values( array_filter( array_map( static fn( $r ) => (int) ( $r['id'] ?? 0 ), $rows ) ) );
|
||||
$bonuses = ( null !== $since && $ids ) ? $this->source->bonusesFor( $ids ) : array();
|
||||
foreach ( $rows as $i => $r ) {
|
||||
$rows[ $i ]['bonuses'] = $bonuses[ (int) ( $r['id'] ?? 0 ) ] ?? array();
|
||||
}
|
||||
return Payloads::alerts( $rows, $since );
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -107,6 +107,7 @@ final class Payloads {
|
||||
'amount_display' => self::money( (int) $r['base_minor'], $cur ),
|
||||
'currency' => $cur,
|
||||
'message' => (string) ( $r['message'] ?? '' ),
|
||||
'bonuses' => self::bonuses( $r['bonuses'] ?? array() ),
|
||||
);
|
||||
}
|
||||
$alerts = array_slice( $alerts, 0, max( 1, $limit ) );
|
||||
@@ -116,6 +117,35 @@ final class Payloads {
|
||||
return array( 'alerts' => $alerts, 'last_id' => $lastId );
|
||||
}
|
||||
|
||||
/**
|
||||
* Display-safe bonus labels. Stored events should be [A-Za-z0-9_-] only; anything else is stripped
|
||||
* anyway, then humanized ("big_donation" -> "Big donation"). Empty/duplicate results are dropped.
|
||||
*
|
||||
* @param mixed $events
|
||||
* @return string[]
|
||||
*/
|
||||
public static function bonuses( mixed $events ): array {
|
||||
$out = array();
|
||||
foreach ( is_array( $events ) ? $events : array() as $e ) {
|
||||
if ( ! is_string( $e ) ) {
|
||||
continue;
|
||||
}
|
||||
$clean = substr( (string) preg_replace( '/[^A-Za-z0-9_-]/', '', $e ), 0, 40 );
|
||||
$label = trim( (string) preg_replace( '/[_-]+/', ' ', $clean ) );
|
||||
if ( '' === $label ) {
|
||||
continue;
|
||||
}
|
||||
$label = ucfirst( strtolower( $label ) );
|
||||
if ( ! in_array( $label, $out, true ) ) {
|
||||
$out[] = $label;
|
||||
}
|
||||
if ( count( $out ) >= 5 ) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
return $out;
|
||||
}
|
||||
|
||||
/** Strong ETag over the payload, ignoring the volatile server_now so unchanged data yields 304s. */
|
||||
public static function etag( array $payload ): string {
|
||||
unset( $payload['server_now'] );
|
||||
|
||||
@@ -62,6 +62,31 @@ final class WpdbDataSource implements OverlayDataSource {
|
||||
return array( 'label' => $label, 'value' => $total );
|
||||
}
|
||||
|
||||
public function bonusesFor( array $donationIds ): array {
|
||||
global $wpdb;
|
||||
$ids = array_values( array_unique( array_filter( array_map( 'intval', $donationIds ), static fn( $i ) => $i > 0 ) ) );
|
||||
if ( ! $ids ) {
|
||||
return array();
|
||||
}
|
||||
$in = implode( ',', array_fill( 0, count( $ids ), '%d' ) );
|
||||
$rows = $wpdb->get_results( $wpdb->prepare(
|
||||
"SELECT e.donation_id, r.config FROM {$this->t('rule_events')} e
|
||||
INNER JOIN {$this->t('rules')} r ON r.id = e.rule_id
|
||||
WHERE r.type = 'bonus' AND e.reversed = 0 AND e.delta > 0 AND e.donation_id IN ($in)
|
||||
ORDER BY e.id ASC",
|
||||
$ids
|
||||
), ARRAY_A );
|
||||
$out = array();
|
||||
foreach ( (array) $rows as $row ) {
|
||||
$cfg = json_decode( (string) $row['config'], true );
|
||||
$ev = is_array( $cfg ) && isset( $cfg['event'] ) && is_string( $cfg['event'] ) ? $cfg['event'] : '';
|
||||
if ( '' !== $ev ) {
|
||||
$out[ (int) $row['donation_id'] ][] = $ev;
|
||||
}
|
||||
}
|
||||
return $out;
|
||||
}
|
||||
|
||||
public function donations( ?int $sinceId, int $limit ): array {
|
||||
global $wpdb;
|
||||
$cols = 'id, base_minor, currency, donor_name, is_anonymous, message, status, moderation';
|
||||
|
||||
@@ -19,7 +19,20 @@ final class Engine {
|
||||
|
||||
/** Production wiring: $wpdb-backed stores. */
|
||||
public static function default(): self {
|
||||
return new self( new WpRuleStore(), new WpEventStore(), new \StreamGoals\Core\StateStore() );
|
||||
$onBonus = static function ( string $event, RuleDef $rule, Donation $d, bool $reversed ): void {
|
||||
if ( function_exists( 'do_action' ) ) {
|
||||
/**
|
||||
* Fires when a big-donation bonus rule triggers (or is reversed by a refund).
|
||||
*
|
||||
* @param string $event Rule's event name.
|
||||
* @param int $donationId Donation id.
|
||||
* @param int $ruleId Rule id.
|
||||
* @param bool $reversed True when the bonus was undone.
|
||||
*/
|
||||
do_action( 'streamgoals_bonus', $event, $d->id, $rule->id, $reversed );
|
||||
}
|
||||
};
|
||||
return new self( new WpRuleStore(), new WpEventStore(), new \StreamGoals\Core\StateStore(), null, $onBonus );
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in new issue
Block a user