@@ -22,10 +22,7 @@ |
||
| 22 | 22 | * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE |
| 23 | 23 | * SOFTWARE. |
| 24 | 24 | */ |
| 25 | -use Discord\Discord; |
|
| 26 | 25 | use Discord\Parts\Channel\Channel; |
| 27 | -use Discord\Parts\User\User; |
|
| 28 | -use Discord\WebSockets\Event; |
|
| 29 | 26 | |
| 30 | 27 | /** |
| 31 | 28 | * Class fileAuthCheck. |
@@ -136,11 +136,11 @@ discard block |
||
| 136 | 136 | } |
| 137 | 137 | |
| 138 | 138 | // Send the info to the channel |
| 139 | - $msg = $discordName.' roles have been removed via the auth.'; |
|
| 139 | + $msg = $discordName . ' roles have been removed via the auth.'; |
|
| 140 | 140 | $channelID = $toDiscordChannel; |
| 141 | 141 | $channel = Channel::find($channelID); |
| 142 | 142 | $channel->sendMessage($msg, false); |
| 143 | - $this->logger->addInfo($discordName." roles ({$role}) have been removed via the auth."); |
|
| 143 | + $this->logger->addInfo($discordName . " roles ({$role}) have been removed via the auth."); |
|
| 144 | 144 | |
| 145 | 145 | $sql = "UPDATE authUsers SET active='no' WHERE discordID='$discordID'"; |
| 146 | 146 | $conn->query($sql); |
@@ -164,11 +164,11 @@ discard block |
||
| 164 | 164 | } |
| 165 | 165 | |
| 166 | 166 | // Send the info to the channel |
| 167 | - $msg = $discordName.' roles have been removed because their name no longer matches their ingame name.'; |
|
| 167 | + $msg = $discordName . ' roles have been removed because their name no longer matches their ingame name.'; |
|
| 168 | 168 | $channelID = $toDiscordChannel; |
| 169 | 169 | $channel = Channel::find($channelID); |
| 170 | 170 | $channel->sendMessage($msg, false); |
| 171 | - $this->logger->addInfo($discordName.' roles have been removed because their name no longer matches their ingame name.'); |
|
| 171 | + $this->logger->addInfo($discordName . ' roles have been removed because their name no longer matches their ingame name.'); |
|
| 172 | 172 | |
| 173 | 173 | $sql = "UPDATE authUsers SET active='no' WHERE discordID='$discordID'"; |
| 174 | 174 | $conn->query($sql); |
@@ -56,7 +56,7 @@ |
||
| 56 | 56 | ], |
| 57 | 57 | ]; |
| 58 | 58 | |
| 59 | -$config['enabledPlugins'] = [ // remove the slashes for the plugins you want |
|
| 59 | +$config['enabledPlugins'] = [// remove the slashes for the plugins you want |
|
| 60 | 60 | 'about', //info on the bot |
| 61 | 61 | 'auth', //sso based auth system |
| 62 | 62 | 'authCheck', // checks if users have left corp or alliance |
@@ -153,7 +153,7 @@ |
||
| 153 | 153 | $sentBy = $mail['senderName']; |
| 154 | 154 | $title = $mail['title']; |
| 155 | 155 | $sentDate = $mail['sentDate']; |
| 156 | - $url = "https://api.eveonline.com/char/MailBodies.xml.aspx?keyID={$keyID}&vCode={$vCode}&characterID={$characterID}&ids=".$mail['messageID']; |
|
| 156 | + $url = "https://api.eveonline.com/char/MailBodies.xml.aspx?keyID={$keyID}&vCode={$vCode}&characterID={$characterID}&ids=" . $mail['messageID']; |
|
| 157 | 157 | $content = strip_tags(str_replace('<br>', "\n", json_decode(json_encode(simplexml_load_string(downloadData($url), 'SimpleXMLElement', LIBXML_NOCDATA)))->result->rowset->row)); |
| 158 | 158 | |
| 159 | 159 | // Blank Content Check |
@@ -105,9 +105,9 @@ discard block |
||
| 105 | 105 | |
| 106 | 106 | $this->maxID = max($id, $this->maxID); |
| 107 | 107 | |
| 108 | - $url = 'https://twitter.com/'.$screenName[0].'/status/'.$id; |
|
| 109 | - $message = ['message' => $text[0], 'postedAt' => $createdAt[0], 'postedBy' => $postedBy[0], 'screenName' => $screenName[0], 'url' => $url.$id[0]]; |
|
| 110 | - $msg = '**@'.$screenName[0].'** ('.$message['postedBy'].') / '.htmlspecialchars_decode($message['message']); |
|
| 108 | + $url = 'https://twitter.com/' . $screenName[0] . '/status/' . $id; |
|
| 109 | + $message = ['message' => $text[0], 'postedAt' => $createdAt[0], 'postedBy' => $postedBy[0], 'screenName' => $screenName[0], 'url' => $url . $id[0]]; |
|
| 110 | + $msg = '**@' . $screenName[0] . '** (' . $message['postedBy'] . ') / ' . htmlspecialchars_decode($message['message']); |
|
| 111 | 111 | $messages[$id] = $msg; |
| 112 | 112 | |
| 113 | 113 | $continue = true; |
@@ -142,7 +142,7 @@ discard block |
||
| 142 | 142 | */ |
| 143 | 143 | public function shortenUrl($url) |
| 144 | 144 | { |
| 145 | - return file_get_contents('http://is.gd/api.php?longurl='.$url); |
|
| 145 | + return file_get_contents('http://is.gd/api.php?longurl=' . $url); |
|
| 146 | 146 | } |
| 147 | 147 | |
| 148 | 148 | /** |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | continue; |
| 99 | 99 | } |
| 100 | 100 | |
| 101 | - $message .= $row.' | '; |
|
| 101 | + $message .= $row . ' | '; |
|
| 102 | 102 | usleep(300000); |
| 103 | 103 | } |
| 104 | 104 | |
@@ -107,10 +107,10 @@ discard block |
||
| 107 | 107 | |
| 108 | 108 | foreach ($this->channelConfig as $chanName => $chanConfig) { |
| 109 | 109 | if ($chanConfig['searchString'] == false) { // If no match was found, and searchString is false, just use that |
| 110 | - $message = $chanConfig['textStringPrepend'].' '.$message.' '.$chanConfig['textStringAppend']; |
|
| 110 | + $message = $chanConfig['textStringPrepend'] . ' ' . $message . ' ' . $chanConfig['textStringAppend']; |
|
| 111 | 111 | $channelID = $chanConfig['channelID']; |
| 112 | 112 | } elseif (stristr($message, $chanConfig['searchString'])) { |
| 113 | - $message = $chanConfig['textStringPrepend'].' '.$message.' '.$chanConfig['textStringAppend']; |
|
| 113 | + $message = $chanConfig['textStringPrepend'] . ' ' . $message . ' ' . $chanConfig['textStringAppend']; |
|
| 114 | 114 | $channelID = $chanConfig['channelID']; |
| 115 | 115 | } |
| 116 | 116 | } |
@@ -432,7 +432,7 @@ discard block |
||
| 432 | 432 | |
| 433 | 433 | $this->logger->addInfo("Next Notification Check At: {$cacheTimer} EVE Time"); |
| 434 | 434 | } catch (Exception $e) { |
| 435 | - $this->logger->addInfo('Notification Error: '.$e->getMessage()); |
|
| 435 | + $this->logger->addInfo('Notification Error: ' . $e->getMessage()); |
|
| 436 | 436 | } |
| 437 | 437 | } |
| 438 | 438 | |
@@ -480,7 +480,7 @@ discard block |
||
| 480 | 480 | break; |
| 481 | 481 | } |
| 482 | 482 | |
| 483 | - return json_decode(downloadData($downloadFrom.$typeID.'/'), true); |
|
| 483 | + return json_decode(downloadData($downloadFrom . $typeID . '/'), true); |
|
| 484 | 484 | } |
| 485 | 485 | |
| 486 | 486 | /** |
@@ -99,14 +99,14 @@ discard block |
||
| 99 | 99 | $msg = '``` |
| 100 | 100 | Developer: Shibdib (In-game Name: Mr Twinkie) |
| 101 | 101 | |
| 102 | -Current Version: '.$gitRevision['short'].' |
|
| 103 | -Current Branch: '.$gitBranch." |
|
| 102 | +Current Version: '.$gitRevision['short'] . ' |
|
| 103 | +Current Branch: '.$gitBranch . " |
|
| 104 | 104 | Github Repo: https://github.com/shibdib/Dramiel |
| 105 | 105 | |
| 106 | 106 | Statistics: |
| 107 | 107 | Currently on {$this->info['guilds']} different discord servers. |
| 108 | -Up-time: ".$interval->y.' Year(s), '.$interval->m.' Month(s), '.$interval->d.' Days, '.$interval->h.' Hours, '.$interval->i.' Minutes, '.$interval->s.' seconds. |
|
| 109 | -Memory Usage: ~'.round(memory_get_usage() / 1024 / 1024, 3).'MB```'; |
|
| 108 | +Up-time: " . $interval->y . ' Year(s), ' . $interval->m . ' Month(s), ' . $interval->d . ' Days, ' . $interval->h . ' Hours, ' . $interval->i . ' Minutes, ' . $interval->s . ' seconds. |
|
| 109 | +Memory Usage: ~'.round(memory_get_usage() / 1024 / 1024, 3) . 'MB```'; |
|
| 110 | 110 | $this->logger->addInfo("Sending about info to {$user}"); |
| 111 | 111 | $this->message->reply($msg); |
| 112 | 112 | } |
@@ -119,7 +119,7 @@ discard block |
||
| 119 | 119 | { |
| 120 | 120 | return [ |
| 121 | 121 | 'name' => 'about', |
| 122 | - 'trigger' => [$this->config['bot']['trigger'].'about'], |
|
| 122 | + 'trigger' => [$this->config['bot']['trigger'] . 'about'], |
|
| 123 | 123 | 'information' => "Shows information on the bot, who created it, what library it's using, revision, and other stats. Example: !about", |
| 124 | 124 | ]; |
| 125 | 125 | } |
@@ -103,7 +103,7 @@ |
||
| 103 | 103 | { |
| 104 | 104 | return [ |
| 105 | 105 | 'name' => 'time', |
| 106 | - 'trigger' => [$this->config['bot']['trigger'].'time'], |
|
| 106 | + 'trigger' => [$this->config['bot']['trigger'] . 'time'], |
|
| 107 | 107 | 'information' => 'This shows the time for various timezones compared to EVE Time. To use simply type <!time>', |
| 108 | 108 | ]; |
| 109 | 109 | } |
@@ -91,7 +91,7 @@ |
||
| 91 | 91 | { |
| 92 | 92 | return [ |
| 93 | 93 | 'name' => 'tq', |
| 94 | - 'trigger' => [$this->config['bot']['trigger'].'tq', $this->config['bot']['trigger'].'status'], |
|
| 94 | + 'trigger' => [$this->config['bot']['trigger'] . 'tq', $this->config['bot']['trigger'] . 'status'], |
|
| 95 | 95 | 'information' => 'Shows the current status of Tranquility', |
| 96 | 96 | ]; |
| 97 | 97 | } |