", "\n");
+
+ msg = msg.replaceAll("\n", " \n");
+ return msg;
+ }
+}
diff --git a/juick-rss/src/main/java/com/juick/rss/Utils.java b/juick-rss/src/main/java/com/juick/rss/Utils.java
new file mode 100644
index 00000000..036a5a6b
--- /dev/null
+++ b/juick-rss/src/main/java/com/juick/rss/Utils.java
@@ -0,0 +1,36 @@
+/*
+ * Juick
+ * Copyright (C) 2008-2011, ugnich
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ */
+package com.juick.rss;
+
+/**
+ *
+ * @author ugnich
+ */
+public class Utils {
+
+ public static int parseInt(String str, int def) {
+ int ret = def;
+ if (str != null) {
+ try {
+ ret = Integer.parseInt(str);
+ } catch (Exception e) {
+ }
+ }
+ return ret;
+ }
+}
diff --git a/juick-rss/src/main/webapp/WEB-INF/juick.conf.example b/juick-rss/src/main/webapp/WEB-INF/juick.conf.example
new file mode 100644
index 00000000..2cb6f4f7
--- /dev/null
+++ b/juick-rss/src/main/webapp/WEB-INF/juick.conf.example
@@ -0,0 +1,2 @@
+datasource_driver=org.h2.Driver
+datasource_url=jdbc:h2:~/test
diff --git a/juick-rss/src/main/webapp/WEB-INF/web.xml b/juick-rss/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 00000000..a4264bb0
--- /dev/null
+++ b/juick-rss/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,16 @@
+
+
+
+ Main
+ com.juick.rss.Main
+
+
+ Main
+ /
+
+
+
+ 30
+
+
+
diff --git a/src/main/java/com/juick/rss/Main.java b/src/main/java/com/juick/rss/Main.java
deleted file mode 100644
index 32e7ebae..00000000
--- a/src/main/java/com/juick/rss/Main.java
+++ /dev/null
@@ -1,300 +0,0 @@
-/*
- * Juick
- * Copyright (C) 2008-2013, ugnich
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
-package com.juick.rss;
-
-import com.juick.Message;
-import com.juick.server.MessagesQueries;
-import com.juick.server.UserQueries;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.datasource.DriverManagerDataSource;
-
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-import java.util.Properties;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * @author ugnich
- */
-@WebServlet(name = "Main", urlPatterns = {"/"})
-public class Main extends HttpServlet {
-
- private static final SimpleDateFormat sdfRSS = new SimpleDateFormat("EEE, d MMM yyyy HH:mm:ss Z");
- JdbcTemplate sql;
-
- @Override
- public void init() throws ServletException {
- super.init();
- try {
- Properties conf = new Properties();
- conf.load(getServletContext().getResourceAsStream("/WEB-INF/juick.conf"));
- DriverManagerDataSource dataSource = new DriverManagerDataSource();
- dataSource.setDriverClassName(conf.getProperty("datasource_driver", "com.mysql.jdbc.Driver"));
- dataSource.setUrl(conf.getProperty("datasource_url"));
- sql = new JdbcTemplate(dataSource);
-
- } catch (Exception e) {
- log(null, e);
- }
- }
-
- @Override
- protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- if (request.getCharacterEncoding() == null) {
- request.setCharacterEncoding("UTF-8");
- }
-
- String uri = request.getRequestURI();
- if (uri.equals("/")) {
- int hours = Utils.parseInt(request.getParameter("hours"), 0);
- if (hours > 0 && hours < 13) {
- List mids = getLastMessages(hours);
- List msgs = MessagesQueries.getMessages(sql, mids);
- responseMessages(response, 0, null, msgs);
- } else {
- response.sendError(404);
- }
- } else if (uri.equals("/comments")) {
- int hours = Utils.parseInt(request.getParameter("hours"), 0);
- if (hours > 0 && hours < 13) {
- responseReplies(response, hours);
- } else {
- response.sendError(404);
- }
- } else if (uri.matches("^/[a-zA-Z0-9\\-]{2,16}/blog$")) {
- String uname = uri.substring(1, uri.length() - 5);
- int uid = UserQueries.getUIDbyName(sql, uname);
- if (uid > 0) {
- List mids = MessagesQueries.getUserBlog(sql, uid, 0, 0);
- if (!mids.isEmpty()) {
- List msgs = MessagesQueries.getMessages(sql, mids);
- responseMessages(response, uid, uname, msgs);
- } else {
- response.sendError(404);
- }
- } else {
- response.sendError(404);
- }
- } else {
- response.sendError(404);
- }
- }
-
- private void responseMessages(HttpServletResponse response, int uid, String uname, List msgs) throws IOException {
- response.setContentType("application/rss+xml; charset=UTF-8");
-
- try (PrintWriter out = response.getWriter()) {
- out.println("");
- out.println("");
- out.println("");
- if (uid > 0) {
- out.println("");
- out.println("" + uname + " - Juick");
- out.println("http://juick.com/" + uname + "/");
- out.println("The latest messages by @" + uname + " at Juick");
- out.println("http://i.juick.com/a/" + uid + ".png" + uname + " - Juickhttp://juick.com/" + uname + "/");
- } else {
- out.println("Juick");
- out.println("http://juick.com/");
- out.println("The latest messages at Juick");
- }
-
- for (Message msg : msgs) {
- out.println("");
- out.println("http://juick.com/" + msg.getUser().getUName() + "/" + msg.getMID() + "");
- out.println("http://juick.com/" + msg.getUser().getUName() + "/" + msg.getMID() + "");
-
- out.print("<![CDATA[@" + msg.getUser().getUName() + ":");
- if (!msg.Tags.isEmpty()) {
- for (int n = 0; n < msg.Tags.size(); n++) {
- out.print(" *" + msg.Tags.get(n));
- }
- }
- out.println("]]>");
- out.println("");
-
- out.println("" + sdfRSS.format(msg.getDate()) + "");
-
- out.println("http://juick.com/" + msg.getUser().getUName() + "/" + msg.getMID() + "");
- if (!msg.Tags.isEmpty()) {
- for (int n = 0; n < msg.Tags.size(); n++) {
- out.println("" + escapeHtml(msg.Tags.get(n)) + "");
- }
- }
- if (msg.AttachmentType != null) {
- if (msg.AttachmentType.equals("jpg")) {
- out.println("");
- out.println("");
- } else if (msg.AttachmentType.equals("png")) {
- out.println("");
- out.println("");
- }
- }
- out.println("");
- out.println("");
- }
-
- out.println("");
- }
- }
-
- private class ResponseReply {
- String muname;
- int mid;
- int rid;
- String uname;
- String description;
- Date pubDate;
- String attachmentType;
- }
-
- private void responseReplies(HttpServletResponse response, int hours) throws IOException {
- response.setContentType("application/rss+xml; charset=UTF-8");
-
- try (PrintWriter out = response.getWriter()) {
-
- out.println("");
- out.println("");
- out.println("");
- out.println("Juick");
- out.println("http://juick.com/");
- out.println("The latest comments at Juick");
-
- sql.query("SELECT users2.nick,replies.message_id,replies.reply_id," +
- "users.nick,replies.txt," +
- "replies.ts,replies.attach,replies.ts+0 " +
- "FROM ((replies INNER JOIN users ON replies.user_id=users.id) " +
- "INNER JOIN messages ON replies.message_id=messages.message_id) " +
- "INNER JOIN users AS users2 ON messages.user_id=users2.id " +
- "WHERE replies.ts>TIMESTAMPADD(HOUR,?,NOW()) AND messages.privacy>0", (rs, rowNum) -> {
- ResponseReply reply = new ResponseReply();
- reply.muname = rs.getString(1);
- reply.mid = rs.getInt(2);
- reply.rid = rs.getInt(3);
- reply.uname = rs.getString(4);
- reply.description = rs.getString(5);
- reply.pubDate = rs.getTimestamp(6);
- reply.attachmentType = rs.getString(7);
- return reply;
- }, -hours).stream().forEach(r -> {
- out.println("");
- out.println("http://juick.com/" + r.muname + "/" + r.mid + "");
- out.println("http://juick.com/" + r.muname + "/" + r.mid + "#" + r.rid + "");
- out.println("http://juick.com/" + r.muname + "/" + r.mid + "#" + r.rid + "");
- out.println("http://juick.com/" + r.uname + "/");
- out.println("@" + r.uname + ":");
- out.println("");
- out.println("" + sdfRSS.format(r.pubDate) + "");
- String attachment = r.attachmentType;
- if (attachment != null && !attachment.isEmpty()) {
- if (attachment.equals("jpg")) {
- out.println("");
- out.println("");
- } else if (attachment.equals("png")) {
- out.println("");
- out.println("");
- }
- }
- out.println("");
- });
- out.println("");
- }
- }
-
- private List getLastMessages(int hours) {
- return sql.queryForList("SELECT message_id FROM messages WHERE messages.ts>TIMESTAMPADD(HOUR,?,NOW())",
- Integer.class, -hours);
- }
-
- private static Pattern regexLinks2 = Pattern.compile("((?<=\\s)|(?<=\\A))([\\[\\{]|<)((?:ht|f)tps?://(?:www\\.)?([^\\/\\s\\\"\\)\\!]+)/?(?:[^\\]\\}](?", ">");
- }
-
- public static String formatMessage(String msg) {
- msg = escapeHtml(msg);
-
- // --
- // —
- msg = msg.replaceAll("((?<=\\s)|(?<=\\A))\\-\\-?((?=\\s)|(?=\\Z))", "$1—$2");
-
- // http://juick.com/last?page=2
- // juick.com
- msg = msg.replaceAll("((?<=\\s)|(?<=\\A))((?:ht|f)tps?://(?:www\\.)?([^\\/\\s\\n\\\"]+)/?[^\\s\\n\\\"]*)", "$1$3");
-
- // #12345
- // #12345
- msg = msg.replaceAll("((?<=\\s)|(?<=\\A)|(?<=\\p{Punct}))#(\\d+)((?=\\s)|(?=\\Z)|(?=\\))|(?=\\.)|(?=\\,))", "$1#$2$3");
-
- // #12345/65
- // #12345/65
- msg = msg.replaceAll("((?<=\\s)|(?<=\\A)|(?<=\\p{Punct}))#(\\d+)/(\\d+)((?=\\s)|(?=\\Z)|(?=\\p{Punct}))", "$1#$2/$3$4");
-
- // *bold*
- // bold
- msg = msg.replaceAll("((?<=\\s)|(?<=\\A)|(?<=\\p{Punct}))\\*([^\\*\\n<>]+)\\*((?=\\s)|(?=\\Z)|(?=\\p{Punct}))", "$1$2$3");
-
- // /italic/
- // italic
- msg = msg.replaceAll("((?<=\\s)|(?<=\\A))/([^\\/\\n<>]+)/((?=\\s)|(?=\\Z)|(?=\\p{Punct}))", "$1$2$3");
-
- // _underline_
- // underline
- msg = msg.replaceAll("((?<=\\s)|(?<=\\A))_([^\\_\\n<>]+)_((?=\\s)|(?=\\Z)|(?=\\p{Punct}))", "$1$2$3");
-
- // /12
- // /12
- msg = msg.replaceAll("((?<=\\s)|(?<=\\A))\\/(\\d+)((?=\\s)|(?=\\Z)|(?=\\p{Punct}))", "$1/$2$3");
-
- // @username@jabber.org
- // @username@jabber.org
- msg = msg.replaceAll("((?<=\\s)|(?<=\\A))@([\\w\\-\\.]+@[\\w\\-\\.]+)((?=\\s)|(?=\\Z)|(?=\\p{Punct}))", "$1@$2$3");
-
- // @username
- // @username
- msg = msg.replaceAll("((?<=\\s)|(?<=\\A))@([\\w\\-]{2,16})((?=\\s)|(?=\\Z)|(?=\\p{Punct}))", "$1@$2$3");
-
- // (http://juick.com/last?page=2)
- // (juick.com)
- Matcher m = regexLinks2.matcher(msg);
- StringBuffer sb = new StringBuffer();
- while (m.find()) {
- String url = m.group(3).replace(" ", "%20").replaceAll("\\s+", "");
- m.appendReplacement(sb, "$1$2$4$5");
- }
- m.appendTail(sb);
- msg = sb.toString();
-
- // > citate
- msg = msg.replaceAll("(?:(?<=\\n)|(?<=\\A))> *(.*)?(\\n|(?=\\Z))", "
$1
");
- msg = msg.replaceAll("
", "\n");
-
- msg = msg.replaceAll("\n", " \n");
- return msg;
- }
-}
diff --git a/src/main/java/com/juick/rss/Utils.java b/src/main/java/com/juick/rss/Utils.java
deleted file mode 100644
index 036a5a6b..00000000
--- a/src/main/java/com/juick/rss/Utils.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Juick
- * Copyright (C) 2008-2011, ugnich
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see .
- */
-package com.juick.rss;
-
-/**
- *
- * @author ugnich
- */
-public class Utils {
-
- public static int parseInt(String str, int def) {
- int ret = def;
- if (str != null) {
- try {
- ret = Integer.parseInt(str);
- } catch (Exception e) {
- }
- }
- return ret;
- }
-}
diff --git a/src/main/webapp/WEB-INF/juick.conf.example b/src/main/webapp/WEB-INF/juick.conf.example
deleted file mode 100644
index 2cb6f4f7..00000000
--- a/src/main/webapp/WEB-INF/juick.conf.example
+++ /dev/null
@@ -1,2 +0,0 @@
-datasource_driver=org.h2.Driver
-datasource_url=jdbc:h2:~/test
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index a4264bb0..00000000
--- a/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
- Main
- com.juick.rss.Main
-
-
- Main
- /
-
-
-
- 30
-
-
-
--
cgit v1.2.3