3 files changed, 75 insertions, 2 deletions
diff --git a/src/com/juick/server/MessagesQueries.java b/src/com/juick/server/MessagesQueries.java
index ad00b9d20..42b45c242 100644
--- a/src/com/juick/server/MessagesQueries.java
+++ b/src/com/juick/server/MessagesQueries.java
@@ -283,11 +283,11 @@ public class MessagesQueries {
         ResultSet rs = null;
         try {
             if (before > 0) {
-                stmt = sql.prepareStatement("SELECT message_id FROM messages WHERE message_id<? AND (privacy>0 OR user_id=?) ORDER BY message_id DESC LIMIT 20");
+                stmt = sql.prepareStatement("SELECT message_id FROM messages WHERE message_id<? AND (privacy>0 OR user_id=?) AND lang!='fa' ORDER BY message_id DESC LIMIT 20");
                 stmt.setInt(1, before);
                 stmt.setInt(2, visitor_uid);
             } else {
-                stmt = sql.prepareStatement("SELECT message_id FROM messages WHERE (privacy>0 OR user_id=?) ORDER BY message_id DESC LIMIT 20");
+                stmt = sql.prepareStatement("SELECT message_id FROM messages WHERE (privacy>0 OR user_id=?) AND lang!='fa' ORDER BY message_id DESC LIMIT 20");
                 stmt.setInt(1, visitor_uid);
             }
             rs = stmt.executeQuery();
diff --git a/src/com/juick/server/PushQueries.java b/src/com/juick/server/PushQueries.java
new file mode 100644
index 000000000..a532622ad
--- /dev/null
+++ b/src/com/juick/server/PushQueries.java
@@ -0,0 +1,61 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.juick.server;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+
+/**
+ *
+ * @author ugnich
+ */
+public class PushQueries {
+
+    public static ArrayList<String> getAndroidSubscribers(Connection sql, int uid) {
+        ArrayList<String> regids = new ArrayList<String>();
+
+        PreparedStatement stmt = null;
+        ResultSet rs = null;
+        try {
+            stmt = sql.prepareStatement("SELECT regid FROM android INNER JOIN subscr_users ON (subscr_users.user_id=? AND android.user_id=subscr_users.suser_id)");
+            stmt.setInt(1, uid);
+            rs = stmt.executeQuery();
+            rs.beforeFirst();
+            while (rs.next()) {
+                regids.add(rs.getString(1));
+            }
+        } catch (SQLException e) {
+            System.err.println(e);
+        } finally {
+            Utils.finishSQL(rs, stmt);
+        }
+        return regids;
+    }
+
+    public static ArrayList<String> getWinPhoneSubscribers(Connection sql, int uid) {
+        ArrayList<String> urls = new ArrayList<String>();
+
+        PreparedStatement stmt = null;
+        ResultSet rs = null;
+        try {
+            stmt = sql.prepareStatement("SELECT url FROM winphone INNER JOIN subscr_users ON (subscr_users.user_id=? AND winphone.user_id=subscr_users.suser_id)");
+            stmt.setInt(1, uid);
+            rs = stmt.executeQuery();
+            rs.beforeFirst();
+            while (rs.next()) {
+                urls.add(rs.getString(1));
+            }
+        } catch (SQLException e) {
+            System.err.println(e);
+        } finally {
+            Utils.finishSQL(rs, stmt);
+        }
+        return urls;
+    }
+
+}
diff --git a/src/com/juick/server/UserQueries.java b/src/com/juick/server/UserQueries.java
index 178736761..a9f00f949 100644
--- a/src/com/juick/server/UserQueries.java
+++ b/src/com/juick/server/UserQueries.java
@@ -53,6 +53,18 @@ public class UserQueries {
         } finally {
             Utils.finishSQL(rs, stmt);
         }
+
+        PreparedStatement stmt2 = null;
+        try {
+            stmt2 = sql.prepareStatement("INSERT INTO useroptions(user_id) VALUES (?)");
+            stmt2.setInt(1, uid);
+            stmt2.executeUpdate();
+        } catch (SQLException e) {
+            System.err.println(e);
+        } finally {
+            Utils.finishSQL(null, stmt);
+        }
+        
         return uid;
     }