From 78b11d1fb55a0cea7985c6cb71853a50d403a331 Mon Sep 17 00:00:00 2001
From: Terry Geng <gengyanda@gmail.com>
Date: Tue, 25 Feb 2020 19:39:05 +0800
Subject: [PATCH] fix: missed token part for joinme

---
 command.py                | 4 ++--
 configuration.default.ini | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/command.py b/command.py
index 75cdffb..3e7c8d1 100644
--- a/command.py
+++ b/command.py
@@ -66,8 +66,8 @@ def send_multi_lines(bot, lines, text):
 
 
 def cmd_joinme(bot, user, text, command, parameter):
-    channel_id = bot.mumble.users[text.actor]['channel_id']
-    bot.mumble.channels[channel_id].move_in()
+    bot.mumble.users.myself.move_in(
+        bot.mumble.users[text.actor]['channel_id'], token=parameter)
 
 
 def cmd_user_ban(bot, user, text, command, parameter):
diff --git a/configuration.default.ini b/configuration.default.ini
index 818401d..08b0f67 100644
--- a/configuration.default.ini
+++ b/configuration.default.ini
@@ -214,7 +214,7 @@ help = <h3>Commands</h3>
        </ul>
        <b>Other</b>
        <ul>
-       <li> <b>!<u>j</u>oinme </b> - join your own channel </li>
+       <li> <b>!<u>j</u>oinme {token} </b> - join your own channel with {token}.</li>
        </ul>
 
 admin_help = <h3>Admin command</h3>