Merge pull request #6 from samuele794/TakaoV2.1

Takao v2.0.1

.gitignore

@@ -56,3 +56,5 @@ hs_err_pid*
 gradle/wrapper/gradle-wrapper.jar
 src/main/resources/application-dev.properties
 src/main/resources/application-prod.properties
+.scannerwork/
+TakaoLog/

build.gradle

@@ -10,8 +10,8 @@ plugins {
 
 apply plugin: 'io.spring.dependency-management'
 
-group = 'it.discordbot'
-version = '2.0'
+group = 'it.github.samuele794.takaobot'
+version = '2.0.1'
 sourceCompatibility = '1.8'
 
 repositories {
@@ -85,9 +85,14 @@ dependencies {
     // https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-web
     implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '2.1.4.RELEASE'
     implementation "com.fasterxml.jackson.module:jackson-module-kotlin:2.9.+"
+    // https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-data-redis
+    implementation group: 'org.springframework.boot', name: 'spring-boot-starter-data-redis', version: '2.1.5.RELEASE'
 
+    // https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-actuator
+//    compile group: 'org.springframework.boot', name: 'spring-boot-starter-actuator', version: '2.1.5.RELEASE'
 
     implementation 'net.dv8tion:JDA:3.8.3_463'
+    implementation 'com.jagrosh:jda-utilities:2.1.5'
 
     //RSS + HTML PARSER
     // https://mvnrepository.com/artifact/com.rometools/rome
@@ -102,6 +107,8 @@ dependencies {
     //POSTGRESQL DRIVER
     // https://mvnrepository.com/artifact/org.postgresql/postgresql
     implementation group: 'org.postgresql', name: 'postgresql', version: '42.2.5'
+    // https://mvnrepository.com/artifact/redis.clients/jedis
+    implementation group: 'redis.clients', name: 'jedis', version: '2.9.0'
 
     //TwitterAPI
     // https://mvnrepository.com/artifact/org.twitter4j/twitter4j-core

docs/files/application-dev.properties

@@ -17,4 +17,9 @@ spring.datasource.driver-class-name=org.postgresql.Driver
 spring.jpa.hibernate.ddl-auto=update
 spring.jpa.show-sql=true
 spring.jpa.hibernate.naming.physical-strategy =org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
-#spring.jpa.properties.hibernate.format_sql=true
+#spring.jpa.properties.hibernate.format_sql=true
+
+#redis
+spring.redis.host=<change>
+spring.redis.port=<change>
+spring.redis.password=<change>

docs/page/commands.html

@@ -132,7 +132,7 @@ <h2 class="no_toc">TakaoBot</h2>
 	<div class="container">
 		<div class="row">
 			<div class="col-12 col-lg-4">
-				<nav class=" navbar it-navscroll-wrapper navbar-expand-lg it-top-navscroll it-left-side affix-top ">
+				<nav class=" navbar it-navscroll-wrapper navbar-expand-lg it-top-navscroll it-left-side affix-top " style="z-index: 1">
 					<button class="custom-navbar-toggler" type="button" aria-controls="navbarNav" aria-expanded="false"
 						aria-label="Toggle navigation" data-target="#navbarNav" onclick="hideTop()">
 						<span class="it-list"></span>
@@ -245,6 +245,31 @@ <h3>Indice</h3>
 													<a class="nav-link" href="#3_2" onclick="showTop()"><span>ATM Alert
 															Stop</span></a>
 												</li>
+												<li class="nav-link">
+													<a class="nav-link" href="#3_3" onclick="showTop()">
+														<span>ATM Metro Status</span>
+													</a>
+												</li>
+											</ul>
+										</div>
+									</div>
+									<div class="collapse-header" id="headingA4">
+										<button data-toggle="collapse" data-target="#accordion4" aria-expanded="false" aria-controls="accordion4">
+											Comandi Immagini
+										</button>
+									</div>
+									<div id="accordion4" class="collapse" role="tabpanel" aria-labelledby="headingA3" data-parent="#accordionDiv1">
+										<div class="collapse-body">
+											<ul>
+												<li class="nav-link">
+													<a class="nav-link" href="#4_1" onclick="showTop()">
+														<span>Random Picsum</span></a>
+												</li>
+
+												<li class="nav-link">
+													<a class="nav-link" href="#4_2" onclick="showTop()">
+														<span>Custom Picsum</span></a>
+												</li>
 											</ul>
 										</div>
 									</div>
@@ -394,6 +419,35 @@ <h4 class="it-page-section" id="3_2">ATM Alert Start</h4>
 					<br />
 					Il comando può essere lanciato su qualunque canale
 				</p>
+				<br />
+				<h4 class="it-page-section" id="3_3">ATM Metro Status</h4>
+				<p>
+					<kbd>%ATMMetroStatus</kbd> / <kbd>%ATMStatoMetro</kbd><br />
+					Questo comando permette di ottenere lo stato attuale della rircolazione nella metro ATM
+					<br />
+					Il comando può essere lanciato su qualunque canale
+				</p>
+
+
+
+				<h2 class="it-page-section" id="4">
+					Comandi Immagini
+				</h2>
+				<br>
+				<h4 class="it-page-section" id="4_1">Random Picsum</h4>
+				<p>
+					<kbd>%randomPicsum</kbd><br />
+					Questo comando ti restituisce un immagine casuale da LoremPicsum. <br>
+					Il comando può essere lanciato su qualunque canale
+					<br /><br />
+				</p>
+				<br />
+				<h4 class="it-page-section" id="4_2">Custom Picsum</h4>
+				<p>
+					<kbd>%customPicsum</kbd><br />
+					Questo comando ti permette di ottenere un immagine da LoremPicsum, in base a dei parametri. <br>
+					Il comando può essere lanciato su qualunque canale
+				</p>
 
 				<!-- <h3 class="it-page-section" id="1_2_0">Nested item 1.2</h3>
 			 <p>Proin placerat ipsum massa, ac commodo velit tempor quis. In ante augue,sodales ac rhoncus in, ultricies

docs/page/kotlindoc/alltypes/index.html

@@ -10,7 +10,7 @@ <h3>All Types</h3>
 <tbody>
 <tr>
 <td>
-<a href="../it.discordbot.command.tpl.atm-alert/-a-t-m-command/index.html">it.discordbot.command.tpl.atmAlert.ATMCommand</a></td>
+<a href="../it.discordbot.command.tpl.atm/-a-t-m-command/index.html">it.discordbot.command.tpl.atm.ATMCommand</a></td>
 <td>
 <p>Per i comandi dell'ATM</p>
 </td>
@@ -24,21 +24,28 @@ <h3>All Types</h3>
 </tr>
 <tr>
 <td>
-<a href="../it.discordbot.command.tpl.atm-alert/-a-t-m-r-s-s-reader/index.html">it.discordbot.command.tpl.atmAlert.ATMRSSReader</a></td>
+<a href="../it.discordbot.command.tpl.atm.girocitta.status/-a-t-m-metro-status/index.html">it.discordbot.command.tpl.atm.girocitta.status.ATMMetroStatus</a></td>
+<td>
+<p>Classe per leggere e interpretare lo stato della metro ATm</p>
+</td>
+</tr>
+<tr>
+<td>
+<a href="../it.discordbot.command.tpl.atm.-r-s-s/-a-t-m-r-s-s-reader/index.html">it.discordbot.command.tpl.atm.RSS.ATMRSSReader</a></td>
 <td>
 <p>Classe per leggere il feed RSS di atm</p>
 </td>
 </tr>
 <tr>
 <td>
-<a href="../it.discordbot.command.tpl.atm-alert/-a-t-m-r-s-s-scheduler/index.html">it.discordbot.command.tpl.atmAlert.ATMRSSScheduler</a></td>
+<a href="../it.discordbot.command.tpl.atm.-r-s-s/-a-t-m-r-s-s-scheduler/index.html">it.discordbot.command.tpl.atm.RSS.ATMRSSScheduler</a></td>
 <td>
 <p>Classe per la schedulaziooe dei messaggi RSS di ATM</p>
 </td>
 </tr>
 <tr>
 <td>
-<a href="../it.discordbot.command.tpl.atm-alert/-a-t-m-twitter-scheduler/index.html">it.discordbot.command.tpl.atmAlert.ATMTwitterScheduler</a></td>
+<a href="../it.discordbot.command.tpl.atm.twitter/-a-t-m-twitter-scheduler/index.html">it.discordbot.command.tpl.atm.twitter.ATMTwitterScheduler</a></td>
 <td>
 <p>Classe per la schedulaziooe dei messaggi Twitter di ATM</p>
 </td>
@@ -95,6 +102,7 @@ <h3>All Types</h3>
 <td>
 <a href="../it.discordbot.command.-b-d-o.-r-s-s/-b-d-o-patch-r-s-s-scheduler/index.html">it.discordbot.command.BDO.RSS.BDOPatchRSSScheduler</a></td>
 <td>
+<p>Scheduler RSS per le patch di BDO</p>
 </td>
 </tr>
 <tr>
@@ -106,7 +114,7 @@ <h3>All Types</h3>
 </tr>
 <tr>
 <td>
-<a href="../it.discordbot.beans.boss/-boss/index.html">it.discordbot.beans.boss.Boss</a></td>
+<a href="../it.discordbot.beans.bdo.boss/-boss/index.html">it.discordbot.beans.bdo.boss.Boss</a></td>
 <td>
 <p>Classe contenitore dei boss in una determinata ora</p>
 </td>
@@ -120,14 +128,20 @@ <h3>All Types</h3>
 </tr>
 <tr>
 <td>
+<a href="../it.discordbot.core/-emoji-container/index.html">it.discordbot.core.EmojiContainer</a></td>
+<td>
+</td>
+</tr>
+<tr>
+<td>
 <a href="../it.discordbot.command.general-command/-general-command/index.html">it.discordbot.command.generalCommand.GeneralCommand</a></td>
 <td>
 <p>Listener per contenere comandi di uso generale e di configurazione del bot</p>
 </td>
 </tr>
 <tr>
 <td>
-<a href="../it.discordbot.beans.boss/-giorno/index.html">it.discordbot.beans.boss.Giorno</a></td>
+<a href="../it.discordbot.beans.bdo.boss/-giorno/index.html">it.discordbot.beans.bdo.boss.Giorno</a></td>
 <td>
 <p>Classe contenitore dei boss del giorno</p>
 </td>
@@ -140,13 +154,33 @@ <h3>All Types</h3>
 </tr>
 <tr>
 <td>
+<a href="../it.discordbot.beans.image/-image-command-proxy/index.html">it.discordbot.beans.image.ImageCommandProxy</a></td>
+<td>
+<p>Proxy per restituire bean dei comandi per immagini</p>
+</td>
+</tr>
+<tr>
+<td>
+<a href="../it.discordbot.command.image/-images-command/index.html">it.discordbot.command.image.ImagesCommand</a></td>
+<td>
+<p>Comandi relativi alle immagini</p>
+</td>
+</tr>
+<tr>
+<td>
 <a href="../it.discordbot.core/-j-d-a-controller/index.html">it.discordbot.core.JDAController</a></td>
 <td>
 <p>Classe principale di avviamento del Bot Discord</p>
 </td>
 </tr>
 <tr>
 <td>
+<a href="../it.discordbot.database/-jedis-client/index.html">it.discordbot.database.JedisClient</a></td>
+<td>
+</td>
+</tr>
+<tr>
+<td>
 <a href="../it.discordbot.command.general-command/-join-listener/index.html">it.discordbot.command.generalCommand.JoinListener</a></td>
 <td>
 <p>Listener per contenere quando il bot entra o esce
@@ -155,6 +189,40 @@ <h3>All Types</h3>
 </tr>
 <tr>
 <td>
+<a href="../it.discordbot.beans.atm/-linea-metro-a-t-m/index.html">it.discordbot.beans.atm.LineaMetroATM</a></td>
+<td>
+<p>Oggetto che rappresenta una linea della metro atm.</p>
+</td>
+</tr>
+<tr>
+<td>
+<a href="../it.discordbot.command.image.lorempicsum/-lorem-picsum-command/index.html">it.discordbot.command.image.lorempicsum.LoremPicsumCommand</a></td>
+<td>
+</td>
+</tr>
+<tr>
+<td>
+<a href="../it.discordbot.command.image.lorempicsum/-lorem-picsum-retreiver/index.html">it.discordbot.command.image.lorempicsum.LoremPicsumRetreiver</a></td>
+<td>
+<p>Classe che si occupa di ottenere il link delle immagini dal LoremPicsum</p>
+</td>
+</tr>
+<tr>
+<td>
+<a href="../it.discordbot.beans.image/-lorem-picsum-state-machine/index.html">it.discordbot.beans.image.LoremPicsumStateMachine</a></td>
+<td>
+<p>Macchina a stati per gestire la customizzzazione della chiamata a LoremPicsum</p>
+</td>
+</tr>
+<tr>
+<td>
+<a href="../it.discordbot.beans.atm/-metro-direzione-status/index.html">it.discordbot.beans.atm.MetroDirezioneStatus</a></td>
+<td>
+<p>Oggetto che rappresenta la direzione della linea e il suo stato attuale</p>
+</td>
+</tr>
+<tr>
+<td>
 <a href="../it.discordbot.command.music/-music-command/index.html">it.discordbot.command.music.MusicCommand</a></td>
 <td>
 </td>
@@ -167,9 +235,14 @@ <h3>All Types</h3>
 </tr>
 <tr>
 <td>
-<a href="../it.discordbot.beans/-r-s-s-link/index.html">it.discordbot.beans.RSSLink</a></td>
+<a href="../it.discordbot.beans.riot/-riot-manager/index.html">it.discordbot.beans.riot.RiotManager</a></td>
+<td>
+</td>
+</tr>
+<tr>
+<td>
+<a href="../it.discordbot.database.filter/-r-s-s-link-interface/index.html">it.discordbot.database.filter.RSSLinkInterface</a></td>
 <td>
-<p>Entità che rappresenta la tabella contenitore dei link RSS</p>
 </td>
 </tr>
 <tr>
@@ -236,14 +309,32 @@ <h3>All Types</h3>
 </tr>
 <tr>
 <td>
+<a href="../it.discordbot.command.pattern/-state-machine/index.html">it.discordbot.command.pattern.StateMachine</a></td>
+<td>
+</td>
+</tr>
+<tr>
+<td>
+<a href="../it.discordbot.beans.riot.dao.data/-summoner/index.html">it.discordbot.beans.riot.dao.data.Summoner</a></td>
+<td>
+</td>
+</tr>
+<tr>
+<td>
+<a href="../it.discordbot.beans.riot.dao.call/-summoner-call/index.html">it.discordbot.beans.riot.dao.call.SummonerCall</a></td>
+<td>
+</td>
+</tr>
+<tr>
+<td>
 <a href="../it.discordbot.core/-takao-log/index.html">it.discordbot.core.TakaoLog</a></td>
 <td>
 <p>Logger Unico per il bot</p>
 </td>
 </tr>
 <tr>
 <td>
-<a href="../it.discordbot/-test-command/index.html">it.discordbot.TestCommand</a></td>
+<a href="../it.discordbot.test/-test-command/index.html">it.discordbot.test.TestCommand</a></td>
 <td>
 </td>
 </tr>