aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2017-06-25 15:35:16 +0300
committerGravatar Vitaly Takmazov2017-06-25 15:35:16 +0300
commit2a5bd4a24556b0d1fa78361e747913726cfa8ce2 (patch)
tree82e56767fb969741eaaf13c1261f965716768e0a
parent1e29c8830246a17f060654d43d970a00ce94122a (diff)
xmpp: broadcast presence only to active jids
-rw-r--r--juick-server/src/main/java/com/juick/service/UserService.java2
-rw-r--r--juick-server/src/main/java/com/juick/service/UserServiceImpl.java4
-rw-r--r--juick-xmpp/src/main/java/com/juick/components/s2s/JuickBot.java2
3 files changed, 4 insertions, 4 deletions
diff --git a/juick-server/src/main/java/com/juick/service/UserService.java b/juick-server/src/main/java/com/juick/service/UserService.java
index 98786f7d..a6db9f82 100644
--- a/juick-server/src/main/java/com/juick/service/UserService.java
+++ b/juick-server/src/main/java/com/juick/service/UserService.java
@@ -122,5 +122,5 @@ public interface UserService {
boolean unauthJID(int uid, String jid);
- List<String> getAllJIDs();
+ List<String> getActiveJIDs();
}
diff --git a/juick-server/src/main/java/com/juick/service/UserServiceImpl.java b/juick-server/src/main/java/com/juick/service/UserServiceImpl.java
index 1b7cee42..6a3bb40c 100644
--- a/juick-server/src/main/java/com/juick/service/UserServiceImpl.java
+++ b/juick-server/src/main/java/com/juick/service/UserServiceImpl.java
@@ -698,7 +698,7 @@ public class UserServiceImpl extends BaseJdbcService implements UserService {
@Transactional(readOnly = true)
@Override
- public List<String> getAllJIDs() {
- return getJdbcTemplate().queryForList("SELECT jid FROM jids WHERE loginhash IS NULL", String.class);
+ public List<String> getActiveJIDs() {
+ return getJdbcTemplate().queryForList("SELECT jid FROM jids WHERE active=1 AND loginhash IS NULL", String.class);
}
}
diff --git a/juick-xmpp/src/main/java/com/juick/components/s2s/JuickBot.java b/juick-xmpp/src/main/java/com/juick/components/s2s/JuickBot.java
index 5b6dd353..52dbdb2b 100644
--- a/juick-xmpp/src/main/java/com/juick/components/s2s/JuickBot.java
+++ b/juick-xmpp/src/main/java/com/juick/components/s2s/JuickBot.java
@@ -480,7 +480,7 @@ public class JuickBot implements StanzaListener, AutoCloseable {
if (type != null) {
presence.setType(type);
}
- xmpp.userService.getAllJIDs().forEach(j -> {
+ xmpp.userService.getActiveJIDs().forEach(j -> {
try {
presence.setTo(Jid.of(j));
xmpp.sendOut(ClientPresence.from(presence));