dan/Shasha
1
0
Fork 0
mirror of https://github.com/danbulant/Shasha synced 2026-07-05 19:11:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Testing: Refactor DB complete (maybe)

Browse source
This commit is contained in:
Neko-Life 2021-07-24 15:47:31 +07:00
parent f7f962a012
commit ddaa178c75
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmds/profile/avatar.js
View file

@ -16,7 +16,7 @@ module.exports = class avatar extends commando.Command {
}); });
} }
async run(msg, arg) { async run(msg, arg) {
const doc = msg.guild.DB.settings || msg.author.DB; const doc = msg.guild?.DB || msg.author.DB;
const footerQuote = doc.defaultEmbed?.footerQuote || ""; const footerQuote = doc.defaultEmbed?.footerQuote || "";
const option = "";// || arg.match(/(?<!\\)--s +\d+/)?.[0]; const option = "";// || arg.match(/(?<!\\)--s +\d+/)?.[0];
let user, avatar, member, show, notFound = ""; let user, avatar, member, show, notFound = "";

2
cmds/profile/servav.js
View file

@ -20,7 +20,7 @@ module.exports = class servav extends commando.Command {
if (!msg.author.DB) await msg.author.dbLoad(); if (!msg.author.DB) await msg.author.dbLoad();
if (msg.guild && !msg.guild.DB) await msg.guild.dbLoad(); if (msg.guild && !msg.guild.DB) await msg.guild.dbLoad();
const server_ID = arg.split(/ +/)[0]; const server_ID = arg.split(/ +/)[0];
const footerQuote = (msg.guild?.DB.settings || msg.author.DB).defaultEmbed?.footerQuote || ""; const footerQuote = (msg.guild?.DB || msg.author.DB).defaultEmbed?.footerQuote || "";
let icon, target; let icon, target;
if (server_ID && this.client.owners.includes(msg.author)) { if (server_ID && this.client.owners.includes(msg.author)) {
if (!/\D/.test(server_ID)) { if (!/\D/.test(server_ID)) {

2
resources/eventsLogger/guildMemberAdd.js
View file

@ -20,7 +20,7 @@ module.exports = (member) => {
.setTitle("`" + member.user.tag + "` joined") .setTitle("`" + member.user.tag + "` joined")
.setThumbnail(member.user.displayAvatarURL({ format: "png", size: 4096, dynamic: true })) .setThumbnail(member.user.displayAvatarURL({ format: "png", size: 4096, dynamic: true }))
.setColor(getColor("cyan")) .setColor(getColor("cyan"))
.addField("Registered", defaultDateFormat(member.user.createdAt), true) .addField("Registered", defaultDateFormat(member.user.createdAt))
.setDescription(`<@!${member.id}> (${member.id}) just joined.\nWe have ${member.guild.memberCount} total members now.`); .setDescription(`<@!${member.id}> (${member.id}) just joined.\nWe have ${member.guild.memberCount} total members now.`);
return trySend(member.client, log, emb); return trySend(member.client, log, emb);
} }

4
resources/eventsLogger/guildMemberRemove.js
View file

@ -24,8 +24,8 @@ module.exports = (member) => {
.setTitle("`" + member.user.tag + "` left") .setTitle("`" + member.user.tag + "` left")
.setThumbnail(member.user.displayAvatarURL({ format: "png", size: 4096, dynamic: true })) .setThumbnail(member.user.displayAvatarURL({ format: "png", size: 4096, dynamic: true }))
.setColor(getColor("yellow")) .setColor(getColor("yellow"))
.addField("Registered", defaultDateFormat(member.user.createdAt), true) .addField("Registered", defaultDateFormat(member.user.createdAt))
.addField("Joined", defaultDateFormat(member.joinedAt) + `\n(${intervalToDuration(INT).strings.join(" ")} ago)`, true) .addField("Joined", defaultDateFormat(member.joinedAt) + `\n(${intervalToDuration(INT).strings.join(" ")} ago)`)
.addField("Nick", "`" + member.displayName + "`") .addField("Nick", "`" + member.displayName + "`")
.setDescription(`<@!${member.id}> (${member.id}) just left.\nWe have ${member.guild.memberCount} total members now.`); .setDescription(`<@!${member.id}> (${member.id}) just left.\nWe have ${member.guild.memberCount} total members now.`);
for (const U of RU) { for (const U of RU) {

4
resources/functions.js
View file

@ -261,7 +261,7 @@ function adCheck(content) {
* @returns {MessageEmbed} * @returns {MessageEmbed}
*/ */
function defaultImageEmbed(msg, image, title, footerQuote) { function defaultImageEmbed(msg, image, title, footerQuote) {
if (!footerQuote) footerQuote = (msg.guild?.DB.settings || msg.author.DB).defaultEmbed?.footerQuote || ""; if (!footerQuote) footerQuote = (msg.guild?.DB || msg.author.DB).defaultEmbed?.footerQuote || "";
const emb = new MessageEmbed() const emb = new MessageEmbed()
.setImage(image) .setImage(image)
.setColor(msg.guild ? getColor((msg.member || msg).displayColor) : randomColors[Math.floor(Math.random() * randomColors.length)]) .setColor(msg.guild ? getColor((msg.member || msg).displayColor) : randomColors[Math.floor(Math.random() * randomColors.length)])
@ -438,7 +438,7 @@ function defaultEventLogEmbed(guild) {
return new MessageEmbed() return new MessageEmbed()
.setColor(getColor(C.displayColor)) .setColor(getColor(C.displayColor))
.setAuthor(guild.name) .setAuthor(guild.name)
.setFooter((guild.DB?.settings?.defaultEmbed?.footerQuote ? .setFooter((guild.DB?.defaultEmbed?.footerQuote ?
guild.DB.defaultEmbed.footerQuote : ""), guild.iconURL({ format: "png", size: 128, dynamic: true })) guild.DB.defaultEmbed.footerQuote : ""), guild.iconURL({ format: "png", size: 128, dynamic: true }))
.setTimestamp(new Date()); .setTimestamp(new Date());
} }