aboutsummaryrefslogtreecommitdiff
path: root/juick-api/src/main/java/com/juick
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2017-09-30 10:48:25 +0300
committerGravatar Vitaly Takmazov2017-09-30 10:48:25 +0300
commit1a5894898f865f888ea1dff847c5b7debabb8665 (patch)
treee0e57ae95df42c531df2e550028b0aebc1df6d98 /juick-api/src/main/java/com/juick
parentf658c873eb585b5cc6d6acb712c3af1081e347fa (diff)
telegram: update signup message
Diffstat (limited to 'juick-api/src/main/java/com/juick')
-rw-r--r--juick-api/src/main/java/com/juick/api/TelegramBotManager.java3
-rw-r--r--juick-api/src/main/java/com/juick/api/controllers/TelegramWebhook.java8
2 files changed, 3 insertions, 8 deletions
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);