ben
/
benbot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix strtolower of subcommands, start hangman

This commit is contained in:
Ben Harris 2017-05-01 02:56:28 -04:00
parent 52a8c6e659
commit ff0ee7361f
4 changed files with 77 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/BenBot.php
View File

@ -92,6 +92,16 @@ final class BenBot extends Discord
return;
}
if (Commands\Hangman::isGameOriginator($msg)) {
Commands\Hangman::initGameWithWord($msg);
return;
}
if (Commands\Hangman::isActive($msg)) {
Commands\Hangman::handleMove($msg);
return;
}
if ($str->startsWith(';')) {
// is command!

5
src/Command.php
View File

@ -29,7 +29,8 @@ final class Command
public function handle(Message $message, array $args)
{
$subCommand = strtolower(array_shift($args));
$subCommandOrig = array_shift($args);
$subCommand = strtolower($subCommandOrig);
if (array_key_exists($subCommand, $this->subCommands)) {
return $this->subCommands[$subCommand]->handle($message, $args);
@ -38,7 +39,7 @@ final class Command
}
if (!is_null($subCommand)) {
array_unshift($args, $subCommand);
array_unshift($args, $subCommandOrig);
}
return call_user_func_array($this->callable, [$message, $args]);

39
src/Commands/Hangman.php
View File

@ -31,9 +31,46 @@ final class Hangman
}
public static function isActive($msg)
{
$gameid = $msg->channel->id;
return isset(self::$bot->hangman[$gameid])
&& self::$bot->hangman[$gameid]['active'];
}
public static function isGameOriginator($msg)
{
return Utils::isDM($msg)
&& self::$bot->hangman['readygame']['originator']->id === $msg->author->id;
}
public static function initGameWithWord($msg)
{
$gameid = self::$bot->hangman['readygame']['gameid'];
self::$bot->hangman[$gameid]['secret_word'] = $msg->content;
self::$bot->hangman[$gameid]['active'] = true;
Utils::send(self::$bot->hangman['readygame']['origmsg'], "Game ready\n```" . self::$gallows . "```");
}
public static function startGame($msg, $args)
{
return "```" . self::$gallows . "```";
$gameid = $msg->channel->id;
self::$bot->hangman[$gameid] = [
'active' => false,
];
self::$bot->hangman['readygame'] = [
'originator' => $msg->author,
'gameid' => $gameid,
'origmsg' => $msg,
];
$msg->author->user->sendMessage("enter the secret word")->otherwise(function ($e) {
echo $e->getMessage(), PHP_EOL;
echo $e->getTraceAsString(), PHP_EOL;
});
return "waiting for {$msg->author} to enter a word";
}
}

56
src/Commands/Music.php
View File

@ -66,30 +66,15 @@ final class Music
public static function playFromYouTube($msg, $args)
{
$channel = self::getVoiceChannel($msg);
print_r($channel);
if (!$channel instanceof Channel) {
return "you're not in a voice channel, silly";
}
if (isset(self::$voiceclients[$msg->channel->guild->id]) && self::$voiceclients[$msg->channel->guild->id] instanceof VoiceClient) {
self::$voiceclients[$msg->channel->guild->id]->stop();
self::getVideoJSON($args)->then(function ($json) use ($msg) {
Utils::send($msg, "preparing...")->then(function ($statusmsg) use ($msg, $json) {
self::downloadAudio($json)->then(function ($file) use ($statusmsg, $msg) {
$statusmsg->channel->messages->delete($statusmsg);
self::$voiceclients[$msg->channel->guild->id]->playFile(self::$bot->dir . "/music/$file")->then(function () {
self::$voiceclients[$msg->channel->guild->id]->close();
}, function ($e) {
echo $e->getMessage(), PHP_EOL;
echo $e->getTraceAsString(), PHP_EOL;
});
});
});
});
}
self::getVideoJSON($args)->then(function ($json) use ($channel, $msg) {
Utils::send($msg, "preparing...")->then(function ($statusmsg) use ($channel, $msg, $json) {
Utils::send($msg, "getting info...")->then(function ($statusmsg) use ($channel, $msg, $args) {
self::getVideoJSON($args)->then(function ($json) use ($channel, $msg, $statusmsg) {
$statusmsg->content = "downloading...";
$statusmsg->channel->messages->save($statusmsg);
print_r($json);
self::downloadAudio($json)->then(function ($file) use ($channel, $statusmsg, $msg) {
$statusmsg->channel->messages->delete($statusmsg);
self::$bot->joinVoiceChannel($channel)->then(function (VoiceClient $vc) use ($file, $msg) {
@ -100,8 +85,17 @@ final class Music
echo $e->getMessage(), PHP_EOL;
echo $e->getTraceAsString(), PHP_EOL;
});
}, function ($e) {
echo $e->getMessage(), PHP_EOL;
echo $e->getTraceAsString(), PHP_EOL;
});
}, function ($e) {
echo $e->getMessage(), PHP_EOL;
echo $e->getTraceAsString(), PHP_EOL;
});
}, function ($e) {
echo $e->getMessage(), PHP_EOL;
echo $e->getTraceAsString(), PHP_EOL;
});
});
}
@ -146,27 +140,30 @@ final class Music
$cmd = "youtube-dl --dump-single-json ";
if ($args[0] != "") {
if (strlen($args[0]) === 11 || strpos($args[0], "http") !== false) {
// is yt vid ID or URL
$cmd .= $args[0];
if (strlen($args[0]) === 11) {
$cmd .= "https://www.youtube.com/watch?v={$args[0]}";
} elseif (strpos($args[0], "youtube.com") !== false) {
$cmd = $args[0];
} else {
$query = implode(" ", $args);
$cmd .= "'ytsearch:$query'";
}
}
echo $cmd, PHP_EOL;
$process = new Process($cmd);
$process->on('exit', function ($exitcode, $termsig) use (&$data, $deferred) {
if (intval($exitcode) === 1) {
$deferred->reject("invalid url");
if (intval($exitcode) == 1) {
$deferred->reject();
} else {
$deferred->resolve(json_decode($data));
}
echo "$exitcode, $termsig", PHP_EOL;
});
self::$bot->loop->addTimer(0.001, function ($timer) use (&$data, $deferred, $process) {
self::$bot->loop->addTimer(0.001, function () use (&$data, $process) {
$process->start(self::$bot->loop);
$process->stderr->on('data', function ($output) {
echo $output, PHP_EOL;
});
$process->stdout->on('data', function ($output) use (&$data) {
$data .= $output;
});
@ -179,8 +176,7 @@ final class Music
private static function downloadAudio($result)
{
$deferred = new Deferred();
$json = $result->entries[0];
$json = $result->entries[0] ?? $result;
$url = escapeshellarg($json->webpage_url);
$filename = $json->id . '-' . md5($json->title) . '-' . $json->duration;
@ -194,7 +190,7 @@ final class Music
$file = escapeshellarg(self::$bot->dir . "/music/$filename.%(ext)s");
$cmd = "youtube-dl --extract-audio --audio-format mp3 --audio-quality 0 --restrict-filenames --no-check-certificate --no-warnings --source-address 0.0.0.0 -o $file $url";
$cmd = "youtube-dl --extract-audio --audio-format mp3 --audio-quality 0 --restrict-filenames --no-playlist --no-check-certificate --no-warnings --source-address 0.0.0.0 -o $file $url";
echo $cmd, PHP_EOL;
$process = new Process($cmd);