diff --git a/.gitignore b/.gitignore index 96be220..ad63f94 100644 --- a/.gitignore +++ b/.gitignore @@ -21,6 +21,7 @@ __pycache__/ # internal markdown files *.md !deploy/README.md +!/CONTRIBUTING.md /HANDOFF.md /DISCOVERIES.md /GOING-PUBLIC.md diff --git a/config.js b/config.js index 92b4408..89adcb3 100644 --- a/config.js +++ b/config.js @@ -134,6 +134,19 @@ module.exports = { clientSecret: env.AJ_DISCORD_CLIENT_SECRET || "", botToken: env.AJ_DISCORD_BOT_TOKEN || "", guildId: env.AJ_DISCORD_GUILD_ID || "", + // Optional Components V2 notification channels. Leave any empty to + // disable that stream: reports, public status, game joins/leaves, the + // moderation audit trail, and Discord bot command/audit events. + reportsChannelId: env.AJ_DISCORD_REPORTS_CHANNEL_ID || "", + statusChannelId: env.AJ_DISCORD_STATUS_CHANNEL_ID || "", + gameLogsChannelId: env.AJ_DISCORD_GAME_LOGS_CHANNEL_ID || "", + moderationLogsChannelId: env.AJ_DISCORD_MOD_LOGS_CHANNEL_ID || "", + botLogsChannelId: env.AJ_DISCORD_BOT_LOGS_CHANNEL_ID || "", + // A signed GitHub push webhook at /discord/github can turn commits into + // a Components V2 update card. All three values are needed to enable it. + githubRepository: env.AJ_GITHUB_REPOSITORY || "", // owner/repository + githubWebhookSecret: env.AJ_GITHUB_WEBHOOK_SECRET || "", + updatesChannelId: env.AJ_DISCORD_UPDATES_CHANNEL_ID || "", }, deployVersion: env.AJ_DEPLOY_VERSION || "1830", // older builds the CDN still serves, asked in turn for a room file the @@ -153,7 +166,7 @@ module.exports = { // 41: the game's text says "Burrow" where it said Animal Jam. // 48: the item giver (the item finder renamed) with previews and hex colours; // 49 and 50: its link to a colour picker. - // 61: the Owner, Moderator and Verified name tag badges seen by everyone. + // 61: the Owner, Moderator, Developer and Verified name tag badges seen by everyone. // 62: "Custom pictures" in the settings menu, to hide players' item pictures. buildVersion: env.AJ_BUILD_VERSION || "78", // what the official CDN is asked for; not ours to change. diff --git a/lib/badges.js b/lib/badges.js index 9c85608..19779a6 100644 --- a/lib/badges.js +++ b/lib/badges.js @@ -33,9 +33,9 @@ const cdn = require("./cdn.js"); // there are no more than a hundred (lib/accounts.js); the admin may give // it and take it away like any other. -// in the order they are listed and drawn. the Verified, Owner and Moderator -// name tags show their badge to everyone, not only to buddies: their def ids -// are in PUBLIC_BADGE_IDS of swf-src/AvatarWorldView.as. +// in the order they are listed and drawn. the Verified, Owner, Moderator and +// Developer name tags show their badge to everyone, not only to buddies: +// their def ids are in PUBLIC_BADGE_IDS of swf-src/AvatarWorldView.as. const BADGES = [ // first, so its tick comes straight after the name, as on other sites. {id: "verified", label: "Verified", tag: {def: 76, media: 20014, bit: 21}}, diff --git a/swf-src/AvatarWorldView.as b/swf-src/AvatarWorldView.as index 296f049..6c9b3d1 100644 --- a/swf-src/AvatarWorldView.as +++ b/swf-src/AvatarWorldView.as @@ -65,9 +65,9 @@ package avatar private static const SLIDE_FRAME_TIME:Number = 41.666666666666664; // name tag badges everyone sees, buddy or not, as the game shows its - // News Crew camera (NameBar.isVIPBadge): the Owner, Moderator and - // Verified badges of lib/badges.js, by their def ids. - private static const PUBLIC_BADGE_IDS:Array = [63,64,76]; + // News Crew camera (NameBar.isVIPBadge): the Owner, Moderator, + // Developer and Verified badges of lib/badges.js, by their def ids. + private static const PUBLIC_BADGE_IDS:Array = [63,64,66,76]; private static const GLOW_LAND_DEFAULT_COLOR:int = 5586479; diff --git a/swf/ajclient.swf b/swf/ajclient.swf index 9511f27..d4a32ef 100644 Binary files a/swf/ajclient.swf and b/swf/ajclient.swf differ