La123123.
/
telegram_example
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

1. Fix users blocked the bot

master
Rubenlagus 10 years ago
parent
d53f84cce9
commit
777bcfb72f
4 changed files with 225 additions and 193 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 263
      .idea/workspace.xml
  2. 12
      src/main/java/org/telegram/database/DatabaseManager.java
  3. 119
      src/main/java/org/telegram/updateshandlers/FilesHandlers.java
  4. 24
      src/main/java/org/telegram/updateshandlers/WeatherHandlers.java

263
.idea/workspace.xml
View File

@ -2,16 +2,12 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="cc3252dd-ba1f-404e-b603-ef880b5c3341" name="Default" comment="1. Merge&#10;"> <list default="true" id="cc3252dd-ba1f-404e-b603-ef880b5c3341" name="Default" comment="1. Merge&#10;">
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/Maven__com_github_rubenlagus_TelegramBots_v2_0_1.xml" afterPath="" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/BotConfig.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/BotConfig.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/BotConfig.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/BotConfig.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/BuildVars.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/BuildVars.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/BuildVars.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/BuildVars.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/Main.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/Main.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/Main.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/Main.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/ChannelHandlers.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/ChannelHandlers.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/database/DatabaseManager.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/database/DatabaseManager.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/FilesHandlers.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/FilesHandlers.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/FilesHandlers.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/FilesHandlers.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/RaeHandlers.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/RaeHandlers.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java" afterPath="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java" />
</list> </list>
<ignored path="BotAPi.iws" /> <ignored path="BotAPi.iws" />
@ -55,69 +51,68 @@
<favorites_list name="BotAPi" /> <favorites_list name="BotAPi" />
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="RaeHandlers.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/RaeHandlers.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="195">
<caret line="52" column="45" selection-start-line="52" selection-start-column="45" selection-end-line="52" selection-end-column="45" />
<folding>
<element signature="imports" expanded="true" />
<element signature="docComment;class#RaeHandlers#0" expanded="true" />
<element signature="docComment;method#handleIncomingInlineQuery#0;class#RaeHandlers#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="TransifexHandlers.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="35" column="12" selection-start-line="35" selection-start-column="12" selection-end-line="35" selection-end-column="12" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="WeatherHandlers.java" pinned="false" current-in-tab="true"> <file leaf-file-name="WeatherHandlers.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java"> <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285"> <state relative-caret-position="375">
<caret line="62" column="13" selection-start-line="62" selection-start-column="13" selection-end-line="62" selection-end-column="13" /> <caret line="69" column="23" selection-start-line="69" selection-start-column="23" selection-end-line="69" selection-end-column="23" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="DirectionsHandlers.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="51" column="20" selection-start-line="51" selection-start-column="20" selection-end-line="51" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ChannelHandlers.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/ChannelHandlers.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="451">
<caret line="50" column="5" selection-start-line="50" selection-start-column="5" selection-end-line="50" selection-end-column="5" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="e#2983#2984#0" expanded="true" />
<element signature="e#3027#3028#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="FilesHandlers.java" pinned="false" current-in-tab="false"> <file leaf-file-name="DatabaseManager.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/FilesHandlers.java"> <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/database/DatabaseManager.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120"> <state relative-caret-position="301">
<caret line="49" column="35" selection-start-line="49" selection-start-column="35" selection-end-line="49" selection-end-column="35" /> <caret line="486" column="0" selection-start-line="486" selection-start-column="0" selection-end-line="486" selection-end-column="0" />
<folding /> <folding>
<element signature="method#DatabaseManager#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#getInstance#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#recreateTable#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#updateToVersion2#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#updateToVersion3#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#updateToVersion4#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#updateToVersion5#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#updateToVersion6#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#updateToVersion7#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#createNewTables#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#addFile#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#getFilesByUser#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#addUserForFile#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#deleteUserForFile#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#getUserStatusForFile#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#doesFileExists#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#deleteFile#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#addRecentWeather#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#getRecentWeather#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#cleanUpRecent#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#addUserForDirection#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#getUserDestinationStatus#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#getUserDestinationMessageId#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#getUserOrigin#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#deleteUserForDirections#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#putLastUpdate#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#getLastUpdate#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#getUserLanguage#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#putUserLanguage#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#getWeatherState#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#insertWeatherState#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#getRecentWeatherIdByCity#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#getUserWeatherOptions#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#addNewUserWeatherOptions#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#putUserWeatherLanguageOption#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#putUserWeatherUnitsOption#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#createNewWeatherAlert#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#getAlertCitiesNameByUser#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#deleteAlertCity#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#deleteAlertsForUser#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#getAllAlerts#0;class#DatabaseManager#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@ -165,7 +160,6 @@
<option value="$PROJECT_DIR$/src/main/java/org/telegram/services/LocalisationService.java" /> <option value="$PROJECT_DIR$/src/main/java/org/telegram/services/LocalisationService.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendDocument.java" /> <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/methods/SendDocument.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/SenderHelper.java" /> <option value="$PROJECT_DIR$/src/main/java/org/telegram/SenderHelper.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/database/DatabaseManager.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/database/CreationStrings.java" /> <option value="$PROJECT_DIR$/src/main/java/org/telegram/database/CreationStrings.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Audio.java" /> <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Audio.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Chat.java" /> <option value="$PROJECT_DIR$/src/main/java/org/telegram/api/objects/Chat.java" />
@ -204,10 +198,11 @@
<option value="$PROJECT_DIR$/src/main/java/org/telegram/Main.java" /> <option value="$PROJECT_DIR$/src/main/java/org/telegram/Main.java" />
<option value="$PROJECT_DIR$/pom.xml" /> <option value="$PROJECT_DIR$/pom.xml" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/ChannelHandlers.java" /> <option value="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/ChannelHandlers.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/FilesHandlers.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java" /> <option value="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/RaeHandlers.java" /> <option value="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/RaeHandlers.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java" /> <option value="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/database/DatabaseManager.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/FilesHandlers.java" />
<option value="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java" /> <option value="$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java" />
</list> </list>
</option> </option>
@ -375,6 +370,7 @@
</navigator> </navigator>
<panes> <panes>
<pane id="Scratches" /> <pane id="Scratches" />
<pane id="Scope" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<PATH> <PATH>
@ -514,7 +510,6 @@
</subPane> </subPane>
</pane> </pane>
<pane id="PackagesPane" /> <pane id="PackagesPane" />
<pane id="Scope" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
@ -1206,14 +1201,8 @@
<workItem from="1460911144788" duration="1760000" /> <workItem from="1460911144788" duration="1760000" />
<workItem from="1460922884231" duration="536000" /> <workItem from="1460922884231" duration="536000" />
<workItem from="1461933375684" duration="218000" /> <workItem from="1461933375684" duration="218000" />
<workItem from="1461935875574" duration="130000" /> <workItem from="1461935875574" duration="293000" />
</task> <workItem from="1461943598189" duration="1022000" />
<task id="LOCAL-00010" summary="1. Cleanup databasemanager file">
<created>1434928139587</created>
<option name="number" value="00010" />
<option name="presentableId" value="LOCAL-00010" />
<option name="project" value="LOCAL" />
<updated>1434928139587</updated>
</task> </task>
<task id="LOCAL-00011" summary="1. Fix weather api"> <task id="LOCAL-00011" summary="1. Fix weather api">
<created>1434932225092</created> <created>1434932225092</created>
@ -1551,11 +1540,18 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1461933537820</updated> <updated>1461933537820</updated>
</task> </task>
<option name="localTasksCounter" value="59" /> <task id="LOCAL-00059" summary="1. Global exceptions&#10;">
<created>1461936025610</created>
<option name="number" value="00059" />
<option name="presentableId" value="LOCAL-00059" />
<option name="project" value="LOCAL" />
<updated>1461936025610</updated>
</task>
<option name="localTasksCounter" value="60" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="288198000" /> <option name="totallyTimeSpent" value="289383000" />
</component> </component>
<component name="TodoView"> <component name="TodoView">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
@ -1572,7 +1568,6 @@
<layout> <layout>
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3295129" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3295129" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32886904" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
@ -1586,6 +1581,7 @@
<window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Statistic" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Statistic" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.19335347" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.19335347" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Dynamic Properties" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
@ -1595,8 +1591,8 @@
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Dynamic Properties" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.40327382" sideWeight="0.4879154" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.40327382" sideWeight="0.4879154" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32886904" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32886904" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32886904" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Database Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32886904" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Database Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32886904" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
@ -1646,7 +1642,6 @@
<option name="myLimit" value="2678400000" /> <option name="myLimit" value="2678400000" />
</component> </component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<MESSAGE value="1. Fix filesbot bug &#10;" />
<MESSAGE value="1. Added spanish localization&#10;" /> <MESSAGE value="1. Added spanish localization&#10;" />
<MESSAGE value="1. Added portuguese localization&#10;2. Updates english and spanish localizations&#10;" /> <MESSAGE value="1. Added portuguese localization&#10;2. Updates english and spanish localizations&#10;" />
<MESSAGE value="1. Fix weather bug and spanish translation&#10;" /> <MESSAGE value="1. Fix weather bug and spanish translation&#10;" />
@ -1671,7 +1666,8 @@
<MESSAGE value="1. Samples Bots 2.0&#10;" /> <MESSAGE value="1. Samples Bots 2.0&#10;" />
<MESSAGE value="1. Update dependencies" /> <MESSAGE value="1. Update dependencies" />
<MESSAGE value="v2.2.6" /> <MESSAGE value="v2.2.6" />
<option name="LAST_COMMIT_MESSAGE" value="v2.2.6" /> <MESSAGE value="1. Global exceptions&#10;" />
<option name="LAST_COMMIT_MESSAGE" value="1. Global exceptions&#10;" />
<option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="true" /> <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="true" />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
@ -1709,13 +1705,13 @@
</line-breakpoint> </line-breakpoint>
<line-breakpoint enabled="true" type="java-line"> <line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java</url> <url>file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java</url>
<line>1182</line> <line>1178</line>
<properties /> <properties />
<option name="timeStamp" value="301" /> <option name="timeStamp" value="301" />
</line-breakpoint> </line-breakpoint>
<line-breakpoint enabled="true" type="java-line"> <line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java</url> <url>file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java</url>
<line>1175</line> <line>1171</line>
<properties /> <properties />
<option name="timeStamp" value="302" /> <option name="timeStamp" value="302" />
</line-breakpoint> </line-breakpoint>
@ -1744,8 +1740,6 @@
<option name="FILTER_TARGETS" value="false" /> <option name="FILTER_TARGETS" value="false" />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/812016.log" />
<entry file="file://$PROJECT_DIR$/1712016.log" />
<entry file="file://$PROJECT_DIR$/1812016.log" /> <entry file="file://$PROJECT_DIR$/1812016.log" />
<entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/objects/ChosenInlineQuery.java" /> <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/api/objects/ChosenInlineQuery.java" />
<entry file="jar://$MAVEN_REPOSITORY$/com/github/rubenlagus/TelegramBots/v0.1/TelegramBots-v0.1.jar!/org/telegram/telegrambots/bots/TelegramLongPollingBot.class" /> <entry file="jar://$MAVEN_REPOSITORY$/com/github/rubenlagus/TelegramBots/v0.1/TelegramBots-v0.1.jar!/org/telegram/telegrambots/bots/TelegramLongPollingBot.class" />
@ -1871,16 +1865,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/database/DatabaseManager.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
<caret line="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/1742016.log"> <entry file="file://$PROJECT_DIR$/1742016.log">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="0">
@ -1919,14 +1903,24 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/FilesHandlers.java"> <entry file="jar://$MAVEN_REPOSITORY$/com/github/rubenlagus/TelegramBots/v2.2.6/TelegramBots-v2.2.6.jar!/org/telegram/telegrambots/bots/AbsSender.class">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120"> <state relative-caret-position="210">
<caret line="49" column="35" selection-start-line="49" selection-start-column="35" selection-end-line="49" selection-end-column="35" /> <caret line="66" column="19" selection-start-line="66" selection-start-column="19" selection-end-line="66" selection-end-column="19" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/ChannelHandlers.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="451">
<caret line="50" column="5" selection-start-line="50" selection-start-column="5" selection-end-line="50" selection-end-column="5" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java"> <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300"> <state relative-caret-position="300">
@ -1935,19 +1929,17 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/ChannelHandlers.java"> <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="451"> <state relative-caret-position="225">
<caret line="50" column="5" selection-start-line="50" selection-start-column="5" selection-end-line="50" selection-end-column="5" /> <caret line="35" column="12" selection-start-line="35" selection-start-column="12" selection-end-line="35" selection-end-column="12" />
<folding> <folding />
<element signature="imports" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/RaeHandlers.java"> <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/RaeHandlers.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="195"> <state relative-caret-position="0">
<caret line="52" column="45" selection-start-line="52" selection-start-column="45" selection-end-line="52" selection-end-column="45" /> <caret line="52" column="45" selection-start-line="52" selection-start-column="45" selection-end-line="52" selection-end-column="45" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
@ -1957,22 +1949,83 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java"> <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/structure/WeatherAlert.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225"> <state relative-caret-position="45">
<caret line="35" column="12" selection-start-line="35" selection-start-column="12" selection-end-line="35" selection-end-column="12" /> <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java"> <entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/FilesHandlers.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285"> <state relative-caret-position="139">
<caret line="62" column="13" selection-start-line="62" selection-start-column="13" selection-end-line="62" selection-end-column="13" /> <caret line="51" column="53" selection-start-line="51" selection-start-column="53" selection-end-line="51" selection-end-column="53" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/database/DatabaseManager.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="301">
<caret line="486" column="0" selection-start-line="486" selection-start-column="0" selection-end-line="486" selection-end-column="0" />
<folding>
<element signature="method#DatabaseManager#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#getInstance#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#recreateTable#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#updateToVersion2#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#updateToVersion3#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#updateToVersion4#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#updateToVersion5#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#updateToVersion6#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#updateToVersion7#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#createNewTables#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#addFile#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#getFilesByUser#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#addUserForFile#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#deleteUserForFile#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#getUserStatusForFile#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#doesFileExists#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#deleteFile#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#addRecentWeather#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#getRecentWeather#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#cleanUpRecent#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#addUserForDirection#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#getUserDestinationStatus#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#getUserDestinationMessageId#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#getUserOrigin#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#deleteUserForDirections#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#putLastUpdate#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#getLastUpdate#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#getUserLanguage#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#putUserLanguage#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#getWeatherState#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#insertWeatherState#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#getRecentWeatherIdByCity#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#getUserWeatherOptions#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#addNewUserWeatherOptions#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#putUserWeatherLanguageOption#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#putUserWeatherUnitsOption#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#createNewWeatherAlert#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#getAlertCitiesNameByUser#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#deleteAlertCity#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#deleteAlertsForUser#0;class#DatabaseManager#0" expanded="false" />
<element signature="method#getAllAlerts#0;class#DatabaseManager#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
<caret line="69" column="23" selection-start-line="69" selection-start-column="23" selection-end-line="69" selection-end-column="23" />
<folding>
<element signature="e#2983#2984#0" expanded="true" />
<element signature="e#3027#3028#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component> </component>
<component name="masterDetails"> <component name="masterDetails">
<states> <states>

12
src/main/java/org/telegram/database/DatabaseManager.java
View File

@ -566,6 +566,18 @@ public class DatabaseManager {
return updatedRows > 0; return updatedRows > 0;
} }
public boolean deleteAlertsForUser(Integer userId) {
int updatedRows = 0;
try {
final PreparedStatement preparedStatement = connetion.getPreparedStatement("DELETE FROM WeatherAlert WHERE userId=?");
preparedStatement.setInt(1, userId);
updatedRows = preparedStatement.executeUpdate();
} catch (SQLException e) {
e.printStackTrace();
}
return updatedRows > 0;
}
public List<WeatherAlert> getAllAlerts() { public List<WeatherAlert> getAllAlerts() {
List<WeatherAlert> allAlerts = new ArrayList<>(); List<WeatherAlert> allAlerts = new ArrayList<>();

119
src/main/java/org/telegram/updateshandlers/FilesHandlers.java
View File

@ -45,7 +45,17 @@ public class FilesHandlers extends TelegramLongPollingBot {
@Override @Override
public void onUpdateReceived(Update update) { public void onUpdateReceived(Update update) {
try { try {
handleFileUpdate(update); if (update.hasMessage()) {
try {
handleFileUpdate(update);
} catch (TelegramApiException e) {
if (e.getApiResponse().contains("Bot was blocked by the user")) {
if (update.getMessage().getFrom() != null) {
DatabaseManager.getInstance().deleteUserForFile(update.getMessage().getFrom().getId());
}
}
}
}
} catch (Exception e) { } catch (Exception e) {
BotLogger.error(LOGTAG, e); BotLogger.error(LOGTAG, e);
} }
@ -56,7 +66,7 @@ public class FilesHandlers extends TelegramLongPollingBot {
return BotConfig.USERNAMEFILES; return BotConfig.USERNAMEFILES;
} }
private void handleFileUpdate(Update update) throws InvalidObjectException { private void handleFileUpdate(Update update) throws InvalidObjectException, TelegramApiException {
Message message = update.getMessage(); Message message = update.getMessage();
if (message != null && message.hasText()) { if (message != null && message.hasText()) {
if (languageMessages.contains(message.getFrom().getId())) { if (languageMessages.contains(message.getFrom().getId())) {
@ -96,15 +106,11 @@ public class FilesHandlers extends TelegramLongPollingBot {
sendMessageRequest.setText(LocalisationService.getInstance().getString("fileUploaded", language) + sendMessageRequest.setText(LocalisationService.getInstance().getString("fileUploaded", language) +
LocalisationService.getInstance().getString("uploadedFileURL", language) + message.getDocument().getFileId()); LocalisationService.getInstance().getString("uploadedFileURL", language) + message.getDocument().getFileId());
sendMessageRequest.setChatId(message.getChatId().toString()); sendMessageRequest.setChatId(message.getChatId().toString());
try { sendMessage(sendMessageRequest);
sendMessage(sendMessageRequest);
} catch (TelegramApiException e) {
BotLogger.error(LOGTAG, e);
}
} }
} }
private void onListCommand(Message message, String language) throws InvalidObjectException { private void onListCommand(Message message, String language) throws InvalidObjectException, TelegramApiException {
HashMap<String, String> files = DatabaseManager.getInstance().getFilesByUser(message.getFrom().getId()); HashMap<String, String> files = DatabaseManager.getInstance().getFilesByUser(message.getFrom().getId());
SendMessage sendMessageRequest = new SendMessage(); SendMessage sendMessageRequest = new SendMessage();
if (files.size() > 0) { if (files.size() > 0) {
@ -121,14 +127,10 @@ public class FilesHandlers extends TelegramLongPollingBot {
ReplyKeyboardHide replyKeyboardHide = new ReplyKeyboardHide(); ReplyKeyboardHide replyKeyboardHide = new ReplyKeyboardHide();
replyKeyboardHide.setHideKeyboard(true); replyKeyboardHide.setHideKeyboard(true);
sendMessageRequest.setReplayMarkup(replyKeyboardHide); sendMessageRequest.setReplayMarkup(replyKeyboardHide);
try { sendMessage(sendMessageRequest);
sendMessage(sendMessageRequest);
} catch (TelegramApiException e) {
BotLogger.error(LOGTAG, e);
}
} }
private void onDeleteCommand(Message message, String language, String[] parts) throws InvalidObjectException { private void onDeleteCommand(Message message, String language, String[] parts) throws InvalidObjectException, TelegramApiException {
if (DatabaseManager.getInstance().getUserStatusForFile(message.getFrom().getId()) == DELETE_UPLOADED_STATUS && if (DatabaseManager.getInstance().getUserStatusForFile(message.getFrom().getId()) == DELETE_UPLOADED_STATUS &&
parts.length == 2) { parts.length == 2) {
onDeleteCommandWithParameters(message, language, parts[1]); onDeleteCommandWithParameters(message, language, parts[1]);
@ -137,7 +139,7 @@ public class FilesHandlers extends TelegramLongPollingBot {
} }
} }
private void onDeleteCommandWithoutParameters(Message message, String language) throws InvalidObjectException { private void onDeleteCommandWithoutParameters(Message message, String language) throws InvalidObjectException, TelegramApiException {
DatabaseManager.getInstance().addUserForFile(message.getFrom().getId(), DELETE_UPLOADED_STATUS); DatabaseManager.getInstance().addUserForFile(message.getFrom().getId(), DELETE_UPLOADED_STATUS);
SendMessage sendMessageRequest = new SendMessage(); SendMessage sendMessageRequest = new SendMessage();
sendMessageRequest.setText(LocalisationService.getInstance().getString("deleteUploadedFile", language)); sendMessageRequest.setText(LocalisationService.getInstance().getString("deleteUploadedFile", language));
@ -157,14 +159,10 @@ public class FilesHandlers extends TelegramLongPollingBot {
replyKeyboardMarkup.setKeyboard(commands); replyKeyboardMarkup.setKeyboard(commands);
} }
sendMessageRequest.setReplayMarkup(replyKeyboardMarkup); sendMessageRequest.setReplayMarkup(replyKeyboardMarkup);
try { sendMessage(sendMessageRequest);
sendMessage(sendMessageRequest);
} catch (TelegramApiException e) {
BotLogger.error(LOGTAG, e);
}
} }
private void onDeleteCommandWithParameters(Message message, String language, String part) throws InvalidObjectException { private void onDeleteCommandWithParameters(Message message, String language, String part) throws InvalidObjectException, TelegramApiException {
String[] innerParts = part.split(Emoji.LEFT_RIGHT_ARROW.toString(), 2); String[] innerParts = part.split(Emoji.LEFT_RIGHT_ARROW.toString(), 2);
boolean removed = DatabaseManager.getInstance().deleteFile(innerParts[0].trim()); boolean removed = DatabaseManager.getInstance().deleteFile(innerParts[0].trim());
SendMessage sendMessageRequest = new SendMessage(); SendMessage sendMessageRequest = new SendMessage();
@ -174,40 +172,29 @@ public class FilesHandlers extends TelegramLongPollingBot {
sendMessageRequest.setText(LocalisationService.getInstance().getString("wrongFileId", language)); sendMessageRequest.setText(LocalisationService.getInstance().getString("wrongFileId", language));
} }
sendMessageRequest.setChatId(message.getChatId().toString()); sendMessageRequest.setChatId(message.getChatId().toString());
try {
sendMessage(sendMessageRequest); sendMessage(sendMessageRequest);
DatabaseManager.getInstance().deleteUserForFile(message.getFrom().getId()); DatabaseManager.getInstance().deleteUserForFile(message.getFrom().getId());
} catch (TelegramApiException e) {
BotLogger.error(LOGTAG, e);
}
} }
private void onCancelCommand(Message message, String language) throws InvalidObjectException { private void onCancelCommand(Message message, String language) throws InvalidObjectException, TelegramApiException {
DatabaseManager.getInstance().deleteUserForFile(message.getFrom().getId()); DatabaseManager.getInstance().deleteUserForFile(message.getFrom().getId());
SendMessage sendMessageRequest = new SendMessage(); SendMessage sendMessageRequest = new SendMessage();
sendMessageRequest.setText(LocalisationService.getInstance().getString("processFinished", language)); sendMessageRequest.setText(LocalisationService.getInstance().getString("processFinished", language));
sendMessageRequest.setChatId(message.getChatId().toString()); sendMessageRequest.setChatId(message.getChatId().toString());
try { sendMessage(sendMessageRequest);
sendMessage(sendMessageRequest);
} catch (TelegramApiException e) {
BotLogger.error(LOGTAG, e);
}
} }
private void onUploadCommand(Message message, String language) throws InvalidObjectException { private void onUploadCommand(Message message, String language) throws InvalidObjectException, TelegramApiException {
DatabaseManager.getInstance().addUserForFile(message.getFrom().getId(), INITIAL_UPLOAD_STATUS); DatabaseManager.getInstance().addUserForFile(message.getFrom().getId(), INITIAL_UPLOAD_STATUS);
SendMessage sendMessageRequest = new SendMessage(); SendMessage sendMessageRequest = new SendMessage();
sendMessageRequest.setText(LocalisationService.getInstance().getString("sendFileToUpload", language)); sendMessageRequest.setText(LocalisationService.getInstance().getString("sendFileToUpload", language));
sendMessageRequest.setChatId(message.getChatId().toString()); sendMessageRequest.setChatId(message.getChatId().toString());
try { sendMessage(sendMessageRequest);
sendMessage(sendMessageRequest);
} catch (TelegramApiException e) {
BotLogger.error(LOGTAG, e);
}
} }
private void sendHelpMessage(Message message, String language) throws InvalidObjectException { private void sendHelpMessage(Message message, String language) throws InvalidObjectException, TelegramApiException {
SendMessage sendMessageRequest = new SendMessage(); SendMessage sendMessageRequest = new SendMessage();
String formatedString = String.format( String formatedString = String.format(
LocalisationService.getInstance().getString("helpFiles", language), LocalisationService.getInstance().getString("helpFiles", language),
@ -215,32 +202,24 @@ public class FilesHandlers extends TelegramLongPollingBot {
Commands.listCommand); Commands.listCommand);
sendMessageRequest.setText(formatedString); sendMessageRequest.setText(formatedString);
sendMessageRequest.setChatId(message.getChatId().toString()); sendMessageRequest.setChatId(message.getChatId().toString());
try { sendMessage(sendMessageRequest);
sendMessage(sendMessageRequest);
} catch (TelegramApiException e) {
BotLogger.error(LOGTAG, e);
}
} }
private void onStartWithParameters(Message message, String language, String part) throws InvalidObjectException { private void onStartWithParameters(Message message, String language, String part) throws InvalidObjectException, TelegramApiException {
try { if (DatabaseManager.getInstance().doesFileExists(part.trim())) {
if (DatabaseManager.getInstance().doesFileExists(part.trim())) { SendDocument sendDocumentRequest = new SendDocument();
SendDocument sendDocumentRequest = new SendDocument(); sendDocumentRequest.setDocument(part.trim());
sendDocumentRequest.setDocument(part.trim()); sendDocumentRequest.setChatId(message.getChatId().toString());
sendDocumentRequest.setChatId(message.getChatId().toString()); sendDocument(sendDocumentRequest);
sendDocument(sendDocumentRequest); } else {
} else { SendMessage sendMessageRequest = new SendMessage();
SendMessage sendMessageRequest = new SendMessage(); sendMessageRequest.setText(LocalisationService.getInstance().getString("wrongFileId", language));
sendMessageRequest.setText(LocalisationService.getInstance().getString("wrongFileId", language)); sendMessageRequest.setChatId(message.getChatId().toString());
sendMessageRequest.setChatId(message.getChatId().toString()); sendMessage(sendMessageRequest);
sendMessage(sendMessageRequest);
}
} catch (TelegramApiException e) {
BotLogger.error(LOGTAG, e);
} }
} }
private void onSetLanguageCommand(Message message, String language) throws InvalidObjectException { private void onSetLanguageCommand(Message message, String language) throws InvalidObjectException, TelegramApiException {
SendMessage sendMessageRequest = new SendMessage(); SendMessage sendMessageRequest = new SendMessage();
sendMessageRequest.setChatId(message.getChatId().toString()); sendMessageRequest.setChatId(message.getChatId().toString());
ReplyKeyboardMarkup replyKeyboardMarkup = new ReplyKeyboardMarkup(); ReplyKeyboardMarkup replyKeyboardMarkup = new ReplyKeyboardMarkup();
@ -257,15 +236,11 @@ public class FilesHandlers extends TelegramLongPollingBot {
replyKeyboardMarkup.setSelective(true); replyKeyboardMarkup.setSelective(true);
sendMessageRequest.setReplayMarkup(replyKeyboardMarkup); sendMessageRequest.setReplayMarkup(replyKeyboardMarkup);
sendMessageRequest.setText(LocalisationService.getInstance().getString("chooselanguage", language)); sendMessageRequest.setText(LocalisationService.getInstance().getString("chooselanguage", language));
try { sendMessage(sendMessageRequest);
sendMessage(sendMessageRequest); languageMessages.add(message.getFrom().getId());
languageMessages.add(message.getFrom().getId());
} catch (TelegramApiException e) {
BotLogger.error(LOGTAG, e);
}
} }
private void onLanguageReceived(Message message) throws InvalidObjectException { private void onLanguageReceived(Message message) throws InvalidObjectException, TelegramApiException {
String[] parts = message.getText().split(Emoji.LEFT_RIGHT_ARROW.toString(), 2); String[] parts = message.getText().split(Emoji.LEFT_RIGHT_ARROW.toString(), 2);
SendMessage sendMessageRequest = new SendMessage(); SendMessage sendMessageRequest = new SendMessage();
sendMessageRequest.setChatId(message.getChatId().toString()); sendMessageRequest.setChatId(message.getChatId().toString());
@ -280,11 +255,7 @@ public class FilesHandlers extends TelegramLongPollingBot {
replyKeyboardHide.setHideKeyboard(true); replyKeyboardHide.setHideKeyboard(true);
replyKeyboardHide.setSelective(true); replyKeyboardHide.setSelective(true);
sendMessageRequest.setReplayMarkup(replyKeyboardHide); sendMessageRequest.setReplayMarkup(replyKeyboardHide);
try { sendMessage(sendMessageRequest);
sendMessage(sendMessageRequest); languageMessages.remove(message.getFrom().getId());
languageMessages.remove(message.getFrom().getId());
} catch (TelegramApiException e) {
BotLogger.error(LOGTAG, e);
}
} }
} }

24
src/main/java/org/telegram/updateshandlers/WeatherHandlers.java
View File

@ -113,7 +113,12 @@ public class WeatherHandlers extends TelegramLongPollingBot {
try { try {
sendMessage(sendMessage); sendMessage(sendMessage);
} catch (TelegramApiException e) { } catch (TelegramApiException e) {
BotLogger.error(LOGTAG, e); BotLogger.warn(LOGTAG, e);
if (e.getApiResponse().contains("Can't access the chat") || e.getApiResponse().contains("Bot was blocked by the user")) {
DatabaseManager.getInstance().deleteAlertsForUser(weatherAlert.getUserId());
}
} catch (Exception e) {
BotLogger.severe(LOGTAG, e);
} }
} }
} }
@ -133,7 +138,7 @@ public class WeatherHandlers extends TelegramLongPollingBot {
// region Incoming messages handlers // region Incoming messages handlers
private void handleIncomingMessage(Message message) { private void handleIncomingMessage(Message message) throws TelegramApiException {
final int state = DatabaseManager.getInstance().getWeatherState(message.getFrom().getId(), message.getChatId()); final int state = DatabaseManager.getInstance().getWeatherState(message.getFrom().getId(), message.getChatId());
final String language = DatabaseManager.getInstance().getUserWeatherOptions(message.getFrom().getId())[0]; final String language = DatabaseManager.getInstance().getUserWeatherOptions(message.getFrom().getId())[0];
if (!message.isUserMessage() && message.hasText()) { if (!message.isUserMessage() && message.hasText()) {
@ -178,14 +183,10 @@ public class WeatherHandlers extends TelegramLongPollingBot {
break; break;
} }
try {
sendMessage(sendMessageRequest); sendMessage(sendMessageRequest);
} catch (TelegramApiException e) {
BotLogger.error(LOGTAG, e);
}
} }
private void sendHideKeyboard(Integer userId, Long chatId, Integer messageId) { private void sendHideKeyboard(Integer userId, Long chatId, Integer messageId) throws TelegramApiException {
SendMessage sendMessage = new SendMessage(); SendMessage sendMessage = new SendMessage();
sendMessage.setChatId(chatId.toString()); sendMessage.setChatId(chatId.toString());
sendMessage.enableMarkdown(true); sendMessage.enableMarkdown(true);
@ -197,13 +198,8 @@ public class WeatherHandlers extends TelegramLongPollingBot {
replyKeyboardHide.setHideKeyboard(true); replyKeyboardHide.setHideKeyboard(true);
sendMessage.setReplayMarkup(replyKeyboardHide); sendMessage.setReplayMarkup(replyKeyboardHide);
try { sendMessage(sendMessage);
sendMessage(sendMessage); DatabaseManager.getInstance().insertWeatherState(userId, chatId, STARTSTATE);
DatabaseManager.getInstance().insertWeatherState(userId, chatId, STARTSTATE);
} catch (TelegramApiException e) {
BotLogger.error(LOGTAG, e);
}
} }
private static boolean isCommandForOther(String text) { private static boolean isCommandForOther(String text) {

Write Preview
Loading…
Cancel
Save