Reorganize layout and code cleanup

1 files changed, 120 insertions, 0 deletions

diff --git a/src/main/java/com/juick/www/api/PM.java b/src/main/java/com/juick/www/api/PM.java
new file mode 100644
index 00000000..b81dcc78
--- /dev/null
+++ b/src/main/java/com/juick/www/api/PM.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright (C) 2008-2019, Juick
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+package com.juick.www.api;
+
+import com.juick.model.Chat;
+import com.juick.model.Message;
+import com.juick.model.User;
+import com.juick.model.AnonymousUser;
+import com.juick.model.PrivateChats;
+import com.juick.server.util.HttpBadRequestException;
+import com.juick.server.util.HttpForbiddenException;
+import com.juick.server.util.WebUtils;
+import com.juick.www.WebApp;
+import com.juick.service.PMQueriesService;
+import com.juick.service.UserService;
+import com.juick.service.component.SystemEvent;
+import com.juick.service.security.annotation.Visitor;
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.inject.Inject;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author ugnich
+ */
+@RestController
+public class PM {
+    @Inject
+    private UserService userService;
+    @Inject
+    private PMQueriesService pmQueriesService;
+    @Inject
+    private ApplicationEventPublisher applicationEventPublisher;
+    @Inject
+    private WebApp webApp;
+
+    @RequestMapping(value = "/api/pm", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+    public List<Message> doGetPM(
+            @Visitor User visitor,
+            @RequestParam(required = false) String uname) {
+        int uid = 0;
+        if (uname != null && uname.matches("^[a-zA-Z0-9\\-]{2,16}$")) {
+            uid = userService.getUIDbyName(uname);
+        }
+
+        if (uid == 0) {
+            throw new HttpBadRequestException();
+        }
+
+        List<Message> msgs = pmQueriesService.getPMMessages(visitor.getUid(), uid);
+        msgs.forEach(m -> m.getUser().setAvatar(webApp.getAvatarUrl(m.getUser())));
+        return msgs;
+    }
+
+    @RequestMapping(value = "/api/pm", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
+    public Message doPostPM(
+            @Visitor User visitor,
+            @RequestParam String uname,
+            @RequestParam String body) {
+        User userTo = AnonymousUser.INSTANCE;
+        if (WebUtils.isUserName(uname)) {
+            userTo = userService.getUserByName(uname);
+        }
+
+        if (userTo.getUid() == 0 || body == null || body.length() < 1 || body.length() > 10240) {
+            throw new HttpBadRequestException();
+        }
+
+        if (userService.isInBLAny(userTo.getUid(), visitor.getUid())) {
+            throw new HttpForbiddenException();
+        }
+
+        if (pmQueriesService.createPM(visitor.getUid(), userTo.getUid(), body)) {
+            Message jmsg = new Message();
+            jmsg.setUser(visitor);
+            jmsg.setText(body);
+            jmsg.setTo(userTo);
+            jmsg.getUser().setAvatar(webApp.getAvatarUrl(jmsg.getUser()));
+            applicationEventPublisher.publishEvent(
+                    new SystemEvent(this,
+                            SystemActivity.message(jmsg.getUser(), jmsg, Collections.singletonList(jmsg.getTo()))));
+            return jmsg;
+
+        }
+        throw new HttpBadRequestException();
+    }
+    @RequestMapping(value = "/api/groups_pms", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+    public PrivateChats doGetGroupsPMs(
+            @Visitor User visitor,
+            @RequestParam(defaultValue = "5") int cnt) {
+        // TODO: ignore cnt param for now but make sure paging param will not be cnt
+
+        List<Chat> lastconv = pmQueriesService.getLastChats(visitor);
+        lastconv.forEach(c -> c.setAvatar(webApp.getAvatarUrl(c)));
+        PrivateChats pms = new PrivateChats();
+        pms.setUsers(lastconv);
+        return pms;
+    }
+}