sebclem/ClaptrapBot
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases 1 Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Alexandre CABANNE 2019-01-11 09:07:09 +01:00
commit 6f2c4d35db
7 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/Broken/Commands/Cat.java
View File

@ -43,7 +43,7 @@ public class Cat implements Commande {
} }
} }
else else
event.getPrivateChannel().sendMessage("\n:warning: **__Commande non disponible en priver!__** :warning:"); event.getPrivateChannel().sendMessage("\n:warning: **__Commande non disponible en privée!__** :warning:");
} }

2
src/main/java/net/Broken/Commands/Help.java
View File

@ -125,7 +125,7 @@ public class Help implements Commande {
txt += nsfwTable.build(); txt += nsfwTable.build();
if(!event.isFromType(ChannelType.PRIVATE)){ if(!event.isFromType(ChannelType.PRIVATE)){
Message rest = event.getTextChannel().sendMessage(new EmbedBuilder().setTitle("Commands send by private message").setColor(Color.green).build()).complete(); Message rest = event.getTextChannel().sendMessage(new EmbedBuilder().setTitle("Commands sent by private message").setColor(Color.green).build()).complete();
new MessageTimeOut(MainBot.messageTimeOut, rest, event.getMessage()).start(); new MessageTimeOut(MainBot.messageTimeOut, rest, event.getMessage()).start();
} }

8
src/main/java/net/Broken/Commands/Move.java
View File

@ -23,7 +23,7 @@ import java.util.List;
public class Move implements Commande { public class Move implements Commande {
Logger logger = LogManager.getLogger(); Logger logger = LogManager.getLogger();
private String HELP="`//move <@utilisateur> <@rôleCible>`\n:arrow_right:\t*Deplacement d'un utilisateur vers un rôle cible, attention à bien faire des montions.*"; private String HELP="`//move <@utilisateur> <@rôleCible>`\n:arrow_right:\t*Deplacement d'un utilisateur vers un rôle cible, attention à bien faire les mentions.*";
public List<Role> saveRoleUser; public List<Role> saveRoleUser;
public Member user; public Member user;
public Guild serveur; public Guild serveur;
@ -90,7 +90,7 @@ public class Move implements Commande {
if(userL.size()<1 ||roleL.size()<1) if(userL.size()<1 ||roleL.size()<1)
{ {
logger.warn("Mentionnement Incorect."); logger.warn("Mention Incorect.");
Message rest = event.getTextChannel().sendMessage(EmbedMessageUtils.getMoveError("Utilisateur ou Role mal mentioner.")).complete(); Message rest = event.getTextChannel().sendMessage(EmbedMessageUtils.getMoveError("Utilisateur ou Role mal mentioner.")).complete();
List<Message> messages = new ArrayList<Message>(){{ List<Message> messages = new ArrayList<Message>(){{
add(rest); add(rest);
@ -159,8 +159,8 @@ public class Move implements Commande {
} }
else else
{ {
logger.warn("Arguments maquant."); logger.warn("Arguments maquants.");
Message rest = event.getTextChannel().sendMessage(EmbedMessageUtils.getMoveError("Arguments manquant.")).complete(); Message rest = event.getTextChannel().sendMessage(EmbedMessageUtils.getMoveError("Arguments manquants.")).complete();
List<Message> messages = new ArrayList<Message>(){{ List<Message> messages = new ArrayList<Message>(){{
add(rest); add(rest);
add(event.getMessage()); add(event.getMessage());

4
src/main/java/net/Broken/Commands/Music.java
View File

@ -135,7 +135,7 @@ public class Music implements Commande {
break; break;
default: default:
Message message = event.getTextChannel().sendMessage(EmbedMessageUtils.getMusicError("Arguments inconu!")).complete(); Message message = event.getTextChannel().sendMessage(EmbedMessageUtils.getMusicError("Arguments inconnus!")).complete();
List<Message> messagess = new ArrayList<Message>(){{ List<Message> messagess = new ArrayList<Message>(){{
add(message); add(message);
add(event.getMessage()); add(event.getMessage());
@ -146,7 +146,7 @@ public class Music implements Commande {
} }
} }
else{ else{
Message message = event.getTextChannel().sendMessage(EmbedMessageUtils.getMusicError("Arguments manquant!")).complete(); Message message = event.getTextChannel().sendMessage(EmbedMessageUtils.getMusicError("Arguments manquants!")).complete();
List<Message> messages = new ArrayList<Message>(){{ List<Message> messages = new ArrayList<Message>(){{
add(message); add(message);
add(event.getMessage()); add(event.getMessage());

4
src/main/resources/templates/header.html
View File

@ -1,4 +1,4 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" xmlns:th="http://www.thymeleaf.org"> <html lang="en" xmlns:th="http://www.thymeleaf.org">
<head> <head>
@ -134,7 +134,7 @@
<div id="modal_internet" class="modal"> <div id="modal_internet" class="modal">
<div class="modal-content" style="padding-bottom: 0px"> <div class="modal-content" style="padding-bottom: 0px">
<div class="row" style="margin-bottom: 0px"> <div class="row" style="margin-bottom: 0px">
<h3 class="col l12 m 12 s12 center red-text">Can't connect to server!</h3> <h3 class="col l12 m 12 s12 center red-text">Can't connect to the server!</h3>
<div class="col l6 offset-l3 offset-m1 m10 offset-s1 s10 center"> <div class="col l6 offset-l3 offset-m1 m10 offset-s1 s10 center">
<p> Please check your connection and reload the app!</p> <p> Please check your connection and reload the app!</p>
</div> </div>

6
src/main/resources/templates/index.html
View File

@ -1,4 +1,4 @@
<!DOCTYPE html> <!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org"> <html xmlns:th="http://www.thymeleaf.org">
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
@ -53,7 +53,7 @@
<img src="/favicon.png" class="responsive-img"/> <img src="/favicon.png" class="responsive-img"/>
<div class="card blue-grey"> <div class="card blue-grey">
<div class="card-content white-text center z-depth-5"> <div class="card-content white-text center z-depth-5">
<span class="card-title">Add me to you'r server !</span> <span class="card-title">Add me to your server !</span>
<a class="btn green" th:href="${inviteLink}" target="_blank">Invite me !</a> <a class="btn green" th:href="${inviteLink}" target="_blank">Invite me !</a>
</div> </div>
</div> </div>
@ -90,7 +90,7 @@
<h2 class="flow-text">Home Page Comming soon!</h2> <h2 class="flow-text">Home Page Comming soon!</h2>
<div class="card blue-grey"> <div class="card blue-grey">
<div class="card-content white-text center z-depth-4"> <div class="card-content white-text center z-depth-4">
<span class="card-title">Add me to you'r server !</span> <span class="card-title">Add me to your server !</span>
<a class="btn green waves-effect" th:href="${inviteLink}" target="_blank">Invite me !</a> <a class="btn green waves-effect" th:href="${inviteLink}" target="_blank">Invite me !</a>
</div> </div>
</div> </div>

4
src/main/resources/templates/register.html
View File

@ -1,4 +1,4 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" xmlns:th="http://www.thymeleaf.org"> <html lang="en" xmlns:th="http://www.thymeleaf.org">
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
@ -71,7 +71,7 @@
<div class="row"> <div class="row">
<div class="col s10 offset-s1"> <div class="col s10 offset-s1">
<p class="center"> <p class="center">
A validation code was sent by private message, please copy it below. A validation code has been sent by private message, please copy it below.
</p> </p>
</div> </div>
</div> </div>