From cfa0a72e2822817b5d8fc45e673ca3d40f214572 Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Wed, 21 Mar 2018 14:12:16 +0300 Subject: xmpp: feed command --- juick-server/src/main/java/com/juick/server/XMPPBot.java | 10 ++++++++++ .../src/test/java/com/juick/server/tests/ServerTests.java | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'juick-server') diff --git a/juick-server/src/main/java/com/juick/server/XMPPBot.java b/juick-server/src/main/java/com/juick/server/XMPPBot.java index 9b6b5fe4..b8789276 100644 --- a/juick-server/src/main/java/com/juick/server/XMPPBot.java +++ b/juick-server/src/main/java/com/juick/server/XMPPBot.java @@ -689,6 +689,16 @@ public class XMPPBot implements StanzaListener, AutoCloseable { public String commandSearchAll(User user, Jid from, String... args) { return "Temporarily unavailable"; } + @UserCommand(pattern = "^(#+)$", help = "# - Show last messages from your feed (## - second page, ...)") + public String commandMyFeed(User user, String... arguments) { + // number of # is the page count + int page = arguments[0].length() - 1; + List mids = messagesService.getMyFeed(user.getUid(), page, false); + if (mids.size() > 0) { + return "Your feed: \n" + printMessages(mids, true); + } + return "Your feed is empty"; + } void sendReply(Jid jidTo, String txt) { Message reply = new Message(); diff --git a/juick-server/src/test/java/com/juick/server/tests/ServerTests.java b/juick-server/src/test/java/com/juick/server/tests/ServerTests.java index dac0be22..1d76ca42 100644 --- a/juick-server/src/test/java/com/juick/server/tests/ServerTests.java +++ b/juick-server/src/test/java/com/juick/server/tests/ServerTests.java @@ -371,7 +371,7 @@ public class ServerTests extends AbstractJUnit4SpringContextTests { public void botCommandsTests() throws IllegalAccessException, NoSuchMethodException, InvocationTargetException { assertThat(bot.processCommand(new User(), Jid.of("test@localhost"), "PING").get(), is("PONG")); // subscription commands have two lines, others have 1 - assertThat(bot.processCommand(new User(), Jid.of("test@localhost"), "help").get().split("\n").length, is(28)); + assertThat(bot.processCommand(new User(), Jid.of("test@localhost"), "help").get().split("\n").length, is(29)); } @Test -- cgit v1.2.3