Merge branch 'master' into dmi-faq-reference

.github/workflows/telegram-bot.yml

@@ -15,13 +15,17 @@ on:
 jobs:
   test:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        python-version: ["3.9", "3.10"]
 
     steps:
       - uses: actions/checkout@v2
-      - name: Set up Python 3.9
+      - name: Set up Python 3.x
         uses: actions/setup-python@v2
         with:
-          python-version: 3.9
+          python-version: ${{ matrix.python-version }}
       - name: Install dependencies for requirements and testing
         run: |
           python -m pip install --upgrade pip

.gitignore

@@ -129,4 +129,4 @@ pydrive/*
 .vscode
 .idea
 data/json/subjs.json
-.DS_store
+**/.DS_Store

CONTRIBUTORS.md

@@ -24,4 +24,5 @@ This project is made possible thanks to the contributions of:
 - [Paolo Rabbito](https://github.com/IlRabbino)
 - [Andrea Maugeri](https://github.com/v0lp3)
 - [Simone Costanzo](https://github.com/scraccio)
-- [Salvo Polizzi](https://github.com/salvo-polizzi)
+- [Salvo Polizzi](https://github.com/salvo-polizzi)
+- [Andrei](https://github.com/Picred)

README.md

@@ -51,7 +51,7 @@ pip3 install -r requirements.txt
 version: "2"
 services:
   dmibot:
-    image: ghcr.io/unict-dmi/telegram-dmi-bot
+    image: ghcr.io/unict-dmi/telegram-dmi-bot:master
     container_name: dmibot
     volumes:
       - </path/to/settings.yaml>:/dmibot/config/settings.yaml
@@ -62,7 +62,7 @@ services:
 ### docker cli
 
 ```bash
-docker run -v </path/to/settings.yaml>:/dmibot/config/settings.yaml -v </path/to/DMI_DB.db>:/dmibot/data/DMI_DB.db -v </path/to/drive_credentials.json>:/dmibot/config/drive_credentials.json -t unictdmi/dmibot
+docker run -v </path/to/settings.yaml>:/dmibot/config/settings.yaml -v </path/to/DMI_DB.db>:/dmibot/data/DMI_DB.db -v </path/to/drive_credentials.json>:/dmibot/config/drive_credentials.json -t ghcr.io/unict-dmi/telegram-dmi-bot:master
 ```
 
 ### Parameter

config/settings.yaml.dist

@@ -35,3 +35,9 @@ test:
   token: ''
   representatives_group: ''
   dev_group_chatid: ''
+
+lectures:
+  href_token: "sites/default"
+  dmi_link: "https://web.dmi.unict.it/"
+  file_orario_path: "./data/Orario.pdf"
+  expire_time: 86400

data/markdown/aule_studio.md

@@ -0,0 +1,3 @@
+Aula Studio: principale | Lunedì - Venerdì 08.00 - 19.00 | Sabato 09.00 - 13.00
+Aula Studio: Jonshon | Lunedì - Venerdì 08.00 - 19.00 | Sabato 09.00 - 13.00
+Aula Studio: Laboratorio 145 | Lunedì - Venerdì 08.00 - 19.00

data/markdown/informatica_link.md

@@ -0,0 +1 @@
+https://web.dmi.unict.it/

data/markdown/lezioni_link.md

@@ -1,4 +1,4 @@
-L-31:http://web.dmi.unict.it/corsi/l-31/orario-lezioni
-L-35:http://web.dmi.unict.it/corsi/l-35/orario-lezioni
-LM-18:http://web.dmi.unict.it/corsi/lm-18/orario-lezioni
-LM-40:http://web.dmi.unict.it/corsi/lm-40/orario-lezioni
+L-31:https://web.dmi.unict.it/corsi/l-31/orario-delle-lezioni
+L-35:http://web.dmi.unict.it/corsi/l-35/orario-delle-lezioni
+LM-18:http://web.dmi.unict.it/corsi/lm-18/orario-delle-lezioni
+LM-40:http://web.dmi.unict.it/corsi/lm-40/orario-delle-lezioni

data/markdown/rappresentanti_dmi.md

@@ -1,12 +1,12 @@
-Campo Filippo - @filippocampo98
-Carnemolla Davide - @Herbrant
-Cascino Andrea - @Mag1candry
+Curto Sofia - @Sofia\_Curto
+Frasca Valentina - @valentina\_frasca
+Minissale Giuseppe Virgilio - @pepp\_00
+Spina Simone - @simonze0
 Cigna Gaia - @GaiaCigna
-Cocuzza Daniele - @danielecocuzza
+Tragna Agnese
+Russo Miriana - @Miryrusso03
+Russo Mirko - @altair\_mr
+D'Anna Kamil - @Heavenly0000
+Sorbello Angelica - @ange\_l\_1c4
 Fragapane Leonardo - @leofragap06
-Gibilterra Martin - @w8floosh
-Ippolito Simone 
-Minissale Giuseppe Virgilio - @Pepp\_00
-Pistorio Anna - @annapistorio
-Seminara Luigi - @Gigii\_G
-Tilotta Fabio - @fatilo422
+La Rocca Lorenzo - @lorelarocca

data/markdown/rappresentanti_informatica.md

@@ -1,2 +1,2 @@
-Triennale:Campo Filippo - @filippocampo98|Cascino Andrea - @Mag1candry|Cigna Gaia - @GaiaCigna|Coco Giuseppe - @peppe10001|Cocuzza Daniele - @danielecocuzza|Gibilterra Martin - @w8floosh|Parlavecchio Martina - @makapx|Patania Alex - @under3\_5|Pistorio Anna - @annapistorio
-Magistrale:Trupia Andrea - @andreatrups
+Triennale:Cipria Fabrizio - @FabrizioCipria|D'Anna Kamil - @Heavenly0000|Gigliuto Emily - @imemgi|La Rocca Lorenzo - @lorelarocca|Lo Castro Giuseppe - @shownunderlight|Mirabella Leonardo - @infra\_blue|Russo Mirko - @altair\_mr|Spina Simone - @simonze0|Vaccaro Giuseppe - @VaccSpacc
+Magistrale:Cigna Gaia - @GaiaCigna|Salemi Andrea Filippo - @AndreaNinetyFive

data/markdown/rappresentanti_matematica.md

@@ -1,2 +1,2 @@
-Triennale:Catania Valentina - @valentina\_catania|Curto Sofia - @Sofia\_Curto Fragapane Leonardo - @leofragap06|Minissale Giuseppe Virgilio - @Pepp\_00|Tilotta Fabio - @fatilo422
-Magistrale:\(°^°)/
+Triennale:Candiano Francesco - @fr4nc3sc003|Luglio Gaia - @gxaja|Pitari Mario - @mariopitari|Di Blasi Marco - @Diblahh30|Tragna Agnese
+Magistrale:Frasca Valentina - @valentina\_frasca|Curto Sofia - @Sofia\_Curto|Minissale Giuseppe Virgilio - @pepp\_00|Fragapane Leonardo - @leofragap06

data/markdown/trasporto_urbano_unict.md

@@ -1,5 +1,5 @@
 Percorso Autobus AMT 901: https://www.amts.ct.it/mappa-delle-linee?percorso=901
 
-Orari Collegamento FCE Milo-Cittadella-S.Sofia:https://www.circumetnea.it/linee_orari_autobus/COLLEGAMENTO%20METRO%20Milo%20-%20CITTADELLA%20-Santa%20sofia.pdf
+Orari Collegamento FCE Milo-Cittadella-S.Sofia: https://www.circumetnea.it/metro-shuttle-fce-santa-sofia/
 
 Percorso Autobus AMT: https://www.amts.ct.it/percorsi-e-orari

data/translations/en.yaml

@@ -51,6 +51,7 @@ HELP_ALL_COMMANDS_TOOLTIP_ID: |-
   👔 /prof <nome> - _es. /prof Barbanera_
   👥 /rappresentanti - _list of representatives_
   📚 /biblioteca - _DMI's library working hours_
+  📚 /aule_studio - _DMI's aule working hours location_
   <cusicon> /cus - _location and contacts_
   ☁ /cloud - _ access to cloud shared folders_
   📣 /report - _submit a report to representatives_
@@ -60,12 +61,12 @@ HELP_ALL_COMMANDS_TOOLTIP_ID: |-
   🧑‍💻 /contributors - _shows the developers that contributed to the bot development_
   🧾 /regolamentodidattico - _gives a pdf file of the desired year's educational regulations_
   ❓ /faq - _shows the frequently asked questions_
-  
+
   *Receptionist's contacts and working hours:*
   ✍ /sdidattica - _edcational receptionist_
   📓 /studenti - _student receptionist_
   /cea - _information for Center for Computing Systems and Scientific and Educational Applications_
-  
+
   *ERSU's contactsand working hours:*
   🗃 /ersu - _location of the main ersu office_
   🗃 /ufficioersu - _(ersu office for student cards)_
@@ -96,14 +97,18 @@ HELP_CDL_CLASSES_LINK_TOOLTIP_ID: |-
   _Mathematics Master (LM-40):_ [link](%capybara%)
 HELP_CDL_LIBRARY_TOOLTIP_ID: |-
   *Library working hours:*
-  
+
   Reading room:
-  
+
   %capybara%
 
   Leasing Service:
-  
+
   %capybara%
+HELP_CDL_AULESTUDIO_TOOLTIP_ID: |-
+  Study Room: %capybara%
+
+  Study Room: %capybara%
 
 # /help-Reprs command
 REPRS_HEADER_TEXT_ID: "With which representatives you want to talk?"
@@ -113,19 +118,19 @@ REPRS_DMI_MATH_TEXT_ID: "Mathematics Reps"
 REPRS_DMI_TOOLTIP_ID: "*DMI's Representatives*"
 REPRS_DMI_CS_TOOLTIP_ID: |-
   *Computer Science Bachelor Program Representatives*
-  
+
   %capybara%
-  
+
   *Computer Science Master Program Representatives*
-  
+
   %capybara%
 REPRS_DMI_MATH_TOOLTIP_ID: |-
   *Mathematics Bachelor Program Representatives*
-  
+
   %capybara%
-  
+
   *Mathematics Master Program Representatives*
-  
+
   %capybara%
 
 # /help-Segr command
@@ -136,7 +141,7 @@ SEGR_DID_TOOLTIP_ID: |-
   Headquarters at the Department of Mathematics and Computer Science (second floor near the Directorate)  
 
   **Secretarial staff**
-  
+
   %capybara%
 
   **Didactic Secretariat**
@@ -148,49 +153,49 @@ SEGR_DID_TOOLTIP_ID: |-
   %capybara%
 SEGR_STU_TOOLTIP_ID: |-
   *Student receptionist*
-  
+
   Location:
-  
+
   %capybara%
-  
+
   Contacts:
-  
+
   %capybara%
 
   🕑 Working hours:
-  
+
   %capybara%
 
   🕑 Winter working hours:
-  
+
   %capybara%
 
   Student Careers Office - Scientific Area
 
   Mathematics Bachelor & Master Programs (L-LM)
-  
+
   %capybara%
 
   Master Program Bachelor Program (L)
-  
+
   %capybara%
-  
+
   Computer Science Master Program (LM)
-  
+
   %capybara%
 SEGR_CEA_TOOLTIP_ID: |-
   *Center for Computing Systems and Scientific and Educational Applications (CEA)*
-  
+
   Contacts:
-  
+
   %capybara%
-  
+
   Location:
-  
+
   %capybara%
-  
+
   Website:
-  
+
   %capybara%
 
 # /help-ERSU command
@@ -199,27 +204,27 @@ ERSU_OFFICE_TEXT_ID: "ERSU's Office"
 ERSU_URP_TEXT_ID: "URP"
 ERSU_TOOLTIP_ID: |-
   *ERSU Catania - Headquarters*
-  
+
   Location:
-  
+
   %capybara%
-  
+
   Contacts:
-  
+
   %capybara%
 
   🕑 Working hours:
-  
+
   %capybara%
 ERSU_OFFICE_TOOLTIP_ID: |-
   *ERSU Catania - Student ID Card Office*
-  
+
   Location:
-  
+
   %capybara%
-  
+
   🕑 Working hours:
-  
+
   %capybara%
 
   Location:
@@ -231,17 +236,17 @@ ERSU_OFFICE_TOOLTIP_ID: |-
   %capybara%
 ERSU_URP_TOOLTIP_ID: |-
   *URP Students*
-  
+
   Location:
-  
+
   %capybara%
-  
+
   Contacts:
-  
+
   %capybara%
 
   🕑 Working hours:
-  
+
   %capybara%
 
 # /help-projct/credits command
@@ -322,4 +327,4 @@ EXAMS_USAGE_TEXT_ID: |-
   Enter the name of the subject in the format:
     ins: subject_name
   Example:
-    ins: SisTeMi oPeRaTIvI
+    ins: SisTeMi oPeRaTIvI