浏览代码

fix reason user blocker

tags/v0.7.0
Jonathan Cobb 5 年前
父节点
当前提交
3c788c126f
共有 3 个文件被更改,包括 12 次插入12 次删除
  1. +1
    -1
      bubble-server/src/main/resources/bubble/rule/social/block/JsUserBlockerRuleDriver.js.hbs
  2. +10
    -10
      bubble-server/src/main/resources/bubble/rule/social/block/site/Reason.js.hbs
  3. +1
    -1
      bubble-server/src/main/resources/models/apps/user_block/reason/bubbleApp_userBlock_reason_matchers.json

+ 1
- 1
bubble-server/src/main/resources/bubble/rule/social/block/JsUserBlockerRuleDriver.js.hbs 查看文件

@@ -18,7 +18,7 @@ function {{JS_PREFIX}}_fetch_blocks (do_apply) {
const requestOptions = { method: 'GET' };
const blocked_users_url = '/__bubble/api/filter/data/{{BUBBLE_DATA_ID}}/read';
fetch(blocked_users_url, requestOptions)
.then((resp) => resp.json())
.then(resp => resp.json())
.then(data => {
const blocked_users = [];
for (let i=0; i<data.length; i++) {


+ 10
- 10
bubble-server/src/main/resources/bubble/rule/social/block/site/Reason.js.hbs 查看文件

@@ -1,6 +1,5 @@
function {{JS_PREFIX}}_apply_blocks(blocked_users) {
console.log('apply_blocks: starting...');
const comments = document.querySelector('comment-list');
const comments = document.querySelector('.comment-list');
if (comments === null || comments.length === 0) {
console.warn('No comments found, not filtering');
return;
@@ -9,7 +8,6 @@ function {{JS_PREFIX}}_apply_blocks(blocked_users) {
}

function {{JS_PREFIX}}_consider_block(comments, blocked_users) {
console.log('consider_block: considering '+comments.length+' comments...');
for (let i=0; i<comments.length; i++) {
const comment = comments[i];
const userElement = comment.querySelector('cite.fn strong');
@@ -20,14 +18,16 @@ function {{JS_PREFIX}}_consider_block(comments, blocked_users) {
continue;
}

const blockNode = document.createElement('span');
blockNode.className = "bubble_block";
blockNode.innerHTML = ' [<b><a href="#" onclick="{{JS_PREFIX}}_block_user(\''+author+'\'); return false;">X</a></b>]';
userElement.parentNode.insertBefore(blockNode, userElement.nextSibling);
if (userElement.parentNode.querySelector('.bubble_block') === null) {
const blockNode = document.createElement('span');
blockNode.className = "bubble_block";
blockNode.innerHTML = ' [<b><a href="#" onclick="{{JS_PREFIX}}_block_user(\'' + author.replace("'", "\\\'") + '\'); return false;">X</a></b>]&nbsp;&nbsp;';
userElement.parentNode.insertBefore(blockNode, userElement.nextSibling);

const replies = comment.querySelector('ol.children');
if (replies !== null) {
{{JS_PREFIX}}_consider_block(replies.querySelector('li.comment'));
const replies = comment.querySelector('ol.children');
if (replies !== null) {
{{JS_PREFIX}}_consider_block(replies.querySelector('li.comment'));
}
}
}
}


+ 1
- 1
bubble-server/src/main/resources/models/apps/user_block/reason/bubbleApp_userBlock_reason_matchers.json 查看文件

@@ -6,7 +6,7 @@
"site": "Reason",
"template": true,
"fqdn": "reason.com",
"urlRegex": "/20\\d{2}/\\d{2}/\\d{2}/\\w+",
"urlRegex": "/20\\d{2}/\\d{2}/\\d{2}/[-\\w]+/",
"rule": "reason_user_blocker"
}]
}


正在加载...
取消
保存