mail wip

3 files changed, 18 insertions, 1 deletions

diff --git a/juick-server/src/main/java/com/juick/server/util/HttpUtils.java b/juick-server/src/main/java/com/juick/server/util/HttpUtils.java
index c305093c1..31a68962b 100644
--- a/juick-server/src/main/java/com/juick/server/util/HttpUtils.java
+++ b/juick-server/src/main/java/com/juick/server/util/HttpUtils.java
@@ -81,7 +81,7 @@ public class HttpUtils {
                 throw new Exception("Wrong file type");
             }
 
-            attachmentFName = UUID.randomUUID().toString() + "." + attachmentType;
+            attachmentFName = DigestUtils.md5Hex(UUID.randomUUID().toString()) + "." + attachmentType;
             fos = new FileOutputStream(Paths.get(tmpDir, attachmentFName).toString());
             byte[] buffer = new byte[10240];
             int len;
diff --git a/juick-server/src/main/java/com/juick/service/UserService.java b/juick-server/src/main/java/com/juick/service/UserService.java
index 661f386c9..7f4bb1fe7 100644
--- a/juick-server/src/main/java/com/juick/service/UserService.java
+++ b/juick-server/src/main/java/com/juick/service/UserService.java
@@ -30,6 +30,8 @@ public interface UserService {
 
     User getFullyUserByName(String username);
 
+    User getUserByEmail(String email);
+
     List<User> getFullyUsersByNames(Collection<String> usernames);
 
     User getUserByJID(String jid);
diff --git a/juick-server/src/main/java/com/juick/service/UserServiceImpl.java b/juick-server/src/main/java/com/juick/service/UserServiceImpl.java
index 0b8ed13b0..1fc725258 100644
--- a/juick-server/src/main/java/com/juick/service/UserServiceImpl.java
+++ b/juick-server/src/main/java/com/juick/service/UserServiceImpl.java
@@ -141,6 +141,21 @@ public class UserServiceImpl extends BaseJdbcService implements UserService {
         return null;
     }
 
+    @Override
+    @Transactional(readOnly = true)
+    public User getUserByEmail(String email) {
+        if (StringUtils.isNotBlank(email)) {
+            List<User> list = getJdbcTemplate().query(
+                    "SELECT id, nick, banned, lang FROM users WHERE id = (SELECT user_id FROM emails WHERE email = ?)",
+                    new UserMapper(),
+                    email);
+
+            if (!list.isEmpty())
+                return list.get(0);
+        }
+        return AnonymousUser.INSTANCE;
+    }
+
     @Transactional(readOnly = true)
     @Override
     public List<User> getFullyUsersByNames(final Collection<String> usernames) {