StyAndCo/zeppelin
3
0
Fork 0
mirror of https://github.com/ZeppelinBot/Zeppelin.git synced 2025-05-10 12:25:02 +00:00
Code Releases Activity

More rework progress, remove all eris imports

Browse source
This commit is contained in:
Dark 2021-06-01 02:05:55 +02:00
parent 8f7a6510eb
commit 52839cc9f3
No known key found for this signature in database
GPG key ID: 2CD6ACB6B0A87B8A
181 changed files with 352 additions and 343 deletions
Download patch file Download diff file Expand all files Collapse all files

6
backend/src/plugins/Logs/LogsPlugin.ts
View file

@ -14,7 +14,6 @@ import { LogsGuildMemberRemoveEvt } from "./events/LogsGuildMemberRemoveEvt";
import { LogsGuildMemberUpdateEvt } from "./events/LogsUserUpdateEvts";
import { LogsChannelCreateEvt, LogsChannelDeleteEvt } from "./events/LogsChannelModifyEvts";
import { LogsRoleCreateEvt, LogsRoleDeleteEvt } from "./events/LogsRoleModifyEvts";
import { LogsVoiceJoinEvt, LogsVoiceLeaveEvt, LogsVoiceSwitchEvt } from "./events/LogsVoiceChannelEvts";
import { log } from "./util/log";
import { LogType } from "../../data/LogType";
import { getLogMessage } from "./util/getLogMessage";
@ -23,6 +22,7 @@ import { disableCodeBlocks } from "../../utils";
import { logger } from "../../logger";
import { CasesPlugin } from "../Cases/CasesPlugin";
import { TimeAndDatePlugin } from "../TimeAndDate/TimeAndDatePlugin";
import { LogsVoiceStateUpdateEvt } from "./events/LogsVoiceChannelEvts";
const defaultOptions: PluginOptions<LogsPluginType> = {
config: {
@ -66,9 +66,7 @@ export const LogsPlugin = zeppelinGuildPlugin<LogsPluginType>()({
LogsChannelDeleteEvt,
LogsRoleCreateEvt,
LogsRoleDeleteEvt,
LogsVoiceJoinEvt,
LogsVoiceLeaveEvt,
LogsVoiceSwitchEvt,
LogsVoiceStateUpdateEvt,
],
public: {

2
backend/src/plugins/Logs/events/LogsGuildBanEvts.ts
View file

@ -1,7 +1,7 @@
import { logsEvt } from "../types";
import { stripObjectToScalars, UnknownUser } from "../../../utils";
import { LogType } from "../../../data/LogType";
import { Constants as ErisConstants } from "eris";
import { safeFindRelevantAuditLogEntry } from "../../../utils/safeFindRelevantAuditLogEntry";
export const LogsGuildBanAddEvt = logsEvt({

4
backend/src/plugins/Logs/events/LogsRoleModifyEvts.ts
View file

@ -3,7 +3,7 @@ import { stripObjectToScalars } from "../../../utils";
import { LogType } from "../../../data/LogType";
export const LogsRoleCreateEvt = logsEvt({
event: "guildRoleCreate",
event: "roleCreate",
async listener(meta) {
meta.pluginData.state.guildLogs.log(LogType.ROLE_CREATE, {
@ -13,7 +13,7 @@ export const LogsRoleCreateEvt = logsEvt({
});
export const LogsRoleDeleteEvt = logsEvt({
event: "guildRoleDelete",
event: "roleDelete",
async listener(meta) {
meta.pluginData.state.guildLogs.log(LogType.ROLE_DELETE, {

10
backend/src/plugins/Logs/events/LogsUserUpdateEvts.ts
View file

@ -1,6 +1,6 @@
import { logsEvt } from "../types";
import { stripObjectToScalars, UnknownUser } from "../../../utils";
import { Constants as ErisConstants } from "eris";
import { LogType } from "../../../data/LogType";
import isEqual from "lodash.isequal";
import diff from "lodash.difference";
@ -61,11 +61,11 @@ export const LogsGuildMemberUpdateEvt = logsEvt({
{
member: logMember,
addedRoles: addedRoles
.map(roleId => pluginData.guild.roles.get(roleId) || { id: roleId, name: `Unknown (${roleId})` })
.map(roleId => pluginData.guild.roles.cache.get(roleId) || { id: roleId, name: `Unknown (${roleId})` })
.map(r => r.name)
.join(", "),
removedRoles: removedRoles
.map(roleId => pluginData.guild.roles.get(roleId) || { id: roleId, name: `Unknown (${roleId})` })
.map(roleId => pluginData.guild.roles.cache.get(roleId) || { id: roleId, name: `Unknown (${roleId})` })
.map(r => r.name)
.join(", "),
mod: stripObjectToScalars(mod),
@ -79,7 +79,7 @@ export const LogsGuildMemberUpdateEvt = logsEvt({
{
member: logMember,
roles: addedRoles
.map(roleId => pluginData.guild.roles.get(roleId) || { id: roleId, name: `Unknown (${roleId})` })
.map(roleId => pluginData.guild.roles.cache.get(roleId) || { id: roleId, name: `Unknown (${roleId})` })
.map(r => r.name)
.join(", "),
mod: stripObjectToScalars(mod),
@ -93,7 +93,7 @@ export const LogsGuildMemberUpdateEvt = logsEvt({
{
member: logMember,
roles: removedRoles
.map(roleId => pluginData.guild.roles.get(roleId) || { id: roleId, name: `Unknown (${roleId})` })
.map(roleId => pluginData.guild.roles.cache.get(roleId) || { id: roleId, name: `Unknown (${roleId})` })
.map(r => r.name)
.join(", "),
mod: stripObjectToScalars(mod),

11
backend/src/plugins/Logs/events/LogsVoiceChannelEvts.ts
View file

@ -1,7 +1,7 @@
import { logsEvt } from "../types";
import { stripObjectToScalars } from "../../../utils";
import { LogType } from "../../../data/LogType";
/** Merge into single event
export const LogsVoiceJoinEvt = logsEvt({
event: "voiceChannelJoin",
@ -35,3 +35,12 @@ export const LogsVoiceSwitchEvt = logsEvt({
});
},
});
**/
export const LogsVoiceStateUpdateEvt = logsEvt({
event: "voiceStateUpdate",
async listener(meta) {
console.error(`Fixme @LogsVoiceChannelEvts.ts`);
},
});

1
backend/src/plugins/Logs/util/getLogMessage.ts
View file

@ -14,7 +14,6 @@ import { renderTemplate, TemplateParseError } from "../../../templateFormatter";
import { logger } from "../../../logger";
import moment from "moment-timezone";
import { TimeAndDatePlugin } from "../../TimeAndDate/TimeAndDatePlugin";
import { MessageContent } from "eris";
export async function getLogMessage(
pluginData: GuildPluginData<LogsPluginType>,

6
backend/src/plugins/Logs/util/log.ts
View file

@ -1,7 +1,7 @@
import { GuildPluginData } from "knub";
import { LogsPluginType, TLogChannelMap } from "../types";
import { LogType } from "../../../data/LogType";
import { TextChannel } from "eris";
import { createChunkedMessage, get, noop } from "../../../utils";
import { getLogMessage } from "./getLogMessage";
import { allowTimeout } from "../../../RegExpRunner";
@ -19,7 +19,7 @@ export async function log(pluginData: GuildPluginData<LogsPluginType>, type: Log
const typeStr = LogType[type];
logChannelLoop: for (const [channelId, opts] of Object.entries(logChannels)) {
const channel = pluginData.guild.channels.get(channelId);
const channel = pluginData.guild.channels.cache.get(channelId);
if (!channel || !(channel instanceof TextChannel)) continue;
if ((opts.include && opts.include.includes(typeStr)) || (opts.exclude && !opts.exclude.includes(typeStr))) {
@ -45,7 +45,7 @@ export async function log(pluginData: GuildPluginData<LogsPluginType>, type: Log
if (opts.excluded_roles) {
for (const value of Object.values(data || {})) {
if (value instanceof SavedMessage) {
const member = pluginData.guild.members.get(value.user_id);
const member = pluginData.guild.members.cache.get(value.user_id);
for (const role of member?.roles || []) {
if (opts.excluded_roles.includes(role)) {
continue logChannelLoop;

4
backend/src/plugins/Logs/util/onMessageDelete.ts
View file

@ -1,5 +1,5 @@
import { SavedMessage } from "../../../data/entities/SavedMessage";
import { Attachment } from "eris";
import { useMediaUrls, stripObjectToScalars, resolveUser } from "../../../utils";
import { LogType } from "../../../data/LogType";
import moment from "moment-timezone";
@ -9,7 +9,7 @@ import { TimeAndDatePlugin } from "../../TimeAndDate/TimeAndDatePlugin";
export async function onMessageDelete(pluginData: GuildPluginData<LogsPluginType>, savedMessage: SavedMessage) {
const user = await resolveUser(pluginData.client, savedMessage.user_id);
const channel = pluginData.guild.channels.get(savedMessage.channel_id);
const channel = pluginData.guild.channels.cache.get(savedMessage.channel_id);
if (user) {
// Replace attachment URLs with media URLs

2
backend/src/plugins/Logs/util/onMessageDeleteBulk.ts
View file

@ -5,7 +5,7 @@ import { LogType } from "../../../data/LogType";
import { getBaseUrl } from "../../../pluginUtils";
export async function onMessageDeleteBulk(pluginData: GuildPluginData<LogsPluginType>, savedMessages: SavedMessage[]) {
const channel = pluginData.guild.channels.get(savedMessages[0].channel_id);
const channel = pluginData.guild.channels.cache.get(savedMessages[0].channel_id);
const archiveId = await pluginData.state.archives.createFromSavedMessages(savedMessages, pluginData.guild);
const archiveUrl = pluginData.state.archives.getUrl(getBaseUrl(pluginData), archiveId);
const authorIds = Array.from(new Set(savedMessages.map(item => `\`${item.user_id}\``))).join(", ");

4
backend/src/plugins/Logs/util/onMessageUpdate.ts
View file

@ -1,7 +1,7 @@
import { GuildPluginData } from "knub";
import { LogsPluginType } from "../types";
import { SavedMessage } from "../../../data/entities/SavedMessage";
import { Embed } from "eris";
import { LogType } from "../../../data/LogType";
import { stripObjectToScalars, resolveUser } from "../../../utils";
import cloneDeep from "lodash.clonedeep";
@ -47,7 +47,7 @@ export async function onMessageUpdate(
}
const user = await resolveUser(pluginData.client, savedMessage.user_id);
const channel = pluginData.guild.channels.get(savedMessage.channel_id);
const channel = pluginData.guild.channels.cache.get(savedMessage.channel_id);
pluginData.state.guildLogs.log(LogType.MESSAGE_EDIT, {
user: stripObjectToScalars(user),