StyAndCo/zappyzep
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix username change logging and saving. Re-enable migrations.

Browse source
This commit is contained in:
Dragory 2019-05-03 23:31:38 +03:00
parent 1b1ae98714
commit e231faf51f
12 changed files with 255 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/plugins/Logs.ts
View file

@ -397,14 +397,13 @@ export class LogsPlugin extends ZeppelinPlugin<ILogsPluginConfig> {
}
}
@d.event("userUpdate")
@d.event("userUpdate", null, false)
async onUserUpdate(user: User, oldUser: User) {
if (!oldUser) return;
if (user.username !== oldUser.username || user.discriminator !== oldUser.discriminator) {
const member = (await this.getMember(user.id)) || { id: user.id, user };
this.guildLogs.log(LogType.MEMBER_USERNAME_CHANGE, {
member: stripObjectToScalars(member, ["user", "roles"]),
user: stripObjectToScalars(user),
oldName: `${oldUser.username}#${oldUser.discriminator}`,
newName: `${user.username}#${user.discriminator}`,
});

69
src/plugins/NameHistory.ts
View file

@ -1,9 +1,9 @@
import { decorators as d, IPluginOptions } from "knub";
import { GuildNameHistory } from "../data/GuildNameHistory";
import { Member, Message, User } from "eris";
import { NameHistoryEntryTypes } from "../data/NameHistoryEntryTypes";
import { createChunkedMessage, errorMessage, trimLines } from "../utils";
import { GuildNicknameHistory, MAX_NICKNAME_ENTRIES_PER_USER } from "../data/GuildNicknameHistory";
import { Member, Message } from "eris";
import { createChunkedMessage, disableCodeBlocks } from "../utils";
import { ZeppelinPlugin } from "./ZeppelinPlugin";
import { MAX_USERNAME_ENTRIES_PER_USER, UsernameHistory } from "../data/UsernameHistory";
interface INameHistoryPluginConfig {
can_view: boolean;
@ -12,7 +12,8 @@ interface INameHistoryPluginConfig {
export class NameHistoryPlugin extends ZeppelinPlugin<INameHistoryPluginConfig> {
public static pluginName = "name_history";
protected nameHistory: GuildNameHistory;
protected nicknameHistory: GuildNicknameHistory;
protected usernameHistory: UsernameHistory;
getDefaultOptions(): IPluginOptions<INameHistoryPluginConfig> {
return {
@ -32,57 +33,45 @@ export class NameHistoryPlugin extends ZeppelinPlugin<INameHistoryPluginConfig>
}
onLoad() {
this.nameHistory = GuildNameHistory.getInstance(this.guildId);
this.nicknameHistory = GuildNicknameHistory.getInstance(this.guildId);
this.usernameHistory = UsernameHistory.getInstance(null);
}
@d.command("names", "<userId:userid>")
@d.permission("can_view")
async namesCmd(msg: Message, args: { userId: string }) {
const names = await this.nameHistory.getByUserId(args.userId);
if (!names) {
msg.channel.createMessage(errorMessage("No name history found for that user!"));
return;
const nicknames = await this.nicknameHistory.getByUserId(args.userId);
const usernames = await this.usernameHistory.getByUserId(args.userId);
if (nicknames.length === 0 && usernames.length === 0) {
return this.sendErrorMessage(msg.channel, "No name history found");
}
const rows = names.map(entry => {
const type = entry.type === NameHistoryEntryTypes.Username ? "Username" : "Nickname";
const value = entry.value || "<none>";
return `\`[${entry.timestamp}]\` ${type} **${value}**`;
});
const nicknameRows = nicknames.map(
r => `\`[${r.timestamp}]\` ${r.nickname ? `**${disableCodeBlocks(r.nickname)}**` : "*None*"}`,
);
const usernameRows = usernames.map(r => `\`[${r.timestamp}]\` **${disableCodeBlocks(r.username)}**`);
const user = this.bot.users.get(args.userId);
const currentUsername = user ? `${user.username}#${user.discriminator}` : args.userId;
const message = trimLines(`
Name history for **${currentUsername}**:
${rows.join("\n")}
`);
let message = `Name history for **${currentUsername}**:`;
if (nicknameRows.length) {
message += `\n\n__Last ${MAX_NICKNAME_ENTRIES_PER_USER} nicknames:__\n${nicknameRows.join("\n")}`;
}
if (usernameRows.length) {
message += `\n\n__Last ${MAX_USERNAME_ENTRIES_PER_USER} usernames:__\n${usernameRows.join("\n")}`;
}
createChunkedMessage(msg.channel, message);
}
// @d.event("userUpdate", null, false)
// async onUserUpdate(user: User, oldUser: { username: string; discriminator: string; avatar: string }) {
// if (user.username !== oldUser.username || user.discriminator !== oldUser.discriminator) {
// const newUsername = `${user.username}#${user.discriminator}`;
// await this.nameHistory.addEntry(user.id, NameHistoryEntryTypes.Username, newUsername);
// }
// }
@d.event("guildMemberUpdate")
async onGuildMemberUpdate(_, member: Member) {
const latestEntry = await this.nameHistory.getLastEntryByType(member.id, NameHistoryEntryTypes.Nickname);
if (!latestEntry || latestEntry.value !== member.nick) {
await this.nameHistory.addEntry(member.id, NameHistoryEntryTypes.Nickname, member.nick);
const latestEntry = await this.nicknameHistory.getLastEntry(member.id);
if (!latestEntry || latestEntry.nickname != member.nick) {
// tslint:disable-line
await this.nicknameHistory.addEntry(member.id, member.nick);
}
}
// @d.event("guildMemberAdd")
// async onGuildMemberAdd(_, member: Member) {
// const latestEntry = await this.nameHistory.getLastEntryByType(member.id, NameHistoryEntryTypes.Username);
// const username = `${member.user.username}#${member.user.discriminator}`;
// if (!latestEntry || latestEntry.value !== username) {
// await this.nameHistory.addEntry(member.id, NameHistoryEntryTypes.Username, username);
// }
// }
}

31
src/plugins/UsernameSaver.ts Normal file
View file

@ -0,0 +1,31 @@
import { decorators as d, GlobalPlugin } from "knub";
import { UsernameHistory } from "../data/UsernameHistory";
import { Member, User } from "eris";
export class UsernameSaver extends GlobalPlugin {
public static pluginName = "username_saver";
protected usernameHistory: UsernameHistory;
async onLoad() {
this.usernameHistory = UsernameHistory.getInstance(null);
}
protected async updateUsername(user: User) {
const newUsername = `${user.username}#${user.discriminator}`;
const latestEntry = await this.usernameHistory.getLastEntry(user.id);
if (newUsername !== latestEntry.username) {
await this.usernameHistory.addEntry(user.id, newUsername);
}
}
@d.event("userUpdate", null, false)
async onUserUpdate(user: User) {
this.updateUsername(user);
}
@d.event("guildMemberAdd", null, false)
async onGuildMemberAdd(_, member: Member) {
this.updateUsername(member.user);
}
}