aboutsummaryrefslogtreecommitdiff
path: root/juick-api/src/main/java/com/juick/api/controllers/PM.java
diff options
context:
space:
mode:
authorGravatar Alexander Alexeev2016-12-11 00:52:57 +0700
committerGravatar Vitaly Takmazov2016-12-11 18:24:37 +0300
commitac6c86ddd482721e7011dcb727e4099b8cdf84b1 (patch)
tree233ff85e261037b0949e4aa5105ca0dbcd22e9c4 /juick-api/src/main/java/com/juick/api/controllers/PM.java
parent5ff660e5f3e73382781f854a0afc350d2ad6d626 (diff)
anonymous user support
Diffstat (limited to 'juick-api/src/main/java/com/juick/api/controllers/PM.java')
-rw-r--r--juick-api/src/main/java/com/juick/api/controllers/PM.java13
1 files changed, 3 insertions, 10 deletions
diff --git a/juick-api/src/main/java/com/juick/api/controllers/PM.java b/juick-api/src/main/java/com/juick/api/controllers/PM.java
index 478ca75e..1bf1646b 100644
--- a/juick-api/src/main/java/com/juick/api/controllers/PM.java
+++ b/juick-api/src/main/java/com/juick/api/controllers/PM.java
@@ -18,17 +18,14 @@ import rocks.xmpp.addr.Jid;
import rocks.xmpp.core.stanza.model.Message;
import javax.inject.Inject;
-import java.security.Principal;
import java.util.List;
/**
- *
* @author ugnich
*/
@Controller
@ResponseBody
public class PM {
-
@Inject
UserService userService;
@Inject
@@ -38,10 +35,8 @@ public class PM {
@RequestMapping(value = "/pm", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public List<com.juick.Message> doGetPM(
- Principal principal,
@RequestParam(required = false) String uname) {
- String name = UserUtils.getUsername(principal, null);
- User visitor = userService.getUserByName(name);
+ User visitor = UserUtils.getCurrentUser();
int vuid = visitor.getUid();
if (vuid == 0) {
throw new HttpForbiddenException();
@@ -60,11 +55,9 @@ public class PM {
@RequestMapping(value = "/pm", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public com.juick.Message doPostPM(
- Principal principal,
@RequestParam String uname,
@RequestParam String body) {
- String name = UserUtils.getUsername(principal, null);
- User visitor = userService.getUserByName(name);
+ User visitor = UserUtils.getCurrentUser();
int vuid = visitor.getUid();
if (vuid == 0) {
throw new HttpForbiddenException();
@@ -96,7 +89,7 @@ public class PM {
apiServer.getXmpp().send(msg);
List<String> jids = userService.getJIDsbyUID(uid);
- for (String jid: jids) {
+ for (String jid : jids) {
Message mm = new Message();
mm.setTo(Jid.of(jid));
mm.setType(Message.Type.CHAT);