Merge branch 'master' into feature/format

Author: CodeDoctorDE

README.md

@@ -23,6 +23,19 @@ Java bot with many features. Developed by @CodeDoctorDE (Discord: CodeDoctor#871
 ### What is it?
 Guess what word the writer has chosen. This is a turn based game. Every player can join in.
 
+# Contributing
+
+To contribute, fork this repository and create a pull request. If you want you can also join my discord. If you contribute more, you can get the contributor role.
+
+## Branches
+
+Name | Description
+--- | ---
+feature/* | Every new feature will developed here
+hotfix/* | Fixing bugs will be developed here
+master | Every feature and hotfix will be merged here 
+stable | Stable changes will be merged here
+
 # Current servers
 You can visit my bot on this servers:
 * [KniffelGames](https://discord.gg/J7EUgvN)

src/main/java/com/github/codedoctorde/linwood/apps/single/game/mode/whatisit/WhatIsItEvents.java

@@ -6,6 +6,7 @@
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import net.dv8tion.jda.api.events.message.react.MessageReactionAddEvent;
 import net.dv8tion.jda.api.events.message.react.MessageReactionRemoveEvent;
+import net.dv8tion.jda.api.exceptions.PermissionException;
 import net.dv8tion.jda.api.hooks.SubscribeEvent;
 
 import java.text.MessageFormat;
@@ -40,6 +41,9 @@ public void onGuess(MessageReceivedEvent event){
             }
             session.close();
         }
+        catch(PermissionException e){
+            e.printStackTrace();
+        }
         catch(Exception e){
             e.printStackTrace();
             Sentry.capture(e);
@@ -51,6 +55,9 @@ public void onWord(MessageReceivedEvent event) {
             if (event.getChannelType() == ChannelType.PRIVATE && whatIsIt.getRound() != null && whatIsIt.getRound().getWriterId() == event.getAuthor().getIdLong() && whatIsIt.getRound().getWord() == null)
                 whatIsIt.getRound().startRound(event.getMessage().getContentStripped());
         }
+        catch(PermissionException e){
+            e.printStackTrace();
+        }
         catch(Exception e){
             e.printStackTrace();
             Sentry.capture(e);
@@ -83,6 +90,9 @@ public void onJoin(MessageReactionAddEvent event){
                 session.close();
             });
         }
+        catch(PermissionException e){
+            e.printStackTrace();
+        }
         catch(Exception e){
             e.printStackTrace();
             Sentry.capture(e);
@@ -99,6 +109,9 @@ public void onLeave(MessageReactionRemoveEvent event){
                 session.close();
             });
         }
+        catch(PermissionException e){
+            e.printStackTrace();
+        }
         catch(Exception e){
             e.printStackTrace();
             Sentry.capture(e);

src/main/java/com/github/codedoctorde/linwood/listener/CommandListener.java

@@ -5,6 +5,8 @@
 import io.sentry.Sentry;
 import net.dv8tion.jda.api.entities.ChannelType;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.exceptions.InsufficientPermissionException;
+import net.dv8tion.jda.api.exceptions.PermissionException;
 import net.dv8tion.jda.api.hooks.SubscribeEvent;
 import org.apache.tools.ant.types.Commandline;
 
@@ -45,7 +47,10 @@ else if (content.startsWith(normalMention))
                 try {
                     if (!Linwood.getInstance().getBaseCommand().onCommand(session, event.getMessage(), guild, prefix, command))
                         event.getChannel().sendMessageFormat(bundle.getString("Syntax"), commandBundle.getString("Syntax")).queue();
-                } catch (Exception e) {
+                }catch(PermissionException e){
+                    event.getChannel().sendMessage(bundle.getString("InsufficientPermission")).queue();
+                    e.printStackTrace();
+                }catch (Exception e) {
                     event.getChannel().sendMessage(bundle.getString("Error")).queue();
                     e.printStackTrace();
                     Sentry.capture(e);

src/main/resources/locale/Command_de.properties

@@ -1,3 +1,4 @@
 Syntax=Falsche Benutzung. Bitte nutze: \n%s
 Error=Ein unerwarteter Fehler ist passiert! Sollte es noch einmal passieren, kontaktiere bitte den Entwickler
 NoPermission=:no_entry_sign: Keine Rechte!
+InsufficientPermission=**:warning: Der Bot hat keine Rechte dies zu tun! :warning: **

src/main/resources/locale/Command_en.properties

@@ -1,3 +1,4 @@
 Syntax=Wrong usage. Please use: \n%s
 Error=An error has occurred! Please contact the developer if it happens multiple times!
 NoPermission=:no_entry_sign: No permission!
+InsufficientPermission=**:warning: The bot has no permission to do this! :warning: **