From eb5d09b7824b4f63e0616c4526215397940c25ad Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Thu, 15 Dec 2022 23:09:20 +0300
Subject: xmpp: Use `xmppbot_jid` configuration option without conversion

---
 src/main/java/com/juick/config/XMPPConfig.java | 48 ++++++++++++++++++++++----
 1 file changed, 41 insertions(+), 7 deletions(-)

(limited to 'src/main/java/com/juick/config/XMPPConfig.java')

diff --git a/src/main/java/com/juick/config/XMPPConfig.java b/src/main/java/com/juick/config/XMPPConfig.java
index 8604b52b..534909a5 100644
--- a/src/main/java/com/juick/config/XMPPConfig.java
+++ b/src/main/java/com/juick/config/XMPPConfig.java
@@ -17,24 +17,58 @@
 
 package com.juick.config;
 
+import com.juick.CommandsManager;
 import com.juick.XMPPManager;
-import com.juick.util.xmpp.JidConverter;
 
+import com.juick.service.MessagesService;
+import com.juick.service.PMQueriesService;
+import com.juick.service.StorageService;
+import com.juick.service.UserService;
+import com.juick.www.WebApp;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.Resource;
+import rocks.xmpp.addr.Jid;
+
+import javax.inject.Inject;
+import java.util.concurrent.Executor;
 
 @Configuration
 @ConditionalOnProperty("xmppbot_jid")
 public class XMPPConfig {
-
-    @Bean
-    JidConverter jidConverter() {
-        return new JidConverter();
-    }
+    @Value("${xmppbot_jid:juick@localhost}")
+    private String botJid;
+    @Value("${hostname:localhost}")
+    private String componentName;
+    @Value("${component_port:5347}")
+    private int componentPort;
+    @Value("${component_host:localhost}")
+    private String componentHost;
+    @Inject
+    private CommandsManager commandsManager;
+    @Value("${xmpp_password:secret}")
+    private String password;
+    @Value("classpath:juick.png")
+    private Resource vCardImage;
+    @Inject
+    private StorageService storageService;
+    @Inject
+    private MessagesService messagesService;
+    @Inject
+    private UserService userService;
+    @Inject
+    private PMQueriesService pmQueriesService;
+    @Inject
+    private Executor applicationTaskExecutor;
+    @Inject
+    private WebApp webApp;
 
     @Bean
     XMPPManager xmppConnection() {
-        return new XMPPManager();
+        return new XMPPManager(commandsManager, Jid.of(botJid), componentName, componentPort,
+                componentHost, password, storageService, vCardImage, messagesService, userService, pmQueriesService,
+                applicationTaskExecutor, webApp);
     }
 }
-- 
cgit v1.2.3