From d6315d1294a532a2e2496c3ff50b0424751b18a0 Mon Sep 17 00:00:00 2001
From: Javinator9889 <javialonso007@hotmail.es>
Date: Tue, 26 Jun 2018 20:29:26 +0200
Subject: [PATCH] First messages included

---
 App/.idea/workspace.xml  | 73 +++++++++++++++++++++++++---------------
 App/commands/__init__.py |  6 ++--
 App/messages/es_ES.json  | 16 +++++++++
 3 files changed, 64 insertions(+), 31 deletions(-)
 create mode 100644 App/messages/es_ES.json

diff --git a/App/.idea/workspace.xml b/App/.idea/workspace.xml
index ebd1dee..7f013ec 100644
--- a/App/.idea/workspace.xml
+++ b/App/.idea/workspace.xml
@@ -2,9 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="ecb85847-acff-4336-b3d7-4f5563aac01d" name="Default" comment="">
-      <change afterPath="$PROJECT_DIR$/utils/__init__.py" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/messages/es_ES.json" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application.py" beforeDir="false" afterPath="$PROJECT_DIR$/application.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/commands/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/commands/__init__.py" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -89,7 +88,7 @@
         <entry file="file://$PROJECT_DIR$/application.py">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="631">
-              <caret line="83" column="72" lean-forward="true" selection-start-line="83" selection-start-column="72" selection-end-line="83" selection-end-column="72" />
+              <caret line="83" column="72" selection-start-line="83" selection-start-column="72" selection-end-line="83" selection-end-column="72" />
               <folding>
                 <element signature="e#154#184#0" expanded="true" />
               </folding>
@@ -100,21 +99,30 @@
       <file leaf-file-name="__init__.py" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/commands/__init__.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="459">
-              <caret line="27" column="84" lean-forward="true" selection-start-line="27" selection-start-column="84" selection-end-line="27" selection-end-column="84" />
+            <state relative-caret-position="476">
+              <caret line="28" column="100" selection-start-line="28" selection-start-column="100" selection-end-line="28" selection-end-column="100" />
               <folding>
-                <element signature="e#0#32#0" expanded="true" />
-                <marker date="1530014293071" expanded="true" signature="1397:1406" ph="..." />
+                <element signature="e#0#43#0" expanded="true" />
+                <marker date="1530037753191" expanded="true" signature="1444:1453" ph="..." />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="es_ES.json" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/messages/es_ES.json">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="204">
+              <caret line="12" column="32" selection-start-line="12" selection-start-column="32" selection-end-line="12" selection-end-column="32" />
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file leaf-file-name="__init__.py" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/utils/__init__.py">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="119">
-              <caret line="7" lean-forward="true" selection-start-line="7" selection-end-line="7" />
+              <caret line="7" selection-start-line="7" selection-end-line="7" />
             </state>
           </provider>
         </entry>
@@ -123,7 +131,7 @@
         <entry file="file://$PROJECT_DIR$/database/__init__.py">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="408">
-              <caret line="44" column="70" lean-forward="true" selection-start-line="44" selection-start-column="70" selection-end-line="44" selection-end-column="70" />
+              <caret line="44" column="70" selection-start-line="44" selection-start-column="70" selection-end-line="44" selection-end-column="70" />
               <folding>
                 <element signature="e#0#11#0" expanded="true" />
               </folding>
@@ -168,6 +176,7 @@
         <option value="$PROJECT_DIR$/utils/__init__.py" />
         <option value="$PROJECT_DIR$/application.py" />
         <option value="$PROJECT_DIR$/database/__init__.py" />
+        <option value="$PROJECT_DIR$/messages/es_ES.json" />
         <option value="$PROJECT_DIR$/commands/__init__.py" />
       </list>
     </option>
@@ -209,12 +218,7 @@
             <path>
               <item name="App" type="b2602c69:ProjectViewProjectNode" />
               <item name="App" type="462c0819:PsiDirectoryNode" />
-              <item name="database" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="App" type="b2602c69:ProjectViewProjectNode" />
-              <item name="App" type="462c0819:PsiDirectoryNode" />
-              <item name="utils" type="462c0819:PsiDirectoryNode" />
+              <item name="messages" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
@@ -226,7 +230,7 @@
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="true" />
     <property name="com.intellij.database.dataSource.DataSourceTemplate" value="DDL Data Source&#10;Derby (Embedded)" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/db_script_pycharm.ddl" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../core-dumped-telegram-bot" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
     <property name="run.code.analysis.last.selected.profile" value="pProject Default" />
@@ -323,7 +327,14 @@
       <option name="project" value="LOCAL" />
       <updated>1529752871693</updated>
     </task>
-    <option name="localTasksCounter" value="7" />
+    <task id="LOCAL-00007" summary="DB integration and handlers defined">
+      <created>1530014316004</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1530014316004</updated>
+    </task>
+    <option name="localTasksCounter" value="8" />
     <servers />
   </component>
   <component name="ToolWindowManager">
@@ -367,7 +378,8 @@
     <MESSAGE value="Updated database model and added methods for &quot;InsertOperations&quot;" />
     <MESSAGE value="Completed UPDATE operations &amp; updated CQL file" />
     <MESSAGE value="Finished creation of methods for working with CQL" />
-    <option name="LAST_COMMIT_MESSAGE" value="Finished creation of methods for working with CQL" />
+    <MESSAGE value="DB integration and handlers defined" />
+    <option name="LAST_COMMIT_MESSAGE" value="DB integration and handlers defined" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -407,8 +419,8 @@
         <state relative-caret-position="578">
           <caret line="35" column="8" selection-start-line="35" selection-start-column="8" selection-end-line="35" selection-end-column="8" />
           <folding>
-            <element signature="e#0#32#0" expanded="true" />
-            <marker date="1530014293071" expanded="true" signature="1397:1406" ph="..." />
+            <element signature="e#0#43#0" expanded="true" />
+            <marker date="1530037753191" expanded="true" signature="1444:1453" ph="..." />
           </folding>
         </state>
       </provider>
@@ -545,14 +557,14 @@
     <entry file="file://$PROJECT_DIR$/utils/__init__.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="119">
-          <caret line="7" lean-forward="true" selection-start-line="7" selection-end-line="7" />
+          <caret line="7" selection-start-line="7" selection-end-line="7" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/application.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="631">
-          <caret line="83" column="72" lean-forward="true" selection-start-line="83" selection-start-column="72" selection-end-line="83" selection-end-column="72" />
+          <caret line="83" column="72" selection-start-line="83" selection-start-column="72" selection-end-line="83" selection-end-column="72" />
           <folding>
             <element signature="e#154#184#0" expanded="true" />
           </folding>
@@ -562,20 +574,27 @@
     <entry file="file://$PROJECT_DIR$/database/__init__.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="408">
-          <caret line="44" column="70" lean-forward="true" selection-start-line="44" selection-start-column="70" selection-end-line="44" selection-end-column="70" />
+          <caret line="44" column="70" selection-start-line="44" selection-start-column="70" selection-end-line="44" selection-end-column="70" />
           <folding>
             <element signature="e#0#11#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/messages/es_ES.json">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="204">
+          <caret line="12" column="32" selection-start-line="12" selection-start-column="32" selection-end-line="12" selection-end-column="32" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/commands/__init__.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="459">
-          <caret line="27" column="84" lean-forward="true" selection-start-line="27" selection-start-column="84" selection-end-line="27" selection-end-column="84" />
+        <state relative-caret-position="476">
+          <caret line="28" column="100" selection-start-line="28" selection-start-column="100" selection-end-line="28" selection-end-column="100" />
           <folding>
-            <element signature="e#0#32#0" expanded="true" />
-            <marker date="1530014293071" expanded="true" signature="1397:1406" ph="..." />
+            <element signature="e#0#43#0" expanded="true" />
+            <marker date="1530037753191" expanded="true" signature="1444:1453" ph="..." />
           </folding>
         </state>
       </provider>
diff --git a/App/commands/__init__.py b/App/commands/__init__.py
index 0fc5bc9..f42b4d7 100644
--- a/App/commands/__init__.py
+++ b/App/commands/__init__.py
@@ -1,4 +1,4 @@
-from telegram import Bot, Update
+from telegram import Bot, Update, ParseMode
 from telegram.ext import run_async
 
 from utils import Constants
@@ -26,9 +26,7 @@ def start(self, bot: Bot, update: Update):
             with open(user_path + Constants.P_USERS_FILE, "wb") as user_info:
                 pickle.dump(Constants.D_USER_DICT, user_info)
             db_insert.registerNewUser(user_id=user_id, username=username, name=name)
-
-
-        # bot.sendMessage(chat_id, self.__messages["welcome"])
+        bot.sendMessage(chat_id=user_id, text=self.__messages["msg"], parse_mode=ParseMode.MARKDOWN)
 
 
 class HelpHandler(Handler):
diff --git a/App/messages/es_ES.json b/App/messages/es_ES.json
new file mode 100644
index 0000000..d402d04
--- /dev/null
+++ b/App/messages/es_ES.json
@@ -0,0 +1,16 @@
+{
+  "welcome": [
+    {
+      "msg": "Hola, bienvenido {} 😄\nUsa el comando /help para *obtener más ayuda* o empieza a *usar el bot* ya mismo 🎶\n\nSi quieres estar al tanto de las _últimas noticias_ sobre el bot, échale un vistazo al canal oficial: @ytMDBot"
+    }
+  ],
+  "help": [
+    {
+      "msg": "Para descargar una canción puedes:\n  ■  *Buscar* 🔎 la canción por _título y artista_, enviándoselo directamente al bot\n  ■  *Enviar* directamente la _URL_ 🔗 del vídeo\n  ■  Seleccionar una *canción ya descargada* desde el historial 🕒\n\n",
+      "more_help": "Para más ayuda, navega con los botones que aparecen debajo",
+      "d_via_tt-at": "*Descarga*[ ]({})canciones enviando directamente el _título_ 🎤 y _artista_ 🗣 de la canción al bot",
+      "d_via_url": "Comienza[ ]({})directamente *con la descarga* enviando la URL del vídeo de YouTube\n\nPuedes usar un bot _inline_ como @vid para agilizar este proceso",
+      "d_via_history": "Accede[ ]({})a tu *historial* mediante el comando /history, desde donde podrás _seleccionar directamente_ la canción que quieras descargar"
+    }
+  ]
+}
\ No newline at end of file