Skip to content

Commit

Permalink
Merge pull request #206 from Xaliks/fix-typo
Browse files Browse the repository at this point in the history
Fix typos
  • Loading branch information
SebOuellette authored Sep 25, 2022
2 parents 25e6d3e + dd2aead commit 8e94bfb
Show file tree
Hide file tree
Showing 15 changed files with 27 additions and 27 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

**NOTICE**

LiveBot is specifically designed for bots; it cannot be used for user accounts. The LiveBot developers take no resposibility for the actions executed through LiveBot.
LiveBot is specifically designed for bots; it cannot be used for user accounts. The LiveBot developers take no responsibility for the actions executed through LiveBot.

---

Expand Down
2 changes: 1 addition & 1 deletion css/embeds.css
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ limitations under the License. */
font-size: 15px;
}

.embedProvierName {
.embedProviderName {
margin: 5px 0 5px 0;
font-size: 13px;
}
Expand Down
2 changes: 1 addition & 1 deletion dontOpenMe.html
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ <h5 id="guildName">LiveBot</h5>
</div>
</div>

<!-- Typing indecator -->
<!-- Typing indicator -->
<div id="typingDots">
<div class="typingDot dot1"></div>
<div class="typingDot dot2"></div>
Expand Down
2 changes: 1 addition & 1 deletion js/addMemberList.js
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ function addMemberList(guild) {
if (true) {
guild.members.fetch().then((members) => {
members = members.array();
// Display the other unshown users users
// Display the other unshown users
let offlineCount = members.filter(
(m) =>
m.presence.status == 'offline' &&
Expand Down
2 changes: 1 addition & 1 deletion js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ function typing() {
}
}

// Why has this code been in livbot this long????
// Why has this code been in livebot this long????
// Options on the right pane
function options(type, content) {
switch (type) {
Expand Down
10 changes: 5 additions & 5 deletions js/buildTeamMemberCards.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ function buildTeamMemberCards(funky) {
username.innerText = m.user.username;
tag.appendChild(username);

// Descriminator
let descrim = document.createElement('span');
descrim.classList.add('teamMemberDisc');
descrim.innerText = `#${m.user.discriminator}`;
tag.appendChild(descrim);
// Discriminator
let discrim = document.createElement('span');
discrim.classList.add('teamMemberDisc');
discrim.innerText = `#${m.user.discriminator}`;
tag.appendChild(discrim);

// Buttons
let once = document.createElement('div');
Expand Down
2 changes: 1 addition & 1 deletion js/clickMenu.js
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ function addDocListener() {
)
open = await buildUserMenu(target, rcMenu);

// Check if it should be opened and if it shoudn't close it just in case
// Check if it should be opened and if it shouldn't close it just in case
if (!open) return rcMenu.classList.remove('open');

// Open the menu if it's ready
Expand Down
6 changes: 3 additions & 3 deletions js/errorHandler.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ function errorHandler(err) {
} else customErrors(code, err);
}

// Discord api errors that aren't cought with discord.js
// Discord api errors that aren't caught with discord.js
function discordApiErrors(code, err) {
switch (err.message) {
case 'Cannot send messages to this user':
Expand All @@ -64,7 +64,7 @@ function tokenError() {
});
}

// Errors that are cought by discord.js and converted to custom errors
// Errors that are caught by discord.js and converted to custom errors
function customTokenErrors(code, err) {
switch (code) {
case 'TOKEN_INVALID':
Expand Down Expand Up @@ -125,7 +125,7 @@ function customTokenErrors(code, err) {
tokenError();
}

// Errors that are cought by discord.js and converted to custom errors
// Errors that are caught by discord.js and converted to custom errors
function customErrors(code, err) {
switch (code) {
case 'SHARDING_REQUIRED':
Expand Down
4 changes: 2 additions & 2 deletions js/handleScripts.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
let loadAllScripts = () => {
let files = fs.readdirSync('./scripts');

// Remove the template file out of the equasion if there is one
// Remove the template file out of the equation if there is one
if (files.includes('template.js'))
files.splice(files.indexOf('template.js'), 1);

// If there are no scripts don't even bother
if (!files.length) return;

// Preoad all the scripts
// Preload all the scripts
console.log('Loading scripts...');
files.forEach((file) => {
if (file.endsWith('.js') && file != 'template.js') {
Expand Down
2 changes: 1 addition & 1 deletion js/handleThemes.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ function loadThemes() {
// Get all the files in the themes folder
let files = fs.readdirSync(dir);

// Remove the template file out of the equasion if there is one
// Remove the template file out of the equation if there is one
if (files.includes('template.css'))
files.splice(files.indexOf('template.css'), 1);

Expand Down
4 changes: 2 additions & 2 deletions js/parseFunctions.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ function parseHTML(text) {
return text;
}

function parsePings(msg, text, embededLink, ping, embed) {
function parsePings(msg, text, embeddedLink, ping, embed) {
// Format pings in embeds
if (ping || !embed) {
let dms = selectedChan.type == 'dm';
text = formatEmbedPings(msg, text, dms);
text = formatPings(msg, text, dms);
}
// Format links in embeds
if (embededLink) {
if (embeddedLink) {
text = text.replace(
/(?:\[(?:<(?:[\w\W]+?>([\w\.!@#$%^&*\-\/"=\[\];]+?)<(?:[\w\W\/]+?)>)|([\w\.!@#$%^&*\-\/"=<>\]\[; ]+?))\]\((?:<a href="([\w:\/.<=\-]+?)".+\)|([\w.:\/_"=\-<> ]+?)\)))/gm,
(a, b, c, d, e) => {
Expand Down
4 changes: 2 additions & 2 deletions js/parseMessage.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ let parseMessage = (
msg = null,
embed = false,
ping = false,
embededLink
embeddedLink
) => {
let textContent = text;

Expand All @@ -48,7 +48,7 @@ let parseMessage = (

// General message parsing
// Format pings
if (msg) parsePings(msg, textContent, embededLink, ping, embed);
if (msg) parsePings(msg, textContent, embeddedLink, ping, embed);
// Match links
textContent = parseLinks(textContent);
// Add html tags for markup
Expand Down
2 changes: 1 addition & 1 deletion js/setToken.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ async function setToken(token) {
let memberList = document.getElementById('memberBar');
memberList.innerHTML = '';

// Stop the current bot, unload scritps, and then load into the new token
// Stop the current bot, unload scripts, and then load into the new token
if (global.bot !== undefined) {
bot.destroy();
}
Expand Down
4 changes: 2 additions & 2 deletions js/showEmbed.js
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ let showRichEmbed = (embed, msg, element, type) => {
if (embed.provider) {
let provider = document.createElement('p');
provider.classList.add('embedContent');
provider.classList.add('embedProvierName');
provider.classList.add('embedProviderName');
provider.innerHTML = parseMessage(embed.provider.name, msg, true);
embedCont.appendChild(provider);
}
Expand Down Expand Up @@ -245,7 +245,7 @@ let showArticleEmbed = (embed, msg, element) => {
if (embed.provider) {
let provider = document.createElement('p');
provider.classList.add('embedContent');
provider.classList.add('embedProvierName');
provider.classList.add('embedProviderName');
provider.innerHTML = parseMessage(embed.provider.name, msg, true);
embedCont.appendChild(provider);
}
Expand Down
6 changes: 3 additions & 3 deletions js/userSettings.js
Original file line number Diff line number Diff line change
Expand Up @@ -257,10 +257,10 @@ function openPopup(category, group) {
if (category.classList.contains('toggledOn')) {
createPopup(category.parentElement, group);
} else {
let settingsPopout = category.parentElement.querySelector(
let settingsPopup = category.parentElement.querySelector(
'.settingsPopup'
);
if (settingsPopout) settingsPopout.remove();
if (settingsPopup) settingsPopup.remove();
}
}

Expand Down Expand Up @@ -296,7 +296,7 @@ function buildSettingsMenu(jsonObj) {
category.onclick = () => {
// Open the popup menu
if (group.settings) openPopup(category, group);
// If it's still in developement then don't open the menu but flash red
// If it's still in development then don't open the menu but flash red
else
category.animate(animations.flashTextRed, {
duration: 350,
Expand Down

0 comments on commit 8e94bfb

Please sign in to comment.