aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/com
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2016-05-19 21:14:18 +0300
committerGravatar Vitaly Takmazov2016-05-19 21:14:18 +0300
commitce8cef088e7fa1b31a5aa59bb3111600863bc432 (patch)
treeff1980424c3ecfb1a230b480bd4155df0c756bc6 /src/main/java/com
parent2cef33327a837cba6f7dca2bf3dec3293591cc65 (diff)
parent2dd33510e9b82174605bc0f19514cf04d194fe52 (diff)
Merge branch 'tgb' of ssh://den.jabber.ru:2205/var/lib/git/com.juick.api into tgb
Diffstat (limited to 'src/main/java/com')
-rw-r--r--src/main/java/com/juick/api/TelegramBotHook.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/com/juick/api/TelegramBotHook.java b/src/main/java/com/juick/api/TelegramBotHook.java
index 80ae06498..6b1f946ca 100644
--- a/src/main/java/com/juick/api/TelegramBotHook.java
+++ b/src/main/java/com/juick/api/TelegramBotHook.java
@@ -194,7 +194,7 @@ public class TelegramBotHook {
}
private Optional<User> getUser(long tgId) {
try {
- return Optional.of(jdbc.queryForObject("SELECT id, nick, banned FROM users INNER JOIN telegram" +
+ return Optional.of(jdbc.queryForObject("SELECT id, nick, banned FROM users INNER JOIN telegram " +
"ON telegram.user_id = users.id WHERE telegram.tg_id=?", new UserQueries.UserMapper(), tgId));
} catch (EmptyResultDataAccessException e) {
return Optional.empty();