diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 23b437c..0000000 Binary files a/.DS_Store and /dev/null differ diff --git a/.gitignore b/.gitignore index 42f24ce..a24c3c7 100644 --- a/.gitignore +++ b/.gitignore @@ -22,9 +22,13 @@ buildNumber.properties # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* -# unneeded files -.idea/dataSources.* -.idea/workspace.xml +### IDE files +.idea/ +copyright/ +*.iml + +#File System specific files +.DS_STORE # logs files *.log diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index a26198f..0000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -BotAPi \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 8035028..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf3..0000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml deleted file mode 100644 index f8ce7d9..0000000 --- a/.idea/dataSources.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - mysql - true - com.mysql.jdbc.Driver - jdbc:mysql://localhost:3306/telegrambot - - - - - - - - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index 49c237d..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index 38c7409..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml deleted file mode 100644 index 3b31283..0000000 --- a/.idea/inspectionProfiles/profiles_settings.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/jsLinters/jshint.xml b/.idea/jsLinters/jshint.xml deleted file mode 100644 index 11b997b..0000000 --- a/.idea/jsLinters/jshint.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_5_4.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_5_4.xml deleted file mode 100644 index 086f4e9..0000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_annotations_2_5_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_5_4.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_5_4.xml deleted file mode 100644 index 40f4bc8..0000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_core_2_5_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_5_4.xml b/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_5_4.xml deleted file mode 100644 index 8adb4b6..0000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_core_jackson_databind_2_5_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_5_4.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_5_4.xml deleted file mode 100644 index a64dd1e..0000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_base_2_5_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_5_4.xml b/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_5_4.xml deleted file mode 100644 index 996db03..0000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_jaxrs_jackson_jaxrs_json_provider_2_5_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_5_4.xml b/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_5_4.xml deleted file mode 100644 index 9f5e5cd..0000000 --- a/.idea/libraries/Maven__com_fasterxml_jackson_module_jackson_module_jaxb_annotations_2_5_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_github_rubenlagus_TelegramBots_v2_3_3_2.xml b/.idea/libraries/Maven__com_github_rubenlagus_TelegramBots_v2_3_3_2.xml deleted file mode 100644 index 4154829..0000000 --- a/.idea/libraries/Maven__com_github_rubenlagus_TelegramBots_v2_3_3_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_sun_jersey_jersey_bundle_1_19_1.xml b/.idea/libraries/Maven__com_sun_jersey_jersey_bundle_1_19_1.xml deleted file mode 100644 index 4d626a6..0000000 --- a/.idea/libraries/Maven__com_sun_jersey_jersey_bundle_1_19_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_sun_jersey_jersey_core_1_19_1.xml b/.idea/libraries/Maven__com_sun_jersey_jersey_core_1_19_1.xml deleted file mode 100644 index 91d65b2..0000000 --- a/.idea/libraries/Maven__com_sun_jersey_jersey_core_1_19_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_sun_jersey_jersey_grizzly2_1_19_1.xml b/.idea/libraries/Maven__com_sun_jersey_jersey_grizzly2_1_19_1.xml deleted file mode 100644 index ec38da5..0000000 --- a/.idea/libraries/Maven__com_sun_jersey_jersey_grizzly2_1_19_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_sun_jersey_jersey_grizzly2_servlet_1_19_1.xml b/.idea/libraries/Maven__com_sun_jersey_jersey_grizzly2_servlet_1_19_1.xml deleted file mode 100644 index e61c7cb..0000000 --- a/.idea/libraries/Maven__com_sun_jersey_jersey_grizzly2_servlet_1_19_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_sun_jersey_jersey_server_1_19_1.xml b/.idea/libraries/Maven__com_sun_jersey_jersey_server_1_19_1.xml deleted file mode 100644 index b4ad3de..0000000 --- a/.idea/libraries/Maven__com_sun_jersey_jersey_server_1_19_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_sun_jersey_jersey_servlet_1_19_1.xml b/.idea/libraries/Maven__com_sun_jersey_jersey_servlet_1_19_1.xml deleted file mode 100644 index 943df5a..0000000 --- a/.idea/libraries/Maven__com_sun_jersey_jersey_servlet_1_19_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml b/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml deleted file mode 100644 index a66d039..0000000 --- a/.idea/libraries/Maven__commons_codec_commons_codec_1_9.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_io_commons_io_2_5.xml b/.idea/libraries/Maven__commons_io_commons_io_2_5.xml deleted file mode 100644 index 67c2ad2..0000000 --- a/.idea/libraries/Maven__commons_io_commons_io_2_5.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml b/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml deleted file mode 100644 index eab40b3..0000000 --- a/.idea/libraries/Maven__commons_logging_commons_logging_1_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_2.xml b/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_2.xml deleted file mode 100644 index e35b936..0000000 --- a/.idea/libraries/Maven__javax_annotation_javax_annotation_api_1_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml deleted file mode 100644 index 63d10f6..0000000 --- a/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_0_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml deleted file mode 100644 index 940ce73..0000000 --- a/.idea/libraries/Maven__javax_validation_validation_api_1_1_0_Final.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml b/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml deleted file mode 100644 index c890167..0000000 --- a/.idea/libraries/Maven__javax_ws_rs_javax_ws_rs_api_2_0_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__javax_ws_rs_jsr311_api_1_1_1.xml b/.idea/libraries/Maven__javax_ws_rs_jsr311_api_1_1_1.xml deleted file mode 100644 index a0c4d76..0000000 --- a/.idea/libraries/Maven__javax_ws_rs_jsr311_api_1_1_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_39.xml b/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_39.xml deleted file mode 100644 index 18e6ec9..0000000 --- a/.idea/libraries/Maven__mysql_mysql_connector_java_5_1_39.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_2.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_2.xml deleted file mode 100644 index fdb7ead..0000000 --- a/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_5_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_4.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_4.xml deleted file mode 100644 index 3a5aa19..0000000 --- a/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_4_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_httpcomponents_httpmime_4_5_2.xml b/.idea/libraries/Maven__org_apache_httpcomponents_httpmime_4_5_2.xml deleted file mode 100644 index 4b2025a..0000000 --- a/.idea/libraries/Maven__org_apache_httpcomponents_httpmime_4_5_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_glassfish_grizzly_grizzly_framework_2_3_23.xml b/.idea/libraries/Maven__org_glassfish_grizzly_grizzly_framework_2_3_23.xml deleted file mode 100644 index b53145f..0000000 --- a/.idea/libraries/Maven__org_glassfish_grizzly_grizzly_framework_2_3_23.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_glassfish_grizzly_grizzly_http_2_3_23.xml b/.idea/libraries/Maven__org_glassfish_grizzly_grizzly_http_2_3_23.xml deleted file mode 100644 index 6d211b7..0000000 --- a/.idea/libraries/Maven__org_glassfish_grizzly_grizzly_http_2_3_23.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_glassfish_grizzly_grizzly_http_server_2_3_23.xml b/.idea/libraries/Maven__org_glassfish_grizzly_grizzly_http_server_2_3_23.xml deleted file mode 100644 index 88bb512..0000000 --- a/.idea/libraries/Maven__org_glassfish_grizzly_grizzly_http_server_2_3_23.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_glassfish_grizzly_grizzly_http_servlet_2_2_16.xml b/.idea/libraries/Maven__org_glassfish_grizzly_grizzly_http_servlet_2_2_16.xml deleted file mode 100644 index 65fc7b2..0000000 --- a/.idea/libraries/Maven__org_glassfish_grizzly_grizzly_http_servlet_2_2_16.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_glassfish_hk2_external_aopalliance_repackaged_2_4_0_b34.xml b/.idea/libraries/Maven__org_glassfish_hk2_external_aopalliance_repackaged_2_4_0_b34.xml deleted file mode 100644 index 1908e81..0000000 --- a/.idea/libraries/Maven__org_glassfish_hk2_external_aopalliance_repackaged_2_4_0_b34.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_glassfish_hk2_external_javax_inject_2_4_0_b34.xml b/.idea/libraries/Maven__org_glassfish_hk2_external_javax_inject_2_4_0_b34.xml deleted file mode 100644 index 8ef6daa..0000000 --- a/.idea/libraries/Maven__org_glassfish_hk2_external_javax_inject_2_4_0_b34.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_glassfish_hk2_hk2_api_2_4_0_b34.xml b/.idea/libraries/Maven__org_glassfish_hk2_hk2_api_2_4_0_b34.xml deleted file mode 100644 index 97dd43f..0000000 --- a/.idea/libraries/Maven__org_glassfish_hk2_hk2_api_2_4_0_b34.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_glassfish_hk2_hk2_locator_2_4_0_b34.xml b/.idea/libraries/Maven__org_glassfish_hk2_hk2_locator_2_4_0_b34.xml deleted file mode 100644 index e15594e..0000000 --- a/.idea/libraries/Maven__org_glassfish_hk2_hk2_locator_2_4_0_b34.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_glassfish_hk2_hk2_utils_2_4_0_b34.xml b/.idea/libraries/Maven__org_glassfish_hk2_hk2_utils_2_4_0_b34.xml deleted file mode 100644 index 00ca710..0000000 --- a/.idea/libraries/Maven__org_glassfish_hk2_hk2_utils_2_4_0_b34.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_glassfish_hk2_osgi_resource_locator_1_0_1.xml b/.idea/libraries/Maven__org_glassfish_hk2_osgi_resource_locator_1_0_1.xml deleted file mode 100644 index 3d299fa..0000000 --- a/.idea/libraries/Maven__org_glassfish_hk2_osgi_resource_locator_1_0_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_glassfish_jersey_bundles_repackaged_jersey_guava_2_23.xml b/.idea/libraries/Maven__org_glassfish_jersey_bundles_repackaged_jersey_guava_2_23.xml deleted file mode 100644 index 0922457..0000000 --- a/.idea/libraries/Maven__org_glassfish_jersey_bundles_repackaged_jersey_guava_2_23.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_glassfish_jersey_containers_jersey_container_grizzly2_http_2_23.xml b/.idea/libraries/Maven__org_glassfish_jersey_containers_jersey_container_grizzly2_http_2_23.xml deleted file mode 100644 index 628f5f8..0000000 --- a/.idea/libraries/Maven__org_glassfish_jersey_containers_jersey_container_grizzly2_http_2_23.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_client_2_23.xml b/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_client_2_23.xml deleted file mode 100644 index 92d3902..0000000 --- a/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_client_2_23.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_common_2_23.xml b/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_common_2_23.xml deleted file mode 100644 index 2801393..0000000 --- a/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_common_2_23.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_server_2_23.xml b/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_server_2_23.xml deleted file mode 100644 index 0d9ef50..0000000 --- a/.idea/libraries/Maven__org_glassfish_jersey_core_jersey_server_2_23.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_glassfish_jersey_ext_jersey_entity_filtering_2_23.xml b/.idea/libraries/Maven__org_glassfish_jersey_ext_jersey_entity_filtering_2_23.xml deleted file mode 100644 index b5a8f8c..0000000 --- a/.idea/libraries/Maven__org_glassfish_jersey_ext_jersey_entity_filtering_2_23.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_jaxb_2_23.xml b/.idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_jaxb_2_23.xml deleted file mode 100644 index ca88973..0000000 --- a/.idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_jaxb_2_23.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_json_jackson_2_23.xml b/.idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_json_jackson_2_23.xml deleted file mode 100644 index cfdf082..0000000 --- a/.idea/libraries/Maven__org_glassfish_jersey_media_jersey_media_json_jackson_2_23.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_javassist_javassist_3_18_1_GA.xml b/.idea/libraries/Maven__org_javassist_javassist_3_18_1_GA.xml deleted file mode 100644 index 1f90730..0000000 --- a/.idea/libraries/Maven__org_javassist_javassist_3_18_1_GA.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_json_json_20160212.xml b/.idea/libraries/Maven__org_json_json_20160212.xml deleted file mode 100644 index 44a278c..0000000 --- a/.idea/libraries/Maven__org_json_json_20160212.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jsoup_jsoup_1_9_2.xml b/.idea/libraries/Maven__org_jsoup_jsoup_1_9_2.xml deleted file mode 100644 index f38a2fc..0000000 --- a/.idea/libraries/Maven__org_jsoup_jsoup_1_9_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 3bb9901..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - /usr/local/bin/bower - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index d845503..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/resourceBundles.xml b/.idea/resourceBundles.xml deleted file mode 100644 index 7267597..0000000 --- a/.idea/resourceBundles.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml deleted file mode 100644 index e96534f..0000000 --- a/.idea/uiDesigner.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index dce803c..0000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,2124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - DEFINITION_ORDER - - - - - - - - - - - - - - - - - - - Abstraction issuesJava - - - Assignment issuesJava - - - Class metricsJava - - - Class structureJava - - - Cloning issuesJava - - - Code style issuesJava - - - CodeSpring CoreSpring - - - Concurrency annotation issuesJava - - - Declaration redundancyJava - - - Encapsulation issuesJava - - - GeneralJavaScript - - - ImportsJava - - - Inheritance issuesJava - - - Initialization issuesJava - - - JBoss Seam issues - - - JUnit issuesJava - - - Java - - - Java EE issues - - - JavaScript - - - Logging issuesJava - - - Memory issuesJava - - - Naming conventionsJava - - - Numeric issuesJava - - - Performance issuesJava - - - Probable bugsJava - - - Security issuesJava - - - Serialization issuesJava - - - Spring - - - Spring CoreSpring - - - Threading issuesJava - - - UI Form Problems - - - Visibility issuesJava - - - - - FieldMayBeStatic - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - project - - - - - true - - - - - - - - - - - - /usr/local/bin/node - - $PROJECT_DIR$ - true - - bdd - - DIRECTORY - - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1434808152627 - - - 1434956620075 - - - 1434956750907 - - - 1434999490285 - - - 1435015027385 - - - 1435084167629 - - - 1435108063150 - - - 1435169633681 - - - 1435253672379 - - - 1435262669527 - - - 1435279428470 - - - 1435324633695 - - - 1435326238547 - - - 1435351149105 - - - 1435352969379 - - - 1435522852368 - - - 1435524383549 - - - 1435531042174 - - - 1435612308869 - - - 1435612610051 - - - 1435612816385 - - - 1436699817668 - - - 1437345691187 - - - 1437352180849 - - - 1437412684747 - - - 1438295674986 - - - 1438624259422 - - - 1438626388907 - - - 1438671471514 - - - 1438704494358 - - - 1438714336299 - - - 1439745791759 - - - 1439748123685 - - - 1439751029730 - - - 1439752857666 - - - 1440700286055 - - - 1441719275787 - - - 1444845084283 - - - 1444855140616 - - - 1447282141578 - - - 1447284479323 - - - 1447284695900 - - - 1447967835440 - - - 1453141929947 - - - 1460430348503 - - - 1460430570307 - - - 1460485200872 - - - 1461933537820 - - - 1461936025610 - - - 1461944793495 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - file://$PROJECT_DIR$/src/main/java/org/telegram/services/WeatherService.java - 173 - - - - jar://$MAVEN_REPOSITORY$/org/glassfish/grizzly/grizzly-framework/2.3.19/grizzly-framework-2.3.19-sources.jar!/org/glassfish/grizzly/ssl/SSLContextConfigurator.java - 359 - - - - file://$PROJECT_DIR$/src/main/java/org/telegram/services/TransifexService.java - 330 - - - - file://$PROJECT_DIR$/src/main/java/org/telegram/database/DatabaseManager.java - 130 - - - - jar://$MAVEN_REPOSITORY$/com/github/rubenlagus/TelegramBots/v1.0/TelegramBots-v1.0.jar!/org/telegram/telegrambots/bots/AbsSender.class - 343 - - - - file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java - 1178 - - - - file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java - 1171 - - - - file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/RaeHandlers.java - 46 - - - - file://$PROJECT_DIR$/src/main/java/org/telegram/updateshandlers/RaeHandlers.java - 48 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - No facets are configured - - - - - - - - ExtJS - - - - - - - - 1.8 - - - - - - - - BotAPi - - - - - - - - 1.8 - - - - - - - - Maven: org.json:json:20141113 - - - - - - - - \ No newline at end of file diff --git a/BotAPi.iml b/BotAPi.iml deleted file mode 100644 index 827dbc7..0000000 --- a/BotAPi.iml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index 1982eb8..cf4cc74 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ UTF-8 UTF-8 4.5.2 - v2.3.3.2 + v2.3.3.4 20160212 5.1.39 diff --git a/src/.DS_Store b/src/.DS_Store deleted file mode 100644 index 21ed6df..0000000 Binary files a/src/.DS_Store and /dev/null differ diff --git a/src/main/.DS_Store b/src/main/.DS_Store deleted file mode 100644 index 9d2a42b..0000000 Binary files a/src/main/.DS_Store and /dev/null differ diff --git a/src/main/java/.DS_Store b/src/main/java/.DS_Store deleted file mode 100644 index d6fa824..0000000 Binary files a/src/main/java/.DS_Store and /dev/null differ diff --git a/src/main/java/org/telegram/BotConfig.java b/src/main/java/org/telegram/BotConfig.java index 353e876..4ee72f7 100644 --- a/src/main/java/org/telegram/BotConfig.java +++ b/src/main/java/org/telegram/BotConfig.java @@ -7,18 +7,27 @@ package org.telegram; * @date 20 of June of 2015 */ public class BotConfig { - public static final String TOKENWEATHER = ""; - public static final String USERNAMEWEATHER = "weatherbot"; - public static final String TOKENTRANSIFEX = ""; - public static final String USERNAMETRANSIFEX = "TGlanguagesbot"; - public static final String TOKENFILES = ""; - public static final String USERNAMEFILES = "filesbot"; - public static final String TOKENDIRECTIONS = ""; - public static final String USERNAMEDIRECTIONS = "directionsbot"; - public static final String TOKENCHANNEL = ""; - public static final String USERNAMECHANNEL = "channelupdatesbot"; - public static final String TOKENRAE = ""; - public static final String USERNAMERAE = "raebot"; - public static final String TOKENWEBHOOK = ""; - public static final String USERNAMEWEBHOOK = "webhooksamplebot"; + public static final String WEATHER_TOKEN = ""; + public static final String WEATHER_USER = "weatherbot"; + + public static final String TRANSIFEX_TOKEN = ""; + public static final String TRANSIFEX_USER = "TGlanguagesbot"; + + public static final String FILES_TOKEN = ""; + public static final String FILES_USER = "filesbot"; + + public static final String DIRECTIONS_TOKEN = ""; + public static final String DIRECTIONS_USER = "directionsbot"; + + public static final String CHANNEL_TOKEN = ""; + public static final String CHANNEL_USER = "channelupdatesbot"; + + public static final String RAE_TOKEN = ""; + public static final String RAE_USER = "raebot"; + + public static final String WEBHOOK_TOKEN = ""; + public static final String WEBHOOK_USER = "webhooksamplebot"; + + public static final String COMMANDS_TOKEN = ""; + public static final String COMMANDS_USER = "MyCommandsBot"; } diff --git a/src/main/java/org/telegram/Main.java b/src/main/java/org/telegram/Main.java index cc1b17a..f0ce3db 100644 --- a/src/main/java/org/telegram/Main.java +++ b/src/main/java/org/telegram/Main.java @@ -4,13 +4,7 @@ import org.telegram.telegrambots.TelegramApiException; import org.telegram.telegrambots.TelegramBotsApi; import org.telegram.telegrambots.logging.BotLogger; import org.telegram.telegrambots.logging.BotsFileHandler; -import org.telegram.updateshandlers.ChannelHandlers; -import org.telegram.updateshandlers.DirectionsHandlers; -import org.telegram.updateshandlers.FilesHandlers; -import org.telegram.updateshandlers.RaeHandlers; -import org.telegram.updateshandlers.TransifexHandlers; -import org.telegram.updateshandlers.WeatherHandlers; -import org.telegram.updateshandlers.WebHookExampleHandlers; +import org.telegram.updateshandlers.*; import java.io.IOException; import java.util.logging.ConsoleHandler; @@ -44,6 +38,7 @@ public class Main { telegramBotsApi.registerBot(new WeatherHandlers()); telegramBotsApi.registerBot(new TransifexHandlers()); telegramBotsApi.registerBot(new FilesHandlers()); + telegramBotsApi.registerBot(new CommandsHandler()); } catch (TelegramApiException e) { BotLogger.error(LOGTAG, e); } diff --git a/src/main/java/org/telegram/commands/HelloCommand.java b/src/main/java/org/telegram/commands/HelloCommand.java new file mode 100644 index 0000000..765be27 --- /dev/null +++ b/src/main/java/org/telegram/commands/HelloCommand.java @@ -0,0 +1,55 @@ +package org.telegram.commands; + +import org.telegram.database.DatabaseManager; +import org.telegram.telegrambots.TelegramApiException; +import org.telegram.telegrambots.api.methods.send.SendMessage; +import org.telegram.telegrambots.api.objects.Chat; +import org.telegram.telegrambots.api.objects.User; +import org.telegram.telegrambots.bots.AbsSender; +import org.telegram.telegrambots.bots.commands.BotCommand; +import org.telegram.telegrambots.logging.BotLogger; + +/** + * This command simply replies with a hello to the users command and + * sends them the 'kind' words back, which they send via command parameters + * + * @author Timo Schulz (Mit0x2) + */ +public class HelloCommand extends BotCommand { + + private static final String LOGTAG = "HELLOCOMMAND"; + + public HelloCommand() { + super("hello", "Say hallo to this bot"); + } + + @Override + public void execute(AbsSender absSender, User user, Chat chat, String[] arguments) { + + if (!DatabaseManager.getInstance().getUserStateForCommandsBot(user.getId())) { + return; + } + + String userName = chat.getUserName(); + if (userName == null || userName.isEmpty()) { + userName = user.getFirstName() + " " + user.getLastName(); + } + + StringBuilder messageTextBuilder = new StringBuilder("Hello ").append(userName); + if (arguments != null && arguments.length > 0) { + messageTextBuilder.append("\n"); + messageTextBuilder.append("Thank you so much for your kind words:\n"); + messageTextBuilder.append(String.join(" ", arguments)); + } + + SendMessage answer = new SendMessage(); + answer.setChatId(chat.getId().toString()); + answer.setText(messageTextBuilder.toString()); + + try { + absSender.sendMessage(answer); + } catch (TelegramApiException e) { + BotLogger.error(LOGTAG, e); + } + } +} \ No newline at end of file diff --git a/src/main/java/org/telegram/commands/HelpCommand.java b/src/main/java/org/telegram/commands/HelpCommand.java new file mode 100644 index 0000000..13a14dc --- /dev/null +++ b/src/main/java/org/telegram/commands/HelpCommand.java @@ -0,0 +1,54 @@ +package org.telegram.commands; + +import org.telegram.database.DatabaseManager; +import org.telegram.telegrambots.TelegramApiException; +import org.telegram.telegrambots.api.methods.send.SendMessage; +import org.telegram.telegrambots.api.objects.Chat; +import org.telegram.telegrambots.api.objects.User; +import org.telegram.telegrambots.bots.AbsSender; +import org.telegram.telegrambots.bots.commands.BotCommand; +import org.telegram.telegrambots.bots.commands.ICommandRegistry; +import org.telegram.telegrambots.logging.BotLogger; + +/** + * This command helps the user to find the command they need + * + * @author Timo Schulz (Mit0x2) + */ +public class HelpCommand extends BotCommand { + + private static final String LOGTAG = "HELPCOMMAND"; + + private final ICommandRegistry commandRegistry; + + public HelpCommand(ICommandRegistry commandRegistry) { + super("help", "Get all the commands this bot provides"); + this.commandRegistry = commandRegistry; + } + + @Override + public void execute(AbsSender absSender, User user, Chat chat, String[] strings) { + + if (!DatabaseManager.getInstance().getUserStateForCommandsBot(user.getId())) { + return; + } + + StringBuilder helpMessageBuilder = new StringBuilder("Help\n"); + helpMessageBuilder.append("These are the registered commands for this Bot:\n\n"); + + for (BotCommand botCommand : commandRegistry.getRegisteredCommands()) { + helpMessageBuilder.append(botCommand.toString()).append("\n\n"); + } + + SendMessage helpMessage = new SendMessage(); + helpMessage.setChatId(chat.getId().toString()); + helpMessage.enableHtml(true); + helpMessage.setText(helpMessageBuilder.toString()); + + try { + absSender.sendMessage(helpMessage); + } catch (TelegramApiException e) { + BotLogger.error(LOGTAG, e); + } + } +} diff --git a/src/main/java/org/telegram/commands/StartCommand.java b/src/main/java/org/telegram/commands/StartCommand.java new file mode 100644 index 0000000..2e4b477 --- /dev/null +++ b/src/main/java/org/telegram/commands/StartCommand.java @@ -0,0 +1,51 @@ +package org.telegram.commands; + +import org.telegram.database.DatabaseManager; +import org.telegram.telegrambots.TelegramApiException; +import org.telegram.telegrambots.api.methods.send.SendMessage; +import org.telegram.telegrambots.api.objects.Chat; +import org.telegram.telegrambots.api.objects.User; +import org.telegram.telegrambots.bots.AbsSender; +import org.telegram.telegrambots.bots.commands.BotCommand; +import org.telegram.telegrambots.logging.BotLogger; + +/** + * This commands starts the conversation with the bot + * + * @author Timo Schulz (Mit0x2) + */ +public class StartCommand extends BotCommand { + + public static final String LOGTAG = "STARTCOMMAND"; + + public StartCommand() { + super("start", "With this command you can start the Bot"); + } + + @Override + public void execute(AbsSender absSender, User user, Chat chat, String[] strings) { + DatabaseManager databseManager = DatabaseManager.getInstance(); + StringBuilder messageBuilder = new StringBuilder(); + + String userName = user.getFirstName() + " " + user.getLastName(); + + if (databseManager.getUserStateForCommandsBot(user.getId())) { + messageBuilder.append("Hi ").append(userName).append("\n"); + messageBuilder.append("i think we know each other already!"); + } else { + databseManager.setUserStateForCommandsBot(user.getId(), true); + messageBuilder.append("Welcome ").append(userName).append("\n"); + messageBuilder.append("this bot will demonstrate you the command feature of the Java TelegramBots API!"); + } + + SendMessage answer = new SendMessage(); + answer.setChatId(chat.getId().toString()); + answer.setText(messageBuilder.toString()); + + try { + absSender.sendMessage(answer); + } catch (TelegramApiException e) { + BotLogger.error(LOGTAG, e); + } + } +} \ No newline at end of file diff --git a/src/main/java/org/telegram/commands/StopCommand.java b/src/main/java/org/telegram/commands/StopCommand.java new file mode 100644 index 0000000..fcb94bc --- /dev/null +++ b/src/main/java/org/telegram/commands/StopCommand.java @@ -0,0 +1,48 @@ +package org.telegram.commands; + +import org.telegram.database.DatabaseManager; +import org.telegram.telegrambots.TelegramApiException; +import org.telegram.telegrambots.api.methods.send.SendMessage; +import org.telegram.telegrambots.api.objects.Chat; +import org.telegram.telegrambots.api.objects.User; +import org.telegram.telegrambots.bots.AbsSender; +import org.telegram.telegrambots.bots.commands.BotCommand; +import org.telegram.telegrambots.logging.BotLogger; + +/** + * This commands stops the conversation with the bot. + * Bot won't respond to user until he sends a start command + * + * @author Timo Schulz (Mit0x2) + */ +public class StopCommand extends BotCommand { + + public static final String LOGTAG = "STOPCOMMAND"; + + /** + * Construct + */ + public StopCommand() { + super("stop", "With this command you can stop the Bot"); + } + + @Override + public void execute(AbsSender absSender, User user, Chat chat, String[] arguments) { + DatabaseManager dbManager = DatabaseManager.getInstance(); + + if (dbManager.getUserStateForCommandsBot(user.getId())) { + dbManager.setUserStateForCommandsBot(user.getId(), false); + String userName = user.getFirstName() + " " + user.getLastName(); + + SendMessage answer = new SendMessage(); + answer.setChatId(chat.getId().toString()); + answer.setText("Good bye " + userName + "\n" + "Hope to see you soon!"); + + try { + absSender.sendMessage(answer); + } catch (TelegramApiException e) { + BotLogger.error(LOGTAG, e); + } + } + } +} diff --git a/src/main/java/org/telegram/database/CreationStrings.java b/src/main/java/org/telegram/database/CreationStrings.java index 8b56782..96e6c0b 100644 --- a/src/main/java/org/telegram/database/CreationStrings.java +++ b/src/main/java/org/telegram/database/CreationStrings.java @@ -7,7 +7,7 @@ package org.telegram.database; * @date 15 of May of 2015 */ public class CreationStrings { - public static final int version = 7; + public static final int version = 8; public static final String createVersionTable = "CREATE TABLE IF NOT EXISTS Versions(ID INTEGER PRIMARY KEY AUTO_INCREMENT, Version INTEGER);"; public static final String insertCurrentVersion = "INSERT IGNORE INTO Versions (Version) VALUES(%d);"; public static final String createFilesTable = "CREATE TABLE IF NOT EXISTS Files (fileId VARCHAR(100) PRIMARY KEY, userId INTEGER NOT NULL, caption TEXT NOT NULL)"; @@ -27,4 +27,6 @@ public class CreationStrings { public static final String createWeatherAlertTable = "CREATE TABLE IF NOT EXISTS WeatherAlert (id INTEGER PRIMARY KEY AUTO_INCREMENT, userId INTEGER NOT NULL, cityId INTEGER NOT NULL, " + "cityName VARCHAR(60) NOT NULL, time INTEGER NOT NULL DEFAULT -1, CONSTRAINT unique_cityNameAlert UNIQUE (userId, cityName)," + "CONSTRAINT unique_cityIdAlert UNIQUE (userId, cityId));"; + + public static final String CREATE_COMMANDS_TABLE = "CREATE TABLE IF NOT EXISTS CommandUsers (userId INTEGER PRIMARY KEY, status INTEGER NOT NULL);"; } diff --git a/src/main/java/org/telegram/database/DatabaseManager.java b/src/main/java/org/telegram/database/DatabaseManager.java index 7921338..873a15f 100644 --- a/src/main/java/org/telegram/database/DatabaseManager.java +++ b/src/main/java/org/telegram/database/DatabaseManager.java @@ -89,6 +89,9 @@ public class DatabaseManager { if (currentVersion == 6) { currentVersion = updateToVersion7(); } + if (currentVersion == 7) { + currentVersion = updateToVersion8(); + } connetion.commitTransaction(); } catch (SQLException e) { BotLogger.error(LOGTAG, e); @@ -133,6 +136,12 @@ public class DatabaseManager { return 7; } + private int updateToVersion8() throws SQLException { + connetion.executeQuery(CreationStrings.CREATE_COMMANDS_TABLE); + connetion.executeQuery(String.format(CreationStrings.insertCurrentVersion, 8)); + return 8; + } + private int createNewTables() throws SQLException { connetion.executeQuery(CreationStrings.createVersionTable); connetion.executeQuery(CreationStrings.createFilesTable); @@ -144,9 +153,40 @@ public class DatabaseManager { connetion.executeQuery(CreationStrings.createWeatherStateTable); connetion.executeQuery(CreationStrings.createUserWeatherOptionDatabase); connetion.executeQuery(CreationStrings.createWeatherAlertTable); + connetion.executeQuery(CreationStrings.CREATE_COMMANDS_TABLE); return CreationStrings.version; } + public boolean setUserStateForCommandsBot(Integer userId, boolean active) { + int updatedRows = 0; + try { + final PreparedStatement preparedStatement = connetion.getPreparedStatement("INSERT INTO CommandUsers (userId, status) VALUES(?, ?) ON DUPLICATE KEY UPDATE status=?"); + preparedStatement.setInt(1, userId); + preparedStatement.setInt(2, active ? 1 : 0); + preparedStatement.setInt(3, active ? 1 : 0); + + updatedRows = preparedStatement.executeUpdate(); + } catch (SQLException e) { + e.printStackTrace(); + } + return updatedRows > 0; + } + + public boolean getUserStateForCommandsBot(Integer userId) { + int status = -1; + try { + final PreparedStatement preparedStatement = connetion.getPreparedStatement("Select status FROM CommandUsers WHERE userId=?"); + preparedStatement.setInt(1, userId); + final ResultSet result = preparedStatement.executeQuery(); + if (result.next()) { + status = result.getInt("status"); + } + } catch (SQLException e) { + e.printStackTrace(); + } + return status == 1; + } + public boolean addFile(String fileId, Integer userId, String caption) { int updatedRows = 0; try { diff --git a/src/main/java/org/telegram/services/TransifexService.java b/src/main/java/org/telegram/services/TransifexService.java index ce701ca..71d0768 100644 --- a/src/main/java/org/telegram/services/TransifexService.java +++ b/src/main/java/org/telegram/services/TransifexService.java @@ -94,7 +94,7 @@ public class TransifexService { HttpClient client = HttpClientBuilder.create().build(); HttpGet request = new HttpGet(BASEURLiOS.replace("@language", query)); HttpResponse response = client.execute(request); - result = IOUtils.toByteArray(new InputStreamReader(response.getEntity().getContent(), "UTF-16LE")); + result = IOUtils.toByteArray(new InputStreamReader(response.getEntity().getContent(), "UTF-16LE"), "UTF-16LE"); } catch (IOException e) { BotLogger.error(LOGTAG, e); } @@ -107,7 +107,7 @@ public class TransifexService { HttpClient client = HttpClientBuilder.create().build(); HttpGet request = new HttpGet(BASEURLOSX.replace("@language", query)); HttpResponse response = client.execute(request); - result = IOUtils.toByteArray(new InputStreamReader(response.getEntity().getContent(), "UTF-16LE")); + result = IOUtils.toByteArray(new InputStreamReader(response.getEntity().getContent(), "UTF-16LE"), "UTF-16LE"); } catch (IOException e) { BotLogger.error(LOGTAG, e); } @@ -120,7 +120,7 @@ public class TransifexService { HttpClient client = HttpClientBuilder.create().build(); HttpGet request = new HttpGet(BASEURLTDesktop.replace("@language", query)); HttpResponse response = client.execute(request); - result = IOUtils.toByteArray(new InputStreamReader(response.getEntity().getContent(), "UTF-16LE")); + result = IOUtils.toByteArray(new InputStreamReader(response.getEntity().getContent(), "UTF-16LE"), "UTF-16LE"); } catch (IOException e) { BotLogger.error(LOGTAG, e); } @@ -133,7 +133,7 @@ public class TransifexService { HttpClient client = HttpClientBuilder.create().build(); HttpGet request = new HttpGet(BASEURLTemplates.replace("@language", languageCode)); HttpResponse response = client.execute(request); - result = IOUtils.toByteArray(new InputStreamReader(response.getEntity().getContent(), "UTF-8")); + result = IOUtils.toByteArray(new InputStreamReader(response.getEntity().getContent(), "UTF-8"), "UTF-8"); } catch (IOException e) { BotLogger.error(LOGTAG, e); } @@ -146,7 +146,7 @@ public class TransifexService { HttpClient client = HttpClientBuilder.create().build(); HttpGet request = new HttpGet(BASEURLWebogram.replace("@language", query)); HttpResponse response = client.execute(request); - result = IOUtils.toByteArray(new InputStreamReader(response.getEntity().getContent(), "UTF-16LE")); + result = IOUtils.toByteArray(new InputStreamReader(response.getEntity().getContent(), "UTF-16LE"), "UTF-16LE"); } catch (IOException e) { BotLogger.error(LOGTAG, e); } @@ -159,7 +159,7 @@ public class TransifexService { HttpClient client = HttpClientBuilder.create().build(); HttpGet request = new HttpGet(BASEURLWP.replace("@language", query)); HttpResponse response = client.execute(request); - result = IOUtils.toByteArray(new InputStreamReader(response.getEntity().getContent(), "UTF-16LE")); + result = IOUtils.toByteArray(new InputStreamReader(response.getEntity().getContent(), "UTF-16LE"), "UTF-16LE"); } catch (IOException e) { BotLogger.error(LOGTAG, e); } @@ -199,7 +199,7 @@ public class TransifexService { localFile.close(); File fileToUpload = new File(fileName); sendDocument = new SendDocument(); - sendDocument.setNewDocument(fileToUpload.getAbsolutePath(), fileName); + sendDocument.setNewDocument(fileToUpload.getAbsoluteFile()); } catch (FileNotFoundException e) { BotLogger.error(LOGTAG, e); } @@ -226,7 +226,7 @@ public class TransifexService { localFile.close(); File fileToUpload = new File(fileName); sendDocument = new SendDocument(); - sendDocument.setNewDocument(fileToUpload.getAbsolutePath(), fileName); + sendDocument.setNewDocument(fileToUpload.getAbsoluteFile()); } catch (FileNotFoundException e) { BotLogger.error(LOGTAG, e); } @@ -254,7 +254,7 @@ public class TransifexService { IOUtils.write(file, output); output.close(); sendDocument = new SendDocument(); - sendDocument.setNewDocument(fileToUpload.getAbsolutePath(), fileName); + sendDocument.setNewDocument(fileToUpload.getAbsoluteFile()); } catch (IOException e) { BotLogger.error(LOGTAG, e); } @@ -281,7 +281,7 @@ public class TransifexService { IOUtils.write(file, output); output.close(); sendDocument = new SendDocument(); - sendDocument.setNewDocument(fileToUpload.getAbsolutePath(), fileName); + sendDocument.setNewDocument(fileToUpload.getAbsoluteFile()); } catch (IOException e) { BotLogger.error(LOGTAG, e); } @@ -309,7 +309,7 @@ public class TransifexService { output.close(); if (fileToUpload.exists()) { sendDocument = new SendDocument(); - sendDocument.setNewDocument(fileToUpload.getAbsolutePath(), fileName); + sendDocument.setNewDocument(fileToUpload.getAbsoluteFile()); } } catch (IOException e) { e.printStackTrace(); @@ -338,7 +338,7 @@ public class TransifexService { output.close(); if (fileToUpload.exists()) { sendDocument = new SendDocument(); - sendDocument.setNewDocument(fileToUpload.getAbsolutePath(), fileName); + sendDocument.setNewDocument(fileToUpload.getAbsoluteFile()); } } catch (IOException e) { e.printStackTrace(); @@ -367,7 +367,7 @@ public class TransifexService { output.close(); if (fileToUpload.exists()) { sendDocument = new SendDocument(); - sendDocument.setNewDocument(fileToUpload.getAbsolutePath(), fileName); + sendDocument.setNewDocument(fileToUpload.getAbsoluteFile()); } } catch (IOException e) { e.printStackTrace(); diff --git a/src/main/java/org/telegram/updateshandlers/ChannelHandlers.java b/src/main/java/org/telegram/updateshandlers/ChannelHandlers.java index 1ff8323..cdceb9b 100644 --- a/src/main/java/org/telegram/updateshandlers/ChannelHandlers.java +++ b/src/main/java/org/telegram/updateshandlers/ChannelHandlers.java @@ -52,13 +52,13 @@ public class ChannelHandlers extends TelegramLongPollingBot { @Override public String getBotToken() { - return BotConfig.TOKENCHANNEL; + return BotConfig.CHANNEL_TOKEN; } @Override public String getBotUsername() { - return BotConfig.USERNAMECHANNEL; + return BotConfig.CHANNEL_USER; } @@ -115,7 +115,7 @@ public class ChannelHandlers extends TelegramLongPollingBot { SendMessage sendMessage = new SendMessage(); sendMessage.enableMarkdown(true); sendMessage.setChatId(message.getChatId().toString()); - sendMessage.setReplayToMessageId(message.getMessageId()); + sendMessage.setReplyToMessageId(message.getMessageId()); sendMessage.setText(String.format(ERROR_MESSAGE_TEXT, message.getText().trim(), errorText.replace("\"", "\\\""))); sendMessage.enableMarkdown(true); @@ -131,12 +131,11 @@ public class ChannelHandlers extends TelegramLongPollingBot { SendMessage sendMessage = new SendMessage(); sendMessage.enableMarkdown(true); sendMessage.setChatId(message.getChatId().toString()); - sendMessage.setReplayToMessageId(message.getMessageId()); + sendMessage.setReplyToMessageId(message.getMessageId()); ForceReplyKeyboard forceReplyKeyboard = new ForceReplyKeyboard(); forceReplyKeyboard.setSelective(true); - forceReplyKeyboard.setForceReply(true); - sendMessage.setReplayMarkup(forceReplyKeyboard); + sendMessage.setReplyMarkup(forceReplyKeyboard); sendMessage.setText(WRONG_CHANNEL_TEXT); sendMessage.enableMarkdown(true); @@ -147,7 +146,7 @@ public class ChannelHandlers extends TelegramLongPollingBot { SendMessage sendMessage = new SendMessage(); sendMessage.enableMarkdown(true); sendMessage.setChatId(message.getChatId().toString()); - sendMessage.setReplayToMessageId(message.getMessageId()); + sendMessage.setReplyToMessageId(message.getMessageId()); sendMessage.setText(AFTER_CHANNEL_TEXT); return sendMessage; @@ -157,9 +156,9 @@ public class ChannelHandlers extends TelegramLongPollingBot { SendMessage sendMessage = new SendMessage(); sendMessage.enableMarkdown(true); sendMessage.setChatId(chatId); - sendMessage.setReplayToMessageId(messageId); + sendMessage.setReplyToMessageId(messageId); if (replyKeyboardMarkup != null) { - sendMessage.setReplayMarkup(replyKeyboardMarkup); + sendMessage.setReplyMarkup(replyKeyboardMarkup); } sendMessage.setText(HELP_TEXT); diff --git a/src/main/java/org/telegram/updateshandlers/CommandsHandler.java b/src/main/java/org/telegram/updateshandlers/CommandsHandler.java new file mode 100644 index 0000000..8824efc --- /dev/null +++ b/src/main/java/org/telegram/updateshandlers/CommandsHandler.java @@ -0,0 +1,82 @@ +package org.telegram.updateshandlers; + +import org.telegram.BotConfig; +import org.telegram.commands.HelloCommand; +import org.telegram.commands.HelpCommand; +import org.telegram.commands.StartCommand; +import org.telegram.commands.StopCommand; +import org.telegram.database.DatabaseManager; +import org.telegram.services.Emoji; +import org.telegram.telegrambots.TelegramApiException; +import org.telegram.telegrambots.api.methods.send.SendMessage; +import org.telegram.telegrambots.api.objects.Message; +import org.telegram.telegrambots.api.objects.Update; +import org.telegram.telegrambots.bots.TelegramLongPollingCommandBot; +import org.telegram.telegrambots.logging.BotLogger; + +/** + * This handler mainly works with commands to demonstrate the Commands feature of the API + * + * @author Timo Schulz (Mit0x2) + */ +public class CommandsHandler extends TelegramLongPollingCommandBot { + + public static final String LOGTAG = "COMMANDSHANDLER"; + + /** + * Constructor. + */ + public CommandsHandler() { + register(new HelloCommand()); + register(new StartCommand()); + register(new StopCommand()); + HelpCommand helpCommand = new HelpCommand(this); + register(helpCommand); + + registerDefaultAction((absSender, message) -> { + SendMessage commandUnknownMessage = new SendMessage(); + commandUnknownMessage.setChatId(message.getChatId().toString()); + commandUnknownMessage.setText("The command '" + message.getText() + "' is not known by this bot. Here comes some help " + Emoji.AMBULANCE); + try { + absSender.sendMessage(commandUnknownMessage); + } catch (TelegramApiException e) { + BotLogger.error(LOGTAG, e); + } + helpCommand.execute(absSender, message.getFrom(), message.getChat(), new String[] {}); + }); + } + + @Override + public void processNonCommandUpdate(Update update) { + + if (update.hasMessage()) { + Message message = update.getMessage(); + + if (!DatabaseManager.getInstance().getUserStateForCommandsBot(message.getFrom().getId())) { + return; + } + + if (message.hasText()) { + SendMessage echoMessage = new SendMessage(); + echoMessage.setChatId(message.getChatId().toString()); + echoMessage.setText("Hey heres your message:\n" + message.getText()); + + try { + sendMessage(echoMessage); + } catch (TelegramApiException e) { + BotLogger.error(LOGTAG, e); + } + } + } + } + + @Override + public String getBotUsername() { + return BotConfig.COMMANDS_USER; + } + + @Override + public String getBotToken() { + return BotConfig.COMMANDS_TOKEN; + } +} \ No newline at end of file diff --git a/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java b/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java index 366c9c1..3908638 100644 --- a/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java +++ b/src/main/java/org/telegram/updateshandlers/DirectionsHandlers.java @@ -42,7 +42,7 @@ public class DirectionsHandlers extends TelegramLongPollingBot { @Override public String getBotToken() { - return BotConfig.TOKENDIRECTIONS; + return BotConfig.DIRECTIONS_TOKEN; } @Override @@ -56,7 +56,7 @@ public class DirectionsHandlers extends TelegramLongPollingBot { @Override public String getBotUsername() { - return BotConfig.USERNAMEDIRECTIONS; + return BotConfig.DIRECTIONS_USER; } private void handleDirections(Update update) throws InvalidObjectException { @@ -111,8 +111,8 @@ public class DirectionsHandlers extends TelegramLongPollingBot { sendMessageRequest.setChatId(message.getChatId().toString()); ReplyKeyboardHide replyKeyboardHide = new ReplyKeyboardHide(); replyKeyboardHide.setSelective(true); - sendMessageRequest.setReplayMarkup(replyKeyboardHide); - sendMessageRequest.setReplayToMessageId(message.getMessageId()); + sendMessageRequest.setReplyMarkup(replyKeyboardHide); + sendMessageRequest.setReplyToMessageId(message.getMessageId()); for (String direction : directions) { sendMessageRequest.setText(direction); try { @@ -143,10 +143,10 @@ public class DirectionsHandlers extends TelegramLongPollingBot { private void onOriginReceived(Message message, String language) { SendMessage sendMessageRequest = new SendMessage(); sendMessageRequest.setChatId(message.getChatId().toString()); - sendMessageRequest.setReplayToMessageId(message.getMessageId()); + sendMessageRequest.setReplyToMessageId(message.getMessageId()); ForceReplyKeyboard forceReplyKeyboard = new ForceReplyKeyboard(); forceReplyKeyboard.setSelective(true); - sendMessageRequest.setReplayMarkup(forceReplyKeyboard); + sendMessageRequest.setReplyMarkup(forceReplyKeyboard); sendMessageRequest.setText(LocalisationService.getInstance().getString("sendDestination", language)); try { @@ -191,10 +191,10 @@ public class DirectionsHandlers extends TelegramLongPollingBot { private void onStartdirectionsCommand(Message message, String language) { SendMessage sendMessageRequest = new SendMessage(); sendMessageRequest.setChatId(message.getChatId().toString()); - sendMessageRequest.setReplayToMessageId(message.getMessageId()); + sendMessageRequest.setReplyToMessageId(message.getMessageId()); ForceReplyKeyboard forceReplyKeyboard = new ForceReplyKeyboard(); forceReplyKeyboard.setSelective(true); - sendMessageRequest.setReplayMarkup(forceReplyKeyboard); + sendMessageRequest.setReplyMarkup(forceReplyKeyboard); sendMessageRequest.setText(LocalisationService.getInstance().getString("initDirections", language)); try { @@ -237,7 +237,7 @@ public class DirectionsHandlers extends TelegramLongPollingBot { replyKeyboardMarkup.setOneTimeKeyboad(true); replyKeyboardMarkup.setKeyboard(commands); replyKeyboardMarkup.setSelective(true); - sendMessageRequest.setReplayMarkup(replyKeyboardMarkup); + sendMessageRequest.setReplyMarkup(replyKeyboardMarkup); sendMessageRequest.setText(LocalisationService.getInstance().getString("chooselanguage", language)); try { sendMessage(sendMessageRequest); @@ -257,11 +257,10 @@ public class DirectionsHandlers extends TelegramLongPollingBot { } else { sendMessageRequest.setText(LocalisationService.getInstance().getString("errorLanguage")); } - sendMessageRequest.setReplayToMessageId(message.getMessageId()); + sendMessageRequest.setReplyToMessageId(message.getMessageId()); ReplyKeyboardHide replyKeyboardHide = new ReplyKeyboardHide(); - replyKeyboardHide.setHideKeyboard(true); replyKeyboardHide.setSelective(true); - sendMessageRequest.setReplayMarkup(replyKeyboardHide); + sendMessageRequest.setReplyMarkup(replyKeyboardHide); try { sendMessage(sendMessageRequest); languageMessages.remove(message.getFrom().getId()); diff --git a/src/main/java/org/telegram/updateshandlers/FilesHandlers.java b/src/main/java/org/telegram/updateshandlers/FilesHandlers.java index b5d1113..702ce81 100644 --- a/src/main/java/org/telegram/updateshandlers/FilesHandlers.java +++ b/src/main/java/org/telegram/updateshandlers/FilesHandlers.java @@ -39,7 +39,7 @@ public class FilesHandlers extends TelegramLongPollingBot { @Override public String getBotToken() { - return BotConfig.TOKENFILES; + return BotConfig.FILES_TOKEN; } @Override @@ -63,7 +63,7 @@ public class FilesHandlers extends TelegramLongPollingBot { @Override public String getBotUsername() { - return BotConfig.USERNAMEFILES; + return BotConfig.FILES_USER; } private void handleFileUpdate(Update update) throws InvalidObjectException, TelegramApiException { @@ -125,8 +125,7 @@ public class FilesHandlers extends TelegramLongPollingBot { } sendMessageRequest.setChatId(message.getChatId().toString()); ReplyKeyboardHide replyKeyboardHide = new ReplyKeyboardHide(); - replyKeyboardHide.setHideKeyboard(true); - sendMessageRequest.setReplayMarkup(replyKeyboardHide); + sendMessageRequest.setReplyMarkup(replyKeyboardHide); sendMessage(sendMessageRequest); } @@ -158,7 +157,7 @@ public class FilesHandlers extends TelegramLongPollingBot { replyKeyboardMarkup.setOneTimeKeyboad(true); replyKeyboardMarkup.setKeyboard(commands); } - sendMessageRequest.setReplayMarkup(replyKeyboardMarkup); + sendMessageRequest.setReplyMarkup(replyKeyboardMarkup); sendMessage(sendMessageRequest); } @@ -234,7 +233,7 @@ public class FilesHandlers extends TelegramLongPollingBot { replyKeyboardMarkup.setOneTimeKeyboad(true); replyKeyboardMarkup.setKeyboard(commands); replyKeyboardMarkup.setSelective(true); - sendMessageRequest.setReplayMarkup(replyKeyboardMarkup); + sendMessageRequest.setReplyMarkup(replyKeyboardMarkup); sendMessageRequest.setText(LocalisationService.getInstance().getString("chooselanguage", language)); sendMessage(sendMessageRequest); languageMessages.add(message.getFrom().getId()); @@ -250,11 +249,10 @@ public class FilesHandlers extends TelegramLongPollingBot { } else { sendMessageRequest.setText(LocalisationService.getInstance().getString("errorLanguage")); } - sendMessageRequest.setReplayToMessageId(message.getMessageId()); + sendMessageRequest.setReplyToMessageId(message.getMessageId()); ReplyKeyboardHide replyKeyboardHide = new ReplyKeyboardHide(); - replyKeyboardHide.setHideKeyboard(true); replyKeyboardHide.setSelective(true); - sendMessageRequest.setReplayMarkup(replyKeyboardHide); + sendMessageRequest.setReplyMarkup(replyKeyboardHide); sendMessage(sendMessageRequest); languageMessages.remove(message.getFrom().getId()); } diff --git a/src/main/java/org/telegram/updateshandlers/RaeHandlers.java b/src/main/java/org/telegram/updateshandlers/RaeHandlers.java index 7aac6ef..8a1f004 100644 --- a/src/main/java/org/telegram/updateshandlers/RaeHandlers.java +++ b/src/main/java/org/telegram/updateshandlers/RaeHandlers.java @@ -38,7 +38,7 @@ public class RaeHandlers extends TelegramLongPollingBot { @Override public String getBotToken() { - return BotConfig.TOKENRAE; + return BotConfig.RAE_TOKEN; } @Override @@ -60,7 +60,7 @@ public class RaeHandlers extends TelegramLongPollingBot { @Override public String getBotUsername() { - return BotConfig.USERNAMERAE; + return BotConfig.RAE_USER; } /** diff --git a/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java b/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java index 0929911..e2feca9 100644 --- a/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java +++ b/src/main/java/org/telegram/updateshandlers/TransifexHandlers.java @@ -26,7 +26,7 @@ public class TransifexHandlers extends TelegramLongPollingBot { @Override public String getBotToken() { - return BotConfig.TOKENTRANSIFEX; + return BotConfig.TRANSIFEX_TOKEN; } @Override @@ -40,7 +40,7 @@ public class TransifexHandlers extends TelegramLongPollingBot { @Override public String getBotUsername() { - return BotConfig.USERNAMETRANSIFEX; + return BotConfig.TRANSIFEX_USER; } private void sendTransifexFile(Update update) throws InvalidObjectException { diff --git a/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java b/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java index 87f85c4..ea4d3f2 100644 --- a/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java +++ b/src/main/java/org/telegram/updateshandlers/WeatherHandlers.java @@ -55,7 +55,7 @@ public class WeatherHandlers extends TelegramLongPollingBot { @Override public String getBotToken() { - return BotConfig.TOKENWEATHER; + return BotConfig.WEATHER_TOKEN; } @Override @@ -74,7 +74,7 @@ public class WeatherHandlers extends TelegramLongPollingBot { @Override public String getBotUsername() { - return BotConfig.USERNAMEWEATHER; + return BotConfig.WEATHER_USER; } private void startAlertTimers() { @@ -127,9 +127,8 @@ public class WeatherHandlers extends TelegramLongPollingBot { SendMessage sendMessage = new SendMessage(); sendMessage.setChatId(chatId.toString()); sendMessage.enableMarkdown(true); - sendMessage.setReplayMarkup(getMainMenuKeyboard(language)); - sendMessage.setReplayToMessageId(messageId); - sendMessage.setReplayMarkup(replyKeyboard); + sendMessage.setReplyToMessageId(messageId); + sendMessage.setReplyMarkup(replyKeyboard); sendMessage.setText(LocalisationService.getInstance().getString("backToMainMenu", language)); DatabaseManager.getInstance().insertWeatherState(userId, chatId, MAINMENU); @@ -190,13 +189,12 @@ public class WeatherHandlers extends TelegramLongPollingBot { SendMessage sendMessage = new SendMessage(); sendMessage.setChatId(chatId.toString()); sendMessage.enableMarkdown(true); - sendMessage.setReplayToMessageId(messageId); + sendMessage.setReplyToMessageId(messageId); sendMessage.setText(Emoji.WAVING_HAND_SIGN.toString()); ReplyKeyboardHide replyKeyboardHide = new ReplyKeyboardHide(); replyKeyboardHide.setSelective(true); - replyKeyboardHide.setHideKeyboard(true); - sendMessage.setReplayMarkup(replyKeyboardHide); + sendMessage.setReplyMarkup(replyKeyboardHide); sendMessage(sendMessage); DatabaseManager.getInstance().insertWeatherState(userId, chatId, STARTSTATE); @@ -247,9 +245,9 @@ public class WeatherHandlers extends TelegramLongPollingBot { DatabaseManager.getInstance().deleteAlertCity(message.getFrom().getId(), message.getText()); SendMessage sendMessage = new SendMessage(); sendMessage.enableMarkdown(true); - sendMessage.setReplayToMessageId(message.getMessageId()); + sendMessage.setReplyToMessageId(message.getMessageId()); sendMessage.setChatId(message.getChatId().toString()); - sendMessage.setReplayMarkup(getAlertsKeyboard(language)); + sendMessage.setReplyMarkup(getAlertsKeyboard(language)); sendMessage.setText(LocalisationService.getInstance().getString("alertDeleted", language)); DatabaseManager.getInstance().insertWeatherState(message.getFrom().getId(), message.getChatId(), ALERT); @@ -259,9 +257,9 @@ public class WeatherHandlers extends TelegramLongPollingBot { private static SendMessage onAlertDeleteBackOptionSelected(Message message, String language) { SendMessage sendMessage = new SendMessage(); sendMessage.enableMarkdown(true); - sendMessage.setReplayToMessageId(message.getMessageId()); + sendMessage.setReplyToMessageId(message.getMessageId()); sendMessage.setChatId(message.getChatId().toString()); - sendMessage.setReplayMarkup(getAlertsKeyboard(language)); + sendMessage.setReplyMarkup(getAlertsKeyboard(language)); sendMessage.setText(LocalisationService.getInstance().getString("alertsMenuMessage", language)); DatabaseManager.getInstance().insertWeatherState(message.getFrom().getId(), message.getChatId(), ALERT); @@ -275,8 +273,8 @@ public class WeatherHandlers extends TelegramLongPollingBot { SendMessage sendMessage = new SendMessage(); sendMessage.enableMarkdown(true); sendMessage.setChatId(message.getChatId().toString()); - sendMessage.setReplayToMessageId(message.getMessageId()); - sendMessage.setReplayMarkup(getAlertsKeyboard(language)); + sendMessage.setReplyToMessageId(message.getMessageId()); + sendMessage.setReplyMarkup(getAlertsKeyboard(language)); sendMessage.setText(LocalisationService.getInstance().getString("alertsMenuMessage", language)); DatabaseManager.getInstance().insertWeatherState(message.getFrom().getId(), message.getChatId(), ALERT); sendMessageRequest = sendMessage; @@ -294,8 +292,8 @@ public class WeatherHandlers extends TelegramLongPollingBot { DatabaseManager.getInstance().createNewWeatherAlert(userId, cityId, message.getText()); SendMessage sendMessageRequest = new SendMessage(); sendMessageRequest.enableMarkdown(true); - sendMessageRequest.setReplayMarkup(getAlertsKeyboard(language)); - sendMessageRequest.setReplayToMessageId(message.getMessageId()); + sendMessageRequest.setReplyMarkup(getAlertsKeyboard(language)); + sendMessageRequest.setReplyToMessageId(message.getMessageId()); sendMessageRequest.setText(getChooseNewAlertSetMessage(message.getText(), language)); sendMessageRequest.setChatId(message.getChatId().toString()); @@ -331,8 +329,8 @@ public class WeatherHandlers extends TelegramLongPollingBot { sendMessage.enableMarkdown(true); ReplyKeyboardMarkup replyKeyboardMarkup = getSettingsKeyboard(language); - sendMessage.setReplayMarkup(replyKeyboardMarkup); - sendMessage.setReplayToMessageId(message.getMessageId()); + sendMessage.setReplyMarkup(replyKeyboardMarkup); + sendMessage.setReplyToMessageId(message.getMessageId()); sendMessage.setChatId(message.getChatId().toString()); sendMessage.setText(getSettingsMessage(language)); @@ -345,10 +343,10 @@ public class WeatherHandlers extends TelegramLongPollingBot { sendMessage.enableMarkdown(true); sendMessage.setChatId(message.getChatId().toString()); - sendMessage.setReplayToMessageId(message.getMessageId()); - sendMessage.setReplayMarkup(getAlertsKeyboard(language)); + sendMessage.setReplyToMessageId(message.getMessageId()); + sendMessage.setReplyMarkup(getAlertsKeyboard(language)); sendMessage.setText(getAlertListMessage(message.getFrom().getId(), language)); - sendMessage.setReplayToMessageId(message.getMessageId()); + sendMessage.setReplyToMessageId(message.getMessageId()); return sendMessage; } @@ -361,15 +359,15 @@ public class WeatherHandlers extends TelegramLongPollingBot { ReplyKeyboardMarkup replyKeyboardMarkup = getAlertsListKeyboard(message.getFrom().getId(), language); if (replyKeyboardMarkup != null) { - sendMessage.setReplayMarkup(replyKeyboardMarkup); + sendMessage.setReplyMarkup(replyKeyboardMarkup); sendMessage.setText(LocalisationService.getInstance().getString("chooseNewAlertCity", language)); DatabaseManager.getInstance().insertWeatherState(message.getFrom().getId(), message.getChatId(), ALERTDELETE); } else { - sendMessage.setReplayMarkup(getAlertsKeyboard(language)); + sendMessage.setReplyMarkup(getAlertsKeyboard(language)); sendMessage.setText(LocalisationService.getInstance().getString("noAlertList", language)); } - sendMessage.setReplayToMessageId(message.getMessageId()); + sendMessage.setReplyToMessageId(message.getMessageId()); return sendMessage; } @@ -378,9 +376,9 @@ public class WeatherHandlers extends TelegramLongPollingBot { sendMessage.enableMarkdown(true); sendMessage.setChatId(message.getChatId().toString()); - sendMessage.setReplayMarkup(getRecentsKeyboard(message.getFrom().getId(), language, false)); + sendMessage.setReplyMarkup(getRecentsKeyboard(message.getFrom().getId(), language, false)); sendMessage.setText(LocalisationService.getInstance().getString("chooseNewAlertCity", language)); - sendMessage.setReplayToMessageId(message.getMessageId()); + sendMessage.setReplyToMessageId(message.getMessageId()); DatabaseManager.getInstance().insertWeatherState(message.getFrom().getId(), message.getChatId(), ALERTNEW); return sendMessage; @@ -413,9 +411,9 @@ public class WeatherHandlers extends TelegramLongPollingBot { SendMessage sendMessage = new SendMessage(); sendMessage.enableMarkdown(true); - sendMessage.setReplayToMessageId(message.getMessageId()); + sendMessage.setReplyToMessageId(message.getMessageId()); sendMessage.setChatId(message.getChatId().toString()); - sendMessage.setReplayMarkup(getAlertsKeyboard(language)); + sendMessage.setReplyMarkup(getAlertsKeyboard(language)); sendMessage.setText(LocalisationService.getInstance().getString("alertsMenuMessage", language)); DatabaseManager.getInstance().insertWeatherState(message.getFrom().getId(), message.getChatId(), ALERT); @@ -426,9 +424,9 @@ public class WeatherHandlers extends TelegramLongPollingBot { SendMessage sendMessage = new SendMessage(); sendMessage.enableMarkdown(true); - sendMessage.setReplayToMessageId(message.getMessageId()); + sendMessage.setReplyToMessageId(message.getMessageId()); sendMessage.setChatId(message.getChatId().toString()); - sendMessage.setReplayMarkup(getUnitsKeyboard(language)); + sendMessage.setReplyMarkup(getUnitsKeyboard(language)); sendMessage.setText(getUnitsMessage(message.getFrom().getId(), language)); DatabaseManager.getInstance().insertWeatherState(message.getFrom().getId(), message.getChatId(), UNITS); @@ -439,9 +437,9 @@ public class WeatherHandlers extends TelegramLongPollingBot { SendMessage sendMessage = new SendMessage(); sendMessage.enableMarkdown(true); - sendMessage.setReplayToMessageId(message.getMessageId()); + sendMessage.setReplyToMessageId(message.getMessageId()); sendMessage.setChatId(message.getChatId().toString()); - sendMessage.setReplayMarkup(getLanguagesKeyboard(language)); + sendMessage.setReplyMarkup(getLanguagesKeyboard(language)); sendMessage.setText(getLanguageMessage(language)); DatabaseManager.getInstance().insertWeatherState(message.getFrom().getId(), message.getChatId(), LANGUAGE); @@ -475,8 +473,8 @@ public class WeatherHandlers extends TelegramLongPollingBot { sendMessage.enableMarkdown(true); ReplyKeyboardMarkup replyKeyboardMarkup = getSettingsKeyboard(language); - sendMessage.setReplayMarkup(replyKeyboardMarkup); - sendMessage.setReplayToMessageId(message.getMessageId()); + sendMessage.setReplyMarkup(replyKeyboardMarkup); + sendMessage.setReplyToMessageId(message.getMessageId()); sendMessage.setChatId(message.getChatId().toString()); sendMessage.setText(getSettingsMessage(language)); @@ -488,9 +486,9 @@ public class WeatherHandlers extends TelegramLongPollingBot { SendMessage sendMessageRequest = new SendMessage(); sendMessageRequest.enableMarkdown(true); sendMessageRequest.setChatId(chatId.toString()); - sendMessageRequest.setReplayMarkup(getUnitsKeyboard(language)); + sendMessageRequest.setReplyMarkup(getUnitsKeyboard(language)); sendMessageRequest.setText(LocalisationService.getInstance().getString("errorUnitsNotFound", language)); - sendMessageRequest.setReplayToMessageId(messageId); + sendMessageRequest.setReplyToMessageId(messageId); return sendMessageRequest; } @@ -502,8 +500,8 @@ public class WeatherHandlers extends TelegramLongPollingBot { sendMessageRequest.enableMarkdown(true); sendMessageRequest.setChatId(chatId.toString()); sendMessageRequest.setText(LocalisationService.getInstance().getString("unitsUpdated", language)); - sendMessageRequest.setReplayToMessageId(messageId); - sendMessageRequest.setReplayMarkup(getMainMenuKeyboard(language)); + sendMessageRequest.setReplyToMessageId(messageId); + sendMessageRequest.setReplyMarkup(getMainMenuKeyboard(language)); DatabaseManager.getInstance().insertWeatherState(userId, chatId, MAINMENU); return sendMessageRequest; @@ -533,8 +531,8 @@ public class WeatherHandlers extends TelegramLongPollingBot { sendMessage.enableMarkdown(true); ReplyKeyboardMarkup replyKeyboardMarkup = getSettingsKeyboard(language); - sendMessage.setReplayMarkup(replyKeyboardMarkup); - sendMessage.setReplayToMessageId(message.getMessageId()); + sendMessage.setReplyMarkup(replyKeyboardMarkup); + sendMessage.setReplyToMessageId(message.getMessageId()); sendMessage.setChatId(message.getChatId().toString()); sendMessage.setText(getSettingsMessage(language)); @@ -546,9 +544,9 @@ public class WeatherHandlers extends TelegramLongPollingBot { SendMessage sendMessageRequest = new SendMessage(); sendMessageRequest.enableMarkdown(true); sendMessageRequest.setChatId(chatId.toString()); - sendMessageRequest.setReplayMarkup(getLanguagesKeyboard(language)); + sendMessageRequest.setReplyMarkup(getLanguagesKeyboard(language)); sendMessageRequest.setText(LocalisationService.getInstance().getString("errorLanguageNotFound", language)); - sendMessageRequest.setReplayToMessageId(messageId); + sendMessageRequest.setReplyToMessageId(messageId); return sendMessageRequest; } @@ -561,8 +559,8 @@ public class WeatherHandlers extends TelegramLongPollingBot { sendMessageRequest.enableMarkdown(true); sendMessageRequest.setChatId(chatId.toString()); sendMessageRequest.setText(LocalisationService.getInstance().getString("languageUpdated", languageCode)); - sendMessageRequest.setReplayToMessageId(messageId); - sendMessageRequest.setReplayMarkup(getMainMenuKeyboard(languageCode)); + sendMessageRequest.setReplyToMessageId(messageId); + sendMessageRequest.setReplyMarkup(getMainMenuKeyboard(languageCode)); DatabaseManager.getInstance().insertWeatherState(userId, chatId, MAINMENU); return sendMessageRequest; @@ -621,8 +619,8 @@ public class WeatherHandlers extends TelegramLongPollingBot { String weather = WeatherService.getInstance().fetchWeatherForecast(cityId.toString(), userId, language, unitsSystem); SendMessage sendMessageRequest = new SendMessage(); sendMessageRequest.enableMarkdown(true); - sendMessageRequest.setReplayMarkup(getMainMenuKeyboard(language)); - sendMessageRequest.setReplayToMessageId(messageId); + sendMessageRequest.setReplyMarkup(getMainMenuKeyboard(language)); + sendMessageRequest.setReplyToMessageId(messageId); sendMessageRequest.setText(weather); sendMessageRequest.setChatId(chatId.toString()); @@ -639,8 +637,8 @@ public class WeatherHandlers extends TelegramLongPollingBot { SendMessage sendMessage = new SendMessage(); sendMessage.enableMarkdown(true); sendMessage.setChatId(chatId.toString()); - sendMessage.setReplayToMessageId(messageId); - sendMessage.setReplayMarkup(forceReplyKeyboard); + sendMessage.setReplyToMessageId(messageId); + sendMessage.setReplyMarkup(forceReplyKeyboard); sendMessage.setText(LocalisationService.getInstance().getString("onWeatherLocationCommand", language)); DatabaseManager.getInstance().insertWeatherState(userId, chatId, FORECASTLOCATIONWEATHER); @@ -653,8 +651,8 @@ public class WeatherHandlers extends TelegramLongPollingBot { SendMessage sendMessage = new SendMessage(); sendMessage.enableMarkdown(true); sendMessage.setChatId(chatId.toString()); - sendMessage.setReplayToMessageId(messageId); - sendMessage.setReplayMarkup(forceReplyKeyboard); + sendMessage.setReplyToMessageId(messageId); + sendMessage.setReplyMarkup(forceReplyKeyboard); sendMessage.setText(LocalisationService.getInstance().getString("onWeatherNewCommand", language)); DatabaseManager.getInstance().insertWeatherState(userId, chatId, FORECASTNEWWEATHER); @@ -723,8 +721,8 @@ public class WeatherHandlers extends TelegramLongPollingBot { String weather = WeatherService.getInstance().fetchWeatherCurrent(cityId.toString(), userId, language, unitsSystem); SendMessage sendMessageRequest = new SendMessage(); sendMessageRequest.enableMarkdown(true); - sendMessageRequest.setReplayMarkup(getMainMenuKeyboard(language)); - sendMessageRequest.setReplayToMessageId(messageId); + sendMessageRequest.setReplyMarkup(getMainMenuKeyboard(language)); + sendMessageRequest.setReplyToMessageId(messageId); sendMessageRequest.setText(weather); sendMessageRequest.setChatId(chatId.toString()); DatabaseManager.getInstance().insertWeatherState(userId, chatId, MAINMENU); @@ -740,8 +738,8 @@ public class WeatherHandlers extends TelegramLongPollingBot { SendMessage sendMessage = new SendMessage(); sendMessage.enableMarkdown(true); sendMessage.setChatId(chatId.toString()); - sendMessage.setReplayToMessageId(messageId); - sendMessage.setReplayMarkup(forceReplyKeyboard); + sendMessage.setReplyToMessageId(messageId); + sendMessage.setReplyMarkup(forceReplyKeyboard); sendMessage.setText(LocalisationService.getInstance().getString("onWeatherLocationCommand", language)); DatabaseManager.getInstance().insertWeatherState(userId, chatId, CURRENTLOCATIONWEATHER); @@ -754,8 +752,8 @@ public class WeatherHandlers extends TelegramLongPollingBot { SendMessage sendMessage = new SendMessage(); sendMessage.enableMarkdown(true); sendMessage.setChatId(chatId.toString()); - sendMessage.setReplayToMessageId(messageId); - sendMessage.setReplayMarkup(forceReplyKeyboard); + sendMessage.setReplyToMessageId(messageId); + sendMessage.setReplyMarkup(forceReplyKeyboard); sendMessage.setText(LocalisationService.getInstance().getString("onWeatherNewCommand", language)); DatabaseManager.getInstance().insertWeatherState(userId, chatId, CURRENTNEWWEATHER); @@ -802,8 +800,8 @@ public class WeatherHandlers extends TelegramLongPollingBot { sendMessage.enableMarkdown(true); ReplyKeyboardMarkup replyKeyboardMarkup = getSettingsKeyboard(language); - sendMessage.setReplayMarkup(replyKeyboardMarkup); - sendMessage.setReplayToMessageId(message.getMessageId()); + sendMessage.setReplyMarkup(replyKeyboardMarkup); + sendMessage.setReplyToMessageId(message.getMessageId()); sendMessage.setChatId(message.getChatId().toString()); sendMessage.setText(getSettingsMessage(language)); @@ -816,8 +814,8 @@ public class WeatherHandlers extends TelegramLongPollingBot { sendMessage.enableMarkdown(true); ReplyKeyboardMarkup replyKeyboardMarkup = getRecentsKeyboard(message.getFrom().getId(), language); - sendMessage.setReplayMarkup(replyKeyboardMarkup); - sendMessage.setReplayToMessageId(message.getMessageId()); + sendMessage.setReplyMarkup(replyKeyboardMarkup); + sendMessage.setReplyToMessageId(message.getMessageId()); sendMessage.setChatId(message.getChatId().toString()); if (replyKeyboardMarkup.getKeyboard().size() > 3) { sendMessage.setText(LocalisationService.getInstance().getString("onForecastCommandFromHistory", language)); @@ -834,8 +832,8 @@ public class WeatherHandlers extends TelegramLongPollingBot { sendMessage.enableMarkdown(true); ReplyKeyboardMarkup replyKeyboardMarkup = getRecentsKeyboard(message.getFrom().getId(), language); - sendMessage.setReplayMarkup(replyKeyboardMarkup); - sendMessage.setReplayToMessageId(message.getMessageId()); + sendMessage.setReplyMarkup(replyKeyboardMarkup); + sendMessage.setReplyToMessageId(message.getMessageId()); sendMessage.setChatId(message.getChatId().toString()); if (replyKeyboardMarkup.getKeyboard().size() > 3) { sendMessage.setText(LocalisationService.getInstance().getString("onCurrentCommandFromHistory", language)); @@ -1073,7 +1071,6 @@ public class WeatherHandlers extends TelegramLongPollingBot { private static ForceReplyKeyboard getForceReply() { ForceReplyKeyboard forceReplyKeyboard = new ForceReplyKeyboard(); - forceReplyKeyboard.setForceReply(true); forceReplyKeyboard.setSelective(true); return forceReplyKeyboard; } @@ -1161,8 +1158,8 @@ public class WeatherHandlers extends TelegramLongPollingBot { SendMessage sendMessage = new SendMessage(); sendMessage.enableMarkdown(true); sendMessage.setChatId(chatId.toString()); - sendMessage.setReplayToMessageId(messageId); - sendMessage.setReplayMarkup(replyKeyboard); + sendMessage.setReplyToMessageId(messageId); + sendMessage.setReplyMarkup(replyKeyboard); sendMessage.setText(LocalisationService.getInstance().getString("chooseOption", language)); return sendMessage; @@ -1172,9 +1169,9 @@ public class WeatherHandlers extends TelegramLongPollingBot { SendMessage sendMessage = new SendMessage(); sendMessage.enableMarkdown(true); sendMessage.setChatId(chatId); - sendMessage.setReplayToMessageId(messageId); + sendMessage.setReplyToMessageId(messageId); if (replyKeyboardMarkup != null) { - sendMessage.setReplayMarkup(replyKeyboardMarkup); + sendMessage.setReplyMarkup(replyKeyboardMarkup); } sendMessage.setText(getHelpMessage(language)); return sendMessage; @@ -1184,9 +1181,9 @@ public class WeatherHandlers extends TelegramLongPollingBot { SendMessage sendMessage = new SendMessage(); sendMessage.enableMarkdown(true); sendMessage.setChatId(chatId); - sendMessage.setReplayToMessageId(messageId); + sendMessage.setReplyToMessageId(messageId); if (replyKeyboardMarkup != null) { - sendMessage.setReplayMarkup(replyKeyboardMarkup); + sendMessage.setReplyMarkup(replyKeyboardMarkup); } sendMessage.setText(LocalisationService.getInstance().getString("rateMeMessage", language)); @@ -1203,8 +1200,8 @@ public class WeatherHandlers extends TelegramLongPollingBot { message.getLocation().getLatitude(), message.getFrom().getId(), language, unitsSystem); SendMessage sendMessageRequest = new SendMessage(); sendMessageRequest.enableMarkdown(true); - sendMessageRequest.setReplayMarkup(getMainMenuKeyboard(language)); - sendMessageRequest.setReplayToMessageId(message.getMessageId()); + sendMessageRequest.setReplyMarkup(getMainMenuKeyboard(language)); + sendMessageRequest.setReplyToMessageId(message.getMessageId()); sendMessageRequest.setText(weather); sendMessageRequest.setChatId(message.getChatId().toString()); @@ -1217,8 +1214,8 @@ public class WeatherHandlers extends TelegramLongPollingBot { String weather = WeatherService.getInstance().fetchWeatherForecast(text, userId, language, unitsSystem); SendMessage sendMessageRequest = new SendMessage(); sendMessageRequest.enableMarkdown(true); - sendMessageRequest.setReplayMarkup(getMainMenuKeyboard(language)); - sendMessageRequest.setReplayToMessageId(messageId); + sendMessageRequest.setReplyMarkup(getMainMenuKeyboard(language)); + sendMessageRequest.setReplyToMessageId(messageId); sendMessageRequest.setText(weather); sendMessageRequest.setChatId(chatId.toString()); @@ -1232,8 +1229,8 @@ public class WeatherHandlers extends TelegramLongPollingBot { message.getLocation().getLatitude(), message.getFrom().getId(), language, unitsSystem); SendMessage sendMessageRequest = new SendMessage(); sendMessageRequest.enableMarkdown(true); - sendMessageRequest.setReplayMarkup(getMainMenuKeyboard(language)); - sendMessageRequest.setReplayToMessageId(message.getMessageId()); + sendMessageRequest.setReplyMarkup(getMainMenuKeyboard(language)); + sendMessageRequest.setReplyToMessageId(message.getMessageId()); sendMessageRequest.setText(weather); sendMessageRequest.setChatId(message.getChatId().toString()); @@ -1246,8 +1243,8 @@ public class WeatherHandlers extends TelegramLongPollingBot { String weather = WeatherService.getInstance().fetchWeatherCurrent(text, userId, language, unitsSystem); SendMessage sendMessageRequest = new SendMessage(); sendMessageRequest.enableMarkdown(true); - sendMessageRequest.setReplayMarkup(getMainMenuKeyboard(language)); - sendMessageRequest.setReplayToMessageId(messageId); + sendMessageRequest.setReplyMarkup(getMainMenuKeyboard(language)); + sendMessageRequest.setReplyToMessageId(messageId); sendMessageRequest.setText(weather); sendMessageRequest.setChatId(chatId.toString()); diff --git a/src/main/java/org/telegram/updateshandlers/WebHookExampleHandlers.java b/src/main/java/org/telegram/updateshandlers/WebHookExampleHandlers.java index f72ef5a..9fda18a 100644 --- a/src/main/java/org/telegram/updateshandlers/WebHookExampleHandlers.java +++ b/src/main/java/org/telegram/updateshandlers/WebHookExampleHandlers.java @@ -26,16 +26,16 @@ public class WebHookExampleHandlers extends TelegramWebhookBot { @Override public String getBotUsername() { - return BotConfig.USERNAMEWEBHOOK; + return BotConfig.WEBHOOK_USER; } @Override public String getBotToken() { - return BotConfig.TOKENWEBHOOK; + return BotConfig.WEBHOOK_TOKEN; } @Override public String getBotPath() { - return BotConfig.USERNAMEWEBHOOK; //arbitrary path to deliver updates on, username is an example. + return BotConfig.WEBHOOK_USER; //arbitrary path to deliver updates on, username is an example. } }