aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
m---------deps/com.juick.server0
-rw-r--r--src/main/java/com/juick/JuickApplication.java6
-rw-r--r--src/main/java/com/juick/PushComponent.java27
-rw-r--r--src/main/java/com/juick/http/www/Main.java5
-rw-r--r--src/main/java/com/juick/http/www/NewMessage.java8
-rw-r--r--src/main/java/com/juick/xmpp/extensions/JuickMessage.java2
-rw-r--r--src/main/java/com/juick/xmpp/s2s/S2SComponent.java4
7 files changed, 27 insertions, 25 deletions
diff --git a/deps/com.juick.server b/deps/com.juick.server
-Subproject 322b18df46eb596ac8db8dc6fd6c544ddf69f8f
+Subproject 0527dc97b439f320f7bebec003b1d6080cfed1f
diff --git a/src/main/java/com/juick/JuickApplication.java b/src/main/java/com/juick/JuickApplication.java
index e546f5a8..2696ba39 100644
--- a/src/main/java/com/juick/JuickApplication.java
+++ b/src/main/java/com/juick/JuickApplication.java
@@ -31,10 +31,8 @@ public class JuickApplication {
private JdbcTemplate sql;
private JdbcTemplate sqlSearch;
private List<JuickComponent> components = new ArrayList<>();
- private String applicationPath;
- public JuickApplication(Properties conf, String applicationPath) throws IOException {
- this.applicationPath = applicationPath;
+ public JuickApplication(Properties conf) throws IOException {
executorService = Executors.newWorkStealingPool();
initDataSources(conf);
initSockets(conf);
@@ -45,7 +43,7 @@ public class JuickApplication {
private void initRythm(Properties conf) {
String rythmMode = conf.getProperty("rythm_mode", "prod");
Map<String, Object> map = new HashMap<>();
- map.put("home.template", applicationPath+"/WEB-INF/classes/templates");
+ map.put("home.template", "templates");
map.put("rythm.engine.mode", rythmMode);
Rythm.init(map);
}
diff --git a/src/main/java/com/juick/PushComponent.java b/src/main/java/com/juick/PushComponent.java
index 3a96ff16..b77d2937 100644
--- a/src/main/java/com/juick/PushComponent.java
+++ b/src/main/java/com/juick/PushComponent.java
@@ -78,7 +78,7 @@ public class PushComponent implements JuickComponent {
if (jmsg == null) {
return;
}
- logger.info("Message to push: " + msg.toString());
+ logger.info("Message to push: " + jmsg);
List<User> subscribedUsers = new ArrayList<>();
boolean isPM = jmsg.getMID() == 0;
boolean isReply = jmsg.getRID() > 0;
@@ -101,16 +101,17 @@ public class PushComponent implements JuickComponent {
}
/*** ANDROID ***/
- List<String> regids;
+ List<String> regids = new ArrayList<>();
if (isPM) {
- regids = new ArrayList<>();
String targetId = PushQueries.getAndroidRegID(sql, pmTo);
if (targetId != null && !targetId.isEmpty()) {
regids.add(targetId);
}
} else {
List<Integer> uids = subscribedUsers.stream().map(User::getUID).collect(Collectors.toList());
- regids = PushQueries.getAndroidTokens(sql, uids);
+ if (uids.size() > 0) {
+ regids = PushQueries.getAndroidTokens(sql, uids);
+ }
}
if (!regids.isEmpty()) {
@@ -134,16 +135,17 @@ public class PushComponent implements JuickComponent {
}
/*** WinPhone ***/
- List<String> urls;
+ List<String> urls = new ArrayList<>();
if (isPM) {
- urls = new ArrayList<>();
String targetURL = PushQueries.getWinPhoneURL(sql, pmTo);
if (!TextUtils.isEmpty(targetURL)) {
urls.add(targetURL);
}
} else {
- urls = PushQueries.getWindowsTokens(sql,
- subscribedUsers.stream().map(User::getUID).collect(Collectors.toList()));
+ List<Integer> uids = subscribedUsers.stream().map(User::getUID).collect(Collectors.toList());
+ if (uids.size() > 0) {
+ urls = PushQueries.getWindowsTokens(sql, uids);
+ }
}
@@ -181,16 +183,17 @@ public class PushComponent implements JuickComponent {
}
/*** iOS ***/
- List<String> tokens;
+ List<String> tokens = new ArrayList<>();
if (isPM) {
- tokens = new ArrayList<>();
String targetToken = PushQueries.getAPNSToken(sql, pmTo);
if (targetToken != null && !targetToken.isEmpty()) {
tokens.add(targetToken);
}
} else {
- tokens = PushQueries.getAPNSTokens(sql,
- subscribedUsers.stream().map(User::getUID).collect(Collectors.toList()));
+ List<Integer> uids = subscribedUsers.stream().map(User::getUID).collect(Collectors.toList());
+ if (uids.size() > 0) {
+ tokens = PushQueries.getAPNSTokens(sql, uids);
+ }
}
if (!tokens.isEmpty()) {
ApnsService service = APNS.newService().withCert("/etc/juick/ios.p12", "juick")
diff --git a/src/main/java/com/juick/http/www/Main.java b/src/main/java/com/juick/http/www/Main.java
index babeee1f..afa50016 100644
--- a/src/main/java/com/juick/http/www/Main.java
+++ b/src/main/java/com/juick/http/www/Main.java
@@ -38,6 +38,7 @@ import java.sql.SQLException;
import java.util.Enumeration;
import java.util.Properties;
import java.util.concurrent.ExecutorService;
+import java.util.logging.LogManager;
/**
*
@@ -68,16 +69,16 @@ public class Main extends HttpServlet implements Stream.StreamListener {
@Override
public void init() throws ServletException {
-
super.init();
try {
+ LogManager.getLogManager().readConfiguration(getServletContext().getResourceAsStream("WEB-INF/logging.properties"));
Properties conf = new Properties();
conf.load(getServletContext().getResourceAsStream("WEB-INF/juick.conf"));
twitterAuth = new TwitterAuth(conf.getProperty("twitter_consumer_key"),
conf.getProperty("twitter_consumer_secret"));
PageTemplates.sape = new Sape(conf.getProperty("sape_user"), "juick.com", 2000, 3600);
Endpoints.wwwJuickCom = conf.getProperty("www_juick_com", "juick.com");
- app = new JuickApplication(conf, getServletContext().getRealPath("/"));
+ app = new JuickApplication(conf);
sql = app.getSql();
sqlSearch = app.getSqlSearch();
pagesNewMessage = new NewMessage(app);
diff --git a/src/main/java/com/juick/http/www/NewMessage.java b/src/main/java/com/juick/http/www/NewMessage.java
index c8eb6ede..a130c190 100644
--- a/src/main/java/com/juick/http/www/NewMessage.java
+++ b/src/main/java/com/juick/http/www/NewMessage.java
@@ -29,20 +29,18 @@ import com.juick.xmpp.extensions.JuickUser;
import com.juick.xmpp.extensions.Nickname;
import com.juick.xmpp.extensions.XOOB;
import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.PrintWriter;
import java.io.UnsupportedEncodingException;
import java.net.URL;
import java.net.URLEncoder;
-import java.sql.Connection;
import java.util.ArrayList;
import java.util.List;
import java.util.logging.Logger;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
/**
*
diff --git a/src/main/java/com/juick/xmpp/extensions/JuickMessage.java b/src/main/java/com/juick/xmpp/extensions/JuickMessage.java
index bbc1568e..a7fd1e35 100644
--- a/src/main/java/com/juick/xmpp/extensions/JuickMessage.java
+++ b/src/main/java/com/juick/xmpp/extensions/JuickMessage.java
@@ -45,6 +45,8 @@ public class JuickMessage extends com.juick.Message implements StanzaChild {
public JuickMessage(com.juick.Message msg) {
super(msg);
+ df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ df.setTimeZone(TimeZone.getTimeZone("UTC"));
}
@Override
diff --git a/src/main/java/com/juick/xmpp/s2s/S2SComponent.java b/src/main/java/com/juick/xmpp/s2s/S2SComponent.java
index b7155643..4a4d3413 100644
--- a/src/main/java/com/juick/xmpp/s2s/S2SComponent.java
+++ b/src/main/java/com/juick/xmpp/s2s/S2SComponent.java
@@ -151,8 +151,8 @@ public class S2SComponent implements JuickComponent {
public S2SComponent(JuickApplication application, Properties conf) {
LOGGER.info("component initialized");
- HOSTNAME = conf.getProperty("hostname");
- componentName = conf.getProperty("componentname");
+ HOSTNAME = conf.getProperty("hostname", "juick.com");
+ componentName = conf.getProperty("componentname", "s2s");
STATSFILE = conf.getProperty("statsfile");
this.sql = application.getSql();
this.executorService = application.getExecutorService();
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-21 16:24:20 +0000