From 1a5894898f865f888ea1dff847c5b7debabb8665 Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Sat, 30 Sep 2017 10:48:25 +0300 Subject: telegram: update signup message --- juick-api/src/main/java/com/juick/api/TelegramBotManager.java | 3 +-- .../src/main/java/com/juick/api/controllers/TelegramWebhook.java | 8 ++------ 2 files changed, 3 insertions(+), 8 deletions(-) (limited to 'juick-api/src/main/java/com') diff --git a/juick-api/src/main/java/com/juick/api/TelegramBotManager.java b/juick-api/src/main/java/com/juick/api/TelegramBotManager.java index e1910949..161680e9 100644 --- a/juick-api/src/main/java/com/juick/api/TelegramBotManager.java +++ b/juick-api/src/main/java/com/juick/api/TelegramBotManager.java @@ -156,8 +156,7 @@ public class TelegramBotManager extends TextWebSocketHandler { public void telegramSignupNotify(Long telegramId, String hash) { bot.execute(new SendMessage(telegramId, "You are subscribed to all Juick messages. " + - "Create or link an existing Juick account to control " + - "what do you want to receive").replyMarkup( + "Create or link an existing Juick account to get your subscriptions and ability to post messages").replyMarkup( new InlineKeyboardMarkup( new InlineKeyboardButton[]{ new InlineKeyboardButton("SIGNUP").url("http://juick.com/signup?type=durov&hash=" + diff --git a/juick-api/src/main/java/com/juick/api/controllers/TelegramWebhook.java b/juick-api/src/main/java/com/juick/api/controllers/TelegramWebhook.java index 7dd82b9f..e14d226d 100644 --- a/juick-api/src/main/java/com/juick/api/controllers/TelegramWebhook.java +++ b/juick-api/src/main/java/com/juick/api/controllers/TelegramWebhook.java @@ -123,12 +123,8 @@ public class TelegramWebhook { String msgUrl = "http://juick.com/login?" + usersService.getHashByUID(user_from.getUid()); telegramBotManager.telegramNotify(message.from().id().longValue(), msg, msgUrl); } else if (text.toLowerCase().startsWith("/post ")) { - if (!user_from.isAnonymous()) { - apiServer.processMessage(user_from, text.substring(6), attachment); - telegramBotManager.telegramNotify(message.from().id().longValue(), "message sent", null); - } else { - telegramBotManager.telegramNotify(message.from().id().longValue(), "Please, /login to send messages", null); - } + apiServer.processMessage(user_from, text.substring(6), attachment); + telegramBotManager.telegramNotify(message.from().id().longValue(), "message sent", null); } else { telegramBotManager.telegramNotify(message.from().id().longValue(), "You can send messages and images to Juick with /post command", null); -- cgit v1.2.3