diff --git a/bubble-server/src/main/resources/models/apps/user_block/hn/bubbleApp_userBlock_hn.json b/bubble-server/src/main/resources/models/apps/user_block/hn/bubbleApp_userBlock_hn.json index c2cfb683..218221a4 100644 --- a/bubble-server/src/main/resources/models/apps/user_block/hn/bubbleApp_userBlock_hn.json +++ b/bubble-server/src/main/resources/models/apps/user_block/hn/bubbleApp_userBlock_hn.json @@ -10,20 +10,9 @@ "AppRule": [{ "name": "hn_user_blocker", "template": true, - "driver": "UserBlocker", + "driver": "JsUserBlocker", "config": { - "blockedCommentCheck": "parseInt(current.get('width')) > parseInt(blocked.get('width'))", - "blockedCommentReplacement": "{{{chunkStartRegex}}}[comment by {{blockedUser}} has been blocked] UNBLOCK", - "chunkStartRegex": "", - "chunkEndRegex": " ", - "chunkProperties": [ - {"name": "userId", "value": "\\s*(.+?)\\s*"}, - {"name": "width", "value": ""} - ], - "commentDecorator": { - "regex": "class=\"age\"\\s*>.+?", - "insert": " [X] " - } + "siteJsTemplate": "bubble/rule/social/block/site/HackerNews.js.hbs" } }] } diff --git a/bubble-server/src/test/resources/models/apps/user_block/hn/bubbleApp_userBlock_hn.json b/bubble-server/src/test/resources/models/apps/user_block/hn/bubbleApp_userBlock_hn.json new file mode 100644 index 00000000..c2cfb683 --- /dev/null +++ b/bubble-server/src/test/resources/models/apps/user_block/hn/bubbleApp_userBlock_hn.json @@ -0,0 +1,30 @@ +[{ + "name": "UserBlocker", + "children": { + "AppSite": [{ + "name": "HackerNews", + "url": "https://news.ycombinator.com", + "description": "A blog and discussion site for technology news, operated by YCombinator", + "template": true + }], + "AppRule": [{ + "name": "hn_user_blocker", + "template": true, + "driver": "UserBlocker", + "config": { + "blockedCommentCheck": "parseInt(current.get('width')) > parseInt(blocked.get('width'))", + "blockedCommentReplacement": "{{{chunkStartRegex}}}[comment by {{blockedUser}} has been blocked] UNBLOCK", + "chunkStartRegex": "", + "chunkEndRegex": " ", + "chunkProperties": [ + {"name": "userId", "value": "\\s*(.+?)\\s*"}, + {"name": "width", "value": ""} + ], + "commentDecorator": { + "regex": "class=\"age\"\\s*>.+?", + "insert": " [X] " + } + } + }] + } +}] \ No newline at end of file