Bladeren bron

disable in-page blocks by default. fix reason user blocker

tags/v0.7.0
Jonathan Cobb 4 jaren geleden
bovenliggende
commit
ccee19f8e5
3 gewijzigde bestanden met toevoegingen van 9 en 2 verwijderingen
  1. +3
    -0
      bubble-server/src/main/java/bubble/rule/bblock/BubbleBlockConfig.java
  2. +5
    -1
      bubble-server/src/main/java/bubble/rule/bblock/BubbleBlockRuleDriver.java
  3. +1
    -1
      bubble-server/src/main/resources/bubble/rule/social/block/site/Reason.js.hbs

+ 3
- 0
bubble-server/src/main/java/bubble/rule/bblock/BubbleBlockConfig.java Bestand weergeven

@@ -12,6 +12,9 @@ import java.util.List;
@NoArgsConstructor @Slf4j
public class BubbleBlockConfig {

@Getter @Setter private Boolean inPageBlocks;
public boolean inPageBlocks() { return inPageBlocks != null && inPageBlocks; }

@Getter @Setter private BubbleBlockList[] blockLists;

public BubbleBlockConfig updateList(BubbleBlockList list) {


+ 5
- 1
bubble-server/src/main/java/bubble/rule/bblock/BubbleBlockRuleDriver.java Bestand weergeven

@@ -116,12 +116,16 @@ public class BubbleBlockRuleDriver extends TrafficAnalyticsRuleDriver {
return FilterMatchDecision.no_match;

case filter:
if (log.isInfoEnabled()) log.info(prefix+"decision is FILTER");
final List<BlockSpec> specs = decision.getSpecs();
if (empty(specs)) {
log.warn(prefix+"decision was 'filter' but no specs were found, returning no_match");
return FilterMatchDecision.no_match;
} else {
if (!bubbleBlockConfig.inPageBlocks()) {
log.info(prefix+"decision was FILTER but inPageBlocks are disabled (returning no_match)");
return FilterMatchDecision.no_match;
}
if (log.isInfoEnabled()) log.info(prefix+"decision is FILTER (returning match)");
return FilterMatchDecision.match;
}
}


+ 1
- 1
bubble-server/src/main/resources/bubble/rule/social/block/site/Reason.js.hbs Bestand weergeven

@@ -4,7 +4,7 @@ function {{JS_PREFIX}}_apply_blocks(blocked_users) {
console.warn('No comments found, not filtering');
return;
}
{{JS_PREFIX}}_consider_block(comments.querySelector('li.comment'), blocked_users);
{{JS_PREFIX}}_consider_block(comments.querySelectorAll('li.comment'), blocked_users);
}

function {{JS_PREFIX}}_consider_block(comments, blocked_users) {


Laden…
Annuleren
Opslaan