Merge branch 'master' into tcg_random

README.md

 ## SRVPro
 一个YGOPro服务器。
 
-现用于[萌卡](https://mycard.moe/)和[YGOPro 233服](https://ygo233.com/)。
+现用于[萌卡](https://mycard.moe/)，[YGOPro 233服](https://ygo233.com/)和[YGOPro Koishi服](http://koishi.222diy.gdn/)。
 
 ### 支持功能
 * Linux上运行

ygopro-server.coffee

@@ -2781,7 +2781,7 @@ ygopro.ctos_follow 'CHAT', true, (buffer, info, client, server)->
       ygopro.stoc_send_random_tip(client) if settings.modules.tips.enabled
 
     when '/ai'
-      if settings.modules.windbot.enabled
+      if settings.modules.windbot.enabled and client.is_host and !settings.modules.challonge.enabled
         if name = cmd[1]
           windbot = _.sample _.filter windbots, (w)->
             w.name == name or w.deck == name

ygopro-server.js

@@ -3518,7 +3518,7 @@
         }
         break;
       case '/ai':
-        if (settings.modules.windbot.enabled) {
+        if (settings.modules.windbot.enabled && client.is_host && !settings.modules.challonge.enabled) {
           if (name = cmd[1]) {
             windbot = _.sample(_.filter(windbots, function(w) {
               return w.name === name || w.deck === name;