aboutsummaryrefslogtreecommitdiff
path: root/juick-server/src/main/java/com/juick/server/XMPPConnection.java
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2018-10-23 14:38:54 +0300
committerGravatar Vitaly Takmazov2018-10-23 14:38:54 +0300
commit09d0533511faee6ab2da2fd6db79eb0063fd429e (patch)
tree0d2313f626ff4cdc2a4330caf9dc2020d8aa10d0 /juick-server/src/main/java/com/juick/server/XMPPConnection.java
parent2ec703610f07225ce2f82481aa736b6dca21e2d2 (diff)
Do not use subscribed users jid
Diffstat (limited to 'juick-server/src/main/java/com/juick/server/XMPPConnection.java')
-rw-r--r--juick-server/src/main/java/com/juick/server/XMPPConnection.java12
1 files changed, 2 insertions, 10 deletions
diff --git a/juick-server/src/main/java/com/juick/server/XMPPConnection.java b/juick-server/src/main/java/com/juick/server/XMPPConnection.java
index c861b757..d03251a3 100644
--- a/juick-server/src/main/java/com/juick/server/XMPPConnection.java
+++ b/juick-server/src/main/java/com/juick/server/XMPPConnection.java
@@ -101,8 +101,6 @@ public class XMPPConnection implements StanzaListener, NotificationListener {
private String password;
@Value("${upload_tmp_dir:#{systemEnvironment['TEMP'] ?: '/tmp'}}")
private String tmpDir;
- @Value("${img_path:#{systemEnvironment['TEMP'] ?: '/tmp'}}")
- private String imgDir;
@Inject
private MessagesService messagesService;
@@ -113,8 +111,6 @@ public class XMPPConnection implements StanzaListener, NotificationListener {
@Inject
private PMQueriesService pmQueriesService;
@Inject
- private TagService tagService;
- @Inject
private BasicXmppSession session;
@Inject
private ExecutorService service;
@@ -289,12 +285,8 @@ public class XMPPConnection implements StanzaListener, NotificationListener {
private void sendJuickMessage(com.juick.Message jmsg, List<User> users) {
List<String> jids = new ArrayList<>();
- if (jmsg.FriendsOnly) {
- jids = subscriptionService.getJIDSubscribedToUser(jmsg.getUser().getUid(), jmsg.FriendsOnly);
- } else {
- for (User user : users) {
- jids.addAll(userService.getJIDsbyUID(user.getUid()));
- }
+ for (User user : users) {
+ jids.addAll(userService.getJIDsbyUID(user.getUid()));
}
com.juick.Message fullMsg = messagesService.getMessage(jmsg.getMid());
String txt = "@" + jmsg.getUser().getName() + ":" + MessageUtils.getTagsString(fullMsg) + "\n";