aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--juick-server-jdbc/src/main/java/com/juick/service/MessagesServiceImpl.java3
-rw-r--r--juick-server/src/test/java/com/juick/server/tests/ServerTests.java7
2 files changed, 9 insertions, 1 deletions
diff --git a/juick-server-jdbc/src/main/java/com/juick/service/MessagesServiceImpl.java b/juick-server-jdbc/src/main/java/com/juick/service/MessagesServiceImpl.java
index 612431bf..35e48383 100644
--- a/juick-server-jdbc/src/main/java/com/juick/service/MessagesServiceImpl.java
+++ b/juick-server-jdbc/src/main/java/com/juick/service/MessagesServiceImpl.java
@@ -978,7 +978,8 @@ public class MessagesServiceImpl extends BaseJdbcService implements MessagesServ
return getJdbcTemplate().queryForList("SELECT replies.message_id FROM replies " +
"INNER JOIN messages ON replies.message_id = messages.message_id " +
"LEFT JOIN messages_tags ON messages_tags.message_id = messages.message_id " +
- "WHERE COALESCE(messages_tags.tag_id, 0) != 2 AND replies.ts > TIMESTAMPADD(HOUR, -2, CURRENT_TIMESTAMP) " +
+ "WHERE COALESCE(messages_tags.tag_id, 0) != 2 " +
+ "AND COALESCE(messages_tags.tag_id, 0) != 805 AND replies.ts > TIMESTAMPADD(HOUR, -2, CURRENT_TIMESTAMP) " +
"AND messages.popular=0 GROUP BY messages.message_id having COUNT(DISTINCT(replies.user_id)) > 5 " +
"UNION ALL SELECT favorites.message_id FROM favorites " +
"INNER JOIN messages ON messages.message_id = favorites.message_id " +
diff --git a/juick-server/src/test/java/com/juick/server/tests/ServerTests.java b/juick-server/src/test/java/com/juick/server/tests/ServerTests.java
index 41f2b68c..8e3e5dfd 100644
--- a/juick-server/src/test/java/com/juick/server/tests/ServerTests.java
+++ b/juick-server/src/test/java/com/juick/server/tests/ServerTests.java
@@ -584,6 +584,13 @@ public class ServerTests {
assertThat(juickTag.TID, is(2));
tagService.updateTags(topmid, Collections.singletonList(juickTag));
assertThat(messagesService.getPopularCandidates().isEmpty(), is(true));
+ tagService.updateTags(topmid, Collections.singletonList(juickTag));
+ assertThat(messagesService.getPopularCandidates().isEmpty(), is(false));
+ jdbcTemplate.update("INSERT INTO tags(tag_id, name) VALUES(805, 'NSFW')");
+ Tag nsfw = tagService.getTag("NSFW", false);
+ assertThat(nsfw.TID, equalTo(805));
+ tagService.updateTags(topmid, Collections.singletonList(nsfw));
+ assertThat(messagesService.getPopularCandidates().isEmpty(), is(true));
}
@Test
public void inReplyToScannerTest() {