From 9820abe11c0c037f50bb2f7ddbb0bd19646264dc Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Fri, 7 Apr 2017 10:29:52 +0300
Subject: juick-www: merge juick-spring-www i18n, drop thymeleaf

---
 .../com/juick/www/controllers/PMController.java    | 134 ---------------------
 1 file changed, 134 deletions(-)
 delete mode 100644 juick-spring-www/src/main/java/com/juick/www/controllers/PMController.java

(limited to 'juick-spring-www/src/main/java/com/juick/www/controllers/PMController.java')

diff --git a/juick-spring-www/src/main/java/com/juick/www/controllers/PMController.java b/juick-spring-www/src/main/java/com/juick/www/controllers/PMController.java
deleted file mode 100644
index f590fc7c..00000000
--- a/juick-spring-www/src/main/java/com/juick/www/controllers/PMController.java
+++ /dev/null
@@ -1,134 +0,0 @@
-package com.juick.www.controllers;
-
-import com.juick.Message;
-import com.juick.User;
-import com.juick.server.util.HttpBadRequestException;
-import com.juick.server.util.HttpForbiddenException;
-import com.juick.service.PMQueriesService;
-import com.juick.service.TagService;
-import com.juick.service.UserService;
-import com.juick.util.MessageUtils;
-import com.juick.util.UserUtils;
-import com.juick.util.WebUtils;
-import com.juick.www.WebApp;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import rocks.xmpp.addr.Jid;
-
-import javax.inject.Inject;
-import java.util.List;
-
-/**
- * Created by vitalyster on 09.12.2016.
- */
-@Controller
-public class PMController {
-    private static final Logger logger = LoggerFactory.getLogger(PMController.class);
-
-    @Inject
-    PMQueriesService pmQueriesService;
-    @Inject
-    UserService userService;
-    @Inject
-    TagService tagService;
-    @Inject
-    WebApp webApp;
-
-    @RequestMapping("/pm/inbox")
-    public String doGetInbox(ModelMap context) {
-        User visitor = UserUtils.getCurrentUser();
-
-        String title = "PM: Inbox";
-        List<Message> msgs = pmQueriesService.getLastPMInbox(visitor.getUid());
-
-        msgs.forEach(m -> m.setText(MessageUtils.formatMessage(m.getText())));
-
-        context.put("title", title);
-        context.put("msgs", msgs);
-        context.put("tags", tagService.getPopularTags());
-
-        return "views/pm_inbox";
-    }
-
-    @RequestMapping(value = "/pm/sent", method = RequestMethod.GET)
-    public String doGetSent(
-            @RequestParam String uname,
-            ModelMap context) {
-        String title = "PM: Sent";
-        User visitor = UserUtils.getCurrentUser();
-        List<com.juick.Message> msgs = pmQueriesService.getLastPMSent(visitor.getUid());
-
-        if (WebUtils.isNotUserName(uname)) {
-            uname = StringUtils.EMPTY;
-        }
-        context.put("title", title);
-        context.put("msgs", msgs);
-        context.put("tags", tagService.getPopularTags());
-        context.put("uname", uname);
-        return "views/pm_sent";
-    }
-
-    @RequestMapping(value = "/pm/send", method = RequestMethod.POST)
-    public String doPostPM(
-            @RequestParam String uname,
-            @RequestParam String body,
-            ModelMap context) {
-        User visitor = UserUtils.getCurrentUser();
-        if (uname.startsWith("@")) {
-            uname = uname.substring(1);
-        }
-        int uid = 0;
-        if (WebUtils.isUserName(uname)) {
-            uid = userService.getUIDbyName(uname);
-        }
-
-        if (uid == 0 || body == null || body.length() < 1 || body.length() > 10240) {
-            throw new HttpBadRequestException();
-        }
-
-        if (userService.isInBLAny(uid, visitor.getUid())) {
-            throw new HttpForbiddenException();
-        }
-
-        if (pmQueriesService.createPM(visitor.getUid(), uid, body)) {
-            if (webApp.getXmpp() != null) {
-                rocks.xmpp.core.stanza.model.Message msg = new rocks.xmpp.core.stanza.model.Message();
-                msg.setFrom(Jid.of("juick@juick.com"));
-                msg.setTo(Jid.of(String.format("%d@push.juick.com", uid)));
-                com.juick.Message jmsg = new com.juick.Message();
-                jmsg.setUser(visitor);
-                jmsg.setText(body);
-                msg.addExtension(jmsg);
-                webApp.getXmpp().send(msg);
-
-                msg.setTo(Jid.of(String.format("%d@ws.juick.com", uid)));
-                webApp.getXmpp().send(msg);
-
-                List<String> jids = userService.getJIDsbyUID(uid);
-                for (String jid : jids) {
-                    rocks.xmpp.core.stanza.model.Message mm = new rocks.xmpp.core.stanza.model.Message();
-                    mm.setTo(Jid.of(jid));
-                    mm.setType(rocks.xmpp.core.stanza.model.Message.Type.CHAT);
-                    if (pmQueriesService.havePMinRoster(visitor.getUid(), jid)) {
-                        mm.setFrom(Jid.of(jmsg.getUser().getName(), "juick.com", "Juick"));
-                        mm.setBody(body);
-                    } else {
-                        mm.setFrom(Jid.of("juick", "juick.com", "Juick"));
-                        mm.setBody("Private message from @" + jmsg.getUser().getName() + ":\n" + body);
-                    }
-                    webApp.getXmpp().send(mm);
-                }
-            } else {
-                logger.warn("XMPP unavailable");
-            }
-            return "redirect:/pm/sent";
-        }
-        throw new HttpBadRequestException();
-    }
-}
-- 
cgit v1.2.3