masto auto reconnect stream

also allow removing role icon

.dockerignore

@@ -1,3 +0,0 @@
-node_modules
-secrets.env
-data

.gitignore

@@ -1,3 +1,4 @@
 node_modules
 secrets.env
-data
+data
+tokens.txt

Dockerfile

@@ -1,5 +0,0 @@
-FROM node:latest
-ADD . /app
-WORKDIR /app
-RUN npm ci
-CMD ["node", "index.js"]

activitytracker.js

@@ -0,0 +1,116 @@
+var client = require("./client");
+var config = require("./config");
+var app = require("./www");
+var DataStore = require("./datastore");
+
+var ds = new DataStore("activity");
+
+
+app.get("/detect/:code", (req, res) => {
+	res.sendFile(process.cwd() + "/track-image.png");
+	if (req.headers["user-agent"].includes("Discordbot")) return;
+	onActivity(ds.get(req.params.code));
+	ds.del(req.params.code);
+});
+
+
+client.on("messageCreate", async m => m.guildId == config.guild && onActivity(m.author.id));
+client.on("interactionCreate", async i => i.guildId == config.guild && onActivity(i.user.id));
+client.on("typingStart", async t => t.guild?.id == config.guild && onActivity(t.user.id));
+client.on("guildMemberAdd", async m => m.guild.id == config.guild && onActivity(m.user.id));
+client.on("messageReactionAdd", async (r, user) => r.message?.guild?.id == config.guild && onActivity(user.id));
+client.on("messageReactionRemove", async (r, user) => r.message?.guild?.id == config.guild && onActivity(user.id));
+client.on("messageUpdate", async (oldMessage, newMessage) => newMessage.guild?.id == config.guild && (oldMessage.editedAt != newMessage.editedAt) && onActivity(newMessage.author.id));
+
+
+async function onActivity(user_id) {
+	if (!user_id) return;
+	let user = client.users.resolve(user_id);
+	if (!user || user.bot) return;
+	ds.put(user_id, Date.now());
+	if (ds.get(user_id + "deactivated")) {
+		let member = client.guilds.resolve(config.guild).members.resolve(user_id);
+		await reactivateMember(member);
+		/*await client.channels.resolve(config.default_channel)?.send(random([
+			`${member.displayName} bacc`,
+			`${member.displayName} is bacc`,
+			`hi ${member.displayName}`
+		]));*/
+	}
+}
+
+
+module.exports.interval = setInterval(async () => {
+	var guild = client.guilds.resolve(config.guild);
+	if (!guild) return;
+	guild.members.cache.filter(m => !m.user.bot).forEach(member => {
+		let lastActivityTime = ds.get(member.user.id);
+		if (!lastActivityTime) return;
+		if (Date.now() - lastActivityTime > 1000*60*60*72) { // if last activity > 72 hours ago
+			if (!ds.get(member.id + "deactivated"))
+				deactivateMember(member);
+		}
+	});
+}, 60*60*1000); // every hour i guess
+
+
+async function deactivateMember(member) {
+	await member.roles.add(config.inactive_role);
+	ds.put(member.id + "deactivated");
+	ds.put(member.id, Date.now());
+
+	var magic_channel = client.channels.resolve(ds.get(member.id + "magicchannelid"));
+	if (!magic_channel) {
+		magic_channel = await member.guild.channels.create("inactive", {
+			permissionOverwrites: [
+				{
+					id: member.guild.roles.everyone,
+					deny: "VIEW_CHANNEL"
+				},
+				{
+					id: client.user,
+					allow: "VIEW_CHANNEL"
+				},
+				{
+					id: member,
+					allow: "VIEW_CHANNEL"
+				}
+			]
+		});
+		ds.put(member.id + "magicchannelid", magic_channel.id);
+	} else {
+		magic_channel.permissionOverwrites.edit(member, {"VIEW_CHANNEL": true});
+	}
+
+	var magic_channel_message_id = ds.get(member.id + "magicchannelmessage");
+	var unique_code = Math.random().toString();
+	ds.put(unique_code, member.id);
+	var content = `${config.base_uri}/detect/${unique_code}`;
+	if (!magic_channel_message_id) {
+		var magic_channel_message = await magic_channel.send({content});
+		ds.put(member.id + "magicchannelmessage", magic_channel_message.id)
+	} else {
+		await magic_channel.messages.edit(magic_channel_message_id, {content});
+	}
+
+}
+
+async function reactivateMember(member) {
+	await member.roles.remove(config.inactive_role);
+	ds.del(member.id + "deactivated");
+	var magic_channel = client.channels.resolve(ds.get(member.id + "magicchannelid"));
+	if (magic_channel) await magic_channel.permissionOverwrites.edit(member, {"VIEW_CHANNEL": false});
+}
+
+module.exports.deactivateMember = deactivateMember;
+module.exports.reactivateMember = reactivateMember;
+
+
+client.on("messageCreate", async message => {
+	if (message.guildId != config.guild) return;
+	let deactivatedMembersMentionedViaRoles = [...new Set(message.mentions.roles.flatMap(r => r.members).values())].filter(x => ds.get(x.id + "deactivated"));
+	if (deactivatedMembersMentionedViaRoles.length) {
+		for (let m of deactivatedMembersMentionedViaRoles) await reactivateMember(m);
+		await message.reply({content: deactivatedMembersMentionedViaRoles.map(String).join(' '), allowedMentions:{repliedUser: false}});
+	}
+});

backup.js

@@ -0,0 +1,47 @@
+module.exports = class DiscordBackup {
+	constructor(guild) {
+		this.guild = guild;
+		this.data = {};
+	}
+
+	async backupGuild() {
+		// includes emojis, stickers, roles
+		this.data.guild = await this.guild.client.api.guilds(this.guild.id).get();
+	}
+
+	async backupMembers() {
+		this.data.members = await this.guild.client.api.guilds(this.guild.id).members.get({query: {limit: 1000}});
+	}
+
+	async backupChannel(channelId) {
+		var data = {
+			channel: await this.guild.client.api.channels[channelId].get(),
+			messages: []
+		};
+		this.data.channels ||= [];
+		this.data.channels.push(data);
+		do {
+			var messages = await this.guild.client.api.channels[channelId].messages.get({query: {
+				before: messages?.at(-1)?.id, limit: 100
+			}});
+			data.messages.push(...messages);
+		} while (messages.length > 0);
+	}
+
+	async backupEverything() {
+		await this.backupGuild();
+		await this.backupMembers();
+		for (let channelId of this.guild.channels.cache.keys()) {
+			try {
+				await this.backupChannel(channelId);
+			} catch (error) {
+				console.error(error.stack);
+			}
+		}
+	}
+
+	serialize() {
+		return JSON.stringify(this.data);
+	}
+
+}

buttonthing.js

@@ -0,0 +1,77 @@
+var client = require("./client");
+var config = require("./config");
+var fs = require("fs");
+
+
+var data = fs.existsSync("data/buttonthing.json") ? JSON.parse(fs.readFileSync("data/buttonthing.json", "utf8")) : ({
+	userVoteMap: {},
+	votes: {
+		miku: 0,
+		teto: 0,
+		both: 0,
+		what: 0
+	}
+});
+
+function setVote(user, vote) {	
+	var existingVote = data.userVoteMap[user];
+	if (vote == existingVote) {
+		data.votes[existingVote]--;
+		data.userVoteMap[user] = undefined;
+	} else {
+		if (existingVote) data.votes[existingVote]--;
+		data.votes[vote]++;
+		data.userVoteMap[user] = vote;
+	}
+	fs.writeFileSync("data/buttonthing.json", JSON.stringify(data));
+}
+
+
+var thing = () => ({
+	content: "Miku or Teto?",
+	components: [
+		{
+			type: "ACTION_ROW",
+			components: [
+				{
+					type: "BUTTON",
+					label: `Miku (${data.votes.miku})`,
+					customId: "miku",
+					style: "SUCCESS",
+					emoji: "<:MikuSquish:868670741518888961>"
+				},
+				{
+					type: "BUTTON",
+					label: `Teto (${data.votes.teto})`,
+					customId: "teto",
+					style: "DANGER",
+					emoji: "<:tetodrill2:705605869571801120>"
+				},
+				{
+					type: "BUTTON",
+					label: `both/idk (${data.votes.both})`,
+					customId: "both",
+					style: "PRIMARY",
+					emoji: "<:squee:707727925587345490>"
+				},
+				{
+					type: "BUTTON",
+					label: `what/idk (${data.votes.what})`,
+					customId: "what",
+					style: "SECONDARY",
+					emoji: "😕"
+				}
+			]
+		}
+	]
+});
+
+module.exports.init = function(channel = client.channels.resolve(config.announcement_channel)) {
+	channel.send(thing());
+}
+
+client.on("interactionCreate", i => {
+	if (!Object.keys(data.votes).includes(i.customId)) return;
+	setVote(i.user.id, i.customId);
+	i.update(thing());
+});

client.js

@@ -6,29 +6,7 @@ var client = module.exports = new Discord.Client({
 	intents: 32767 //all
 });
 
-
+client.login(config.token).then(async () => {
-
+	console.log("ready");
-client.on("guildMemberAdd", member => {
+	(await client.channels.fetch(config.bot_channel))?.send('a');
-	if (member.guild.id != config.guild) return;
-	member.roles.add(member.user.bot ? config.bot_role : config.human_role);
-	client.channels.resolve(config.default_channel)?.send(random([
-		`${member.user.username} join`,
-		`${member.user.username} joined`,
-		`${member.user.username} appear`,
-		`${member.user.username.toLowerCase()} here`
-	]));
 });
-client.on("guildMemberRemove", member => {
-	if (member.guild.id != config.guild) return;
-	client.channels.resolve(config.default_channel)?.send(random([
-		`${member.user.username} left`,
-		`${member.user.username} disappear`,
-		`${member.user.username.toLowerCase()} gone`
-	]));
-});
-client.on("messageCreate", message => {
-	message.channel.id == "876010629490683955" && message.startThread({name: "Comments"});
-});
-
-
-client.login(config.token).then(() => console.log("ready"));

colors.js

@@ -1,37 +1,158 @@
 var fetch = require("node-fetch");
 var {getAverageColor} = require("fast-average-color-node");
+var fs = require("fs");
+var Discord = require("discord.js");
 
 var client = require("./client");
 var config = require("./config");
+var commands = require("./commands");
+
+
+function getColorRoleFor(user_id) {
+	try {
+		return client.guilds.resolve(config.guild)?.roles.fetch(
+			fs.readFileSync(config.data_dir + "color/" + user_id, "utf8")
+		);
+	} catch (e) {}
+}
+module.exports.getColorRoleFor = getColorRoleFor;
+
 
 client.on("guildMemberAdd", async function (member) {
-	member.roles.add(await member.guild.roles.create({
+	if (member.guild.id != config.guild) return;
+	var role = await member.guild.roles.create({
 		name: member.user.username,
 		color: await user2color(member.user) || "#FF0000",
 		mentionable: true,
 		permissions: 0n
-	}));
+	});
+	member.roles.add(role);
+	fs.writeFileSync(config.data_dir + "color/" + member.id, role.id);
 });
 client.on("userUpdate", async function (oldUser, user) {
-	var colorRole = client.guilds.resolve(config.guild)?.members.resolve(user)?.roles.color;
+	var colorRole = await getColorRoleFor(user.id);
 	if (!colorRole) return;
-	if (oldUser.username != user.username) await colorRole.setName(user.username);
+	if (oldUser.username != user.username)
+		if (!fs.existsSync(`${config.data_dir}color/${user.id}_custom-name`))
+			await colorRole.setName(user.username);
 	if (oldUser.avatar != user.avatar) {
+		if (fs.existsSync(`${config.data_dir}color/${user.id}_custom`)) return;
 		let c = await user2color(user);
 		await colorRole.setColor(c);
-		if (!colorRole.color) {
-			console.warn("role color set fail:", colorRole.name, c);
-			await colorRole.setColor("#FF0000");
-		}
 	}
 });
 client.on("guildMemberRemove", async function (member) {
-	var colorRole = member.roles.color;
+	if (member.guild.id != config.guild) return;
+	var colorRole = await getColorRoleFor(member.user.id);
 	if (!colorRole) return;
 	if (!colorRole.members.size) colorRole.delete();
 });
 
 
+
+commands.push({
+	name: "setcolor",
+	description: "Set yourself to a custom color",
+	options: [
+		{
+			name: "color",
+			description: "Hex string or color name.",
+			type: "STRING",
+			required: true
+		}
+	],
+	exec: async i => {
+		var colorRole = await getColorRoleFor(i.user.id);
+		if (!colorRole) return void i.reply({content: "You don't have color role!"});
+		let x = i.options.getString("color");
+		if (x) {
+//			if (/^[a-zA-Z_]+$/.test(x))
+				x = x.toUpperCase();
+//			else if (!/^#?[a-fA-F0-9]{6}$/.test(x)) {
+//				let m = x.match(/(\d+)\s*,\s*(\d+)\s*,\s*(\d+)/);
+//				if (m) x = [Number(x[1]), Number(x[2]), Number(x[3])];
+//			}
+		}
+		try {
+			await colorRole.setColor(x);
+		} catch(error) {
+			return void await i.reply({content: error.message});
+		}
+		fs.writeFileSync(`${config.data_dir}color/${i.user.id}_custom`, '');
+		await i.reply({content: colorRole.toString()});
+	}
+});
+
+commands.push({
+	name: "settitle",
+	description: "Change your color role name",
+	options: [
+		{
+			name: "name",
+			description: "Name of role",
+			type: "STRING",
+			required: true
+		}
+	],
+	exec: async i => {
+		var colorRole = await getColorRoleFor(i.user.id);
+		if (!colorRole) return void i.reply({content: "You don't have color role!"});
+		try {
+			await colorRole.setName(i.options.getString("name"));
+		} catch(error) {
+			await i.reply({content: error.message});
+			return;
+		}
+		fs.writeFileSync(`${config.data_dir}color/${i.user.id}_custom-name`, '');
+		await i.reply({content: colorRole.toString()});
+	}
+});
+
+commands.push({
+	name: "seticon",
+	description: "Set your role icon",
+	options: [
+		{
+			name: "icon",
+			description: "Image URL or an emoji",
+			type: "STRING"
+		}
+	],
+	exec: async i => {
+		await i.deferReply();
+		var colorRole = await getColorRoleFor(i.user.id);
+		if (!colorRole) return void i.editReply({content: "You don't have color role!"});
+		try {
+			let icon = i.options.getString("icon");
+			if (/^https?:\/\//i.test(icon)) {
+				await colorRole.setIcon(icon);
+				await i.editReply({files: [{
+					attachment: icon,
+					name: icon.match(/\/(\w*(?:\.png|\.jpg|\.jpeg|\.gif|\.webp))$/i)?.[1] || "icon.png"
+				}]});
+			} else if (icon) {
+				var emoji = Discord.Util.parseEmoji(icon);
+				if (emoji?.id) {
+					await colorRole.setIcon(i.client.rest.cdn.Emoji(emoji.id, emoji.animated ? 'gif' : 'png'));
+				} else {
+					await colorRole.setUnicodeEmoji(icon);
+				}
+				await i.editReply({content: icon});
+			} else {
+				await colorRole.setIcon(null);
+				await i.editReply({content: "icon removed"});
+			}
+		} catch (error) {
+			await i.editReply({content: error.message});
+		}
+	}
+});
+
+
+
+
+
+
 async function user2color(user) {
 	var avatarURL = user.avatarURL({format:'png', size: 16}) || user.defaultAvatarURL;
 	var image = await (await fetch(avatarURL)).buffer();

commands.js

@@ -1,5 +1,7 @@
 var client = require("./client");
 var config = require("./config");
+var Discord = require("discord.js");
+var BaseCommandInteraction = require("discord.js/src/structures/BaseCommandInteraction.js")
 
 var commands = module.exports = [
 	{
@@ -37,40 +39,182 @@ var commands = module.exports = [
 		}
 	},
 	{
-		name: "archive",
+		name: "avatar",
-		description: "Delete a channel without actually deleting it",
+		description: "View a user's original avatar (and save permanently as attachment)",
 		options: [
 			{
-				name: "channel",
+				name: "user",
-				description: "channel",
+				description: "can i not leave some obvious descriptions blank?",
-				type: "CHANNEL"
+				type: "USER"
 			}
 		],
-		defaultPermission: false,
+		exec: async i => {
-		permissions: [
+			var user = i.options.getUser("user") || i.user;
+			var au = user.avatarURL({size:4096, dynamic: true});
+			var an = au.split('/').pop(); an = an.substring(0, an.indexOf('?'));
+			i.reply({files: [{attachment: au, name: an}], embeds: [{
+				title: `Avatar for ${user.tag}`,
+				url: au,
+				image: {url: `attachment://${an}`},
+				color: (await require('./colors').getColorRoleFor(user.id)).color
+			}]});
+		}
+	},
+	{
+		name: "steal",
+		description: "Copy an emoji to this server",
+		options: [
 			{
-				id: config.admin_role,
+				name: "emoji",
-				type: "ROLE",
+				description: "The emoji to steal",
-				permission: true
+				type: "STRING",
+				required: true
+			},
+			{
+				name: "name",
+				description: "Optional rename of stolen emoji",
+				type: "STRING",
+				required: false
 			}
-		]
+		],
+		exec: async i => {
+			await i.deferReply();
+			try {
+				var input = i.options.getString("emoji") || (await i.channel.messages.fetch(i.targetId))?.content;
+				var emoji = Discord.Util.parseEmoji(input);
+				if (!emoji.id || !emoji.name) return void await i.editReply({content: `Invalid emoji input: ${input}`});
+				var url = client.rest.cdn.Emoji(emoji.id, emoji.animated ? 'gif' : 'png');
+				var emoji2 = await i.guild.emojis.create(url, i.options.getString("name") || emoji.name);
+				await i.editReply({content: emoji2.toString()});
+			} catch (error) {
+				await i.editReply({content: error.message});
+			}
+		}
+	},
+	{
+		name: "Steal Emoji",
+		type: "MESSAGE",
+		exec: i => commands.find(x => x.name == "steal").exec(i)
+	},
+	{
+		name: "setserverbanner",
+		description: "Set the server banner image",
+		options: [
+			{
+				name: "url",
+				description: "HTTP(S) URL to an image",
+				type: "STRING"
+			}
+		],
+		exec: async i => {
+			var url = i.options.getString("url");
+			try {
+				if (!url) {
+					await i.guild.setBanner(null);
+					await i.reply("cleared the server banner");
+				} else {
+					if (/^https?:\/\//i.test(url)) {
+						await i.guild.setBanner(url);
+						await i.reply(url);
+					} else {
+						await i.reply("http image url only!");
+					}
+				}
+			} catch (error) {
+				await i.reply(error.message);
+			}
+		}
+	},
+	{
+		name: "setservericon",
+		description: "Change the server icon",
+		options: [
+			{
+				name: "url",
+				description: "HTTP(S) URL to an image",
+				type: "STRING"
+			}
+		],
+		exec: async i => {
+			var url = i.options.getString("url");
+			try {
+				if (!url) {
+					await i.guild.setIcon(null);
+					await i.reply("cleared the server icon");
+				} else {
+					if (/^https?:\/\//i.test(url)) {
+						await i.guild.setIcon(url);
+						await i.reply(url);
+					} else {
+						await i.reply("http image url only!");
+					}
+				}
+			} catch (error) {
+				await i.reply(error.message);
+			}
+		}
+	},
+	{
+		name: "getemoji",
+		description: "Generate a URL for an emoji",
+		options: [
+			{
+				name: "emoji",
+				description: "The emoji (code) or the name of the emoji (case-sensitive)",
+				type: "STRING",
+				required: true
+			},
+			{
+				name: "format",
+				description: "choose image format",
+				type: "STRING",
+				choices: [
+					{name: "PNG", value: "png"},
+					{name: "JPG", value: "jpg"},
+					{name: "WEBP", value: "webp"},
+					{name: "GIF", value: "gif"}
+				]
+			},
+			{
+				name: "size",
+				description: "choose image size",
+				type: "INTEGER",
+				choices: "16,20,22,24,28,32,40,44,48,56,60,64,80,96,100,128".split(',').map(s => ({name: s, value: Number(s)}))
+			}
+		],
+		exec: i => {
+			var emojiname = i.options.getString("emoji");
+			if (emojiname.startsWith('<') && emojiname.endsWith('>')) emoji = Discord.Util.parseEmoji(emojiname);
+			else {
+				if (emojiname.startsWith(':')) emojiname = emojiname.slice(1);
+				if (emojiname.endsWith(':')) emojiname = emojiname.slice(-1);
+				var emoji = client.emojis.cache.find(e => e.name == emojiname);
+				if (!emoji) emoji = client.emojis.cache.find(e => e.name.toLowerCase() == emojiname.toLowerCase());
+				if (!emoji) return void i.reply(`could not find emoji named ${emojiname}`);
+			}
+			if (!emoji.id) return void i.reply(`invalid input`);
+			var qs = [];
+			var size = i.options.getInteger("size");
+			if (size) qs.push(`size=${size}`);
+			var format = i.options.getString("format");
+			if (!format) format = emoji.animated ? "gif" : "png";
+			if (format == "gif" && !emoji.animated) return void i.reply(`Non-animated emoji is not available as GIF.`);
+			if (format == "webp") qs.push(`quality=lossless`);
+			var url = `https://media.discordapp.net/emojis/${emoji.id}.${format}`;
+			if (qs.length > 0) url += '?' + qs.join('&');
+			i.reply(`${emoji.name}.${format}\n${url}`);
+		}
 	}
 ];
 
 client.on("interactionCreate", interaction => {
-	if (interaction.isCommand())
+	if (interaction instanceof BaseCommandInteraction)
-		commands.find(x => x.name == interaction.commandName)?.exec(interaction);
+		commands.find(x => x.name == interaction.commandName)?.exec?.(interaction);
 });
 client.once("ready", async () => {
+	let global_commands = commands.filter(x => x.global);
+	let guild_commands = commands.filter(x => !x.global);
 	let guild = client.guilds.resolve(config.guild);
-	await guild.commands.set(commands);
+	await guild.commands.set(guild_commands);
-	await guild.commands.permissions.set({
+	await client.application.commands.set(global_commands);
-		fullPermissions: commands.map(local_command => {
-			let discord_command = guild.commands.cache.find(discord_command => local_command.name == discord_command.name);
-			return {
-				id: discord_command.id,
-				permissions: local_command.permissions
-			}
-		})
-	});
 });

config.js

@@ -7,13 +7,82 @@ module.exports = {
 	admin_role: "776899554603565116",
 	human_role: "672956630962274306",
 	bot_role: "673671040010027034",
-	eval_undefined_emoji: "707729833601531935",
+	inactive_role: "892869309603389500",
-	default_channel: "672956424162115586",
+	verified_role: "949064806030254130",
-	bot_channel: "782353314137505793",
+	view_archived_channels_role: "916056534402863125",
+	eval_undefined_emoji: "🅱️",
+	mi_emoji: "887931046086185060",
+	ki_emoji: "887935846710394910",
+	default_channel: "949831184957980722",
+	bot_channel: "949831221981097984",
 	archive_channel: "802280618636869663",
 	moe_channel: "871864787213111366",
-	porn_channel: "835734868427669574",
+	porn_channel: "949831237927862333",
+	announcement_channel: "876010629490683955",
+	miku_channel: "900583427483516938",
 	archive_category: "887838689533771776",
+	archive_portal_voice_channel: "916057450313023508",
 	data_dir: process.cwd() + "/data/",
-	web_hostname: "ldb.owo69.me",
+	base_uri: "https://ldb.owo69.me",
+	world_clock: [
+		{
+			flag: "🇺🇸",
+			timezone: "America/Los_Angeles",
+			channel: "887897732428226660"
+		},
+		{
+			flag: "🇺🇸",
+			timezone: "America/New_York",
+			channel: "888507872932143155"
+		},
+		{
+			flag: "🇩🇪",
+			timezone: "Europe/Berlin",
+			channel: "887897886879281203"
+		},
+		{
+			flag: "🇷🇺",
+			timezone: "Europe/Moscow",
+			channel: "887897904738599002"
+		},
+		{
+			flag: "🇵🇭",
+			timezone: "Asia/Manila",
+			channel: "888505937315389451"
+		},
+		{
+			flag: "🇯🇵",
+			timezone: "Asia/Tokyo",
+			channel: "887897753198419999"
+		}
+	],
+	pixiv_subscriptions: [
+		{
+			tag: "初音ミク",
+			channel: "900583427483516938"
+		},
+		{
+			tag: "鏡音リン",
+			channel: "904093976615849996"
+		},
+		{
+			tag: "重音テト",
+			channel: "904093991224627270"
+		},
+		{
+			tag: "巡音ルカ",
+			channel: "916444961958928394"
+		}
+	],
+	vrchat_status_category: "959236139913445376",
+	vrchat_configuration: {
+		username: process.env.VRCHAT_USERNAME,
+		password: process.env.VRCHAT_PASSWORD
+	},
+	masto: {
+		url: "https://mastodong.lol",
+		accessToken: process.env.MASTO_TOKEN
+	},
+	masto_account_id: "108643271047165149",
+	masto_webhook: process.env.DISCORD_WEBHOOK_FOR_MASTO
 }

count-cmd.js

@@ -0,0 +1,25 @@
+var commands = require("./commands");
+var app = require("./www");
+var config = require("./config");
+
+var mediaProxyUAs = [
+    "Mozilla/5.0 (Macintosh; Intel Mac OS X 11.6; rv:92.0) Gecko/20100101 Firefox/92.0",
+    "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:38.0) Gecko/20100101 Firefox/38.0"
+];
+var img = Buffer.from("iVBORw0KGgoAAAANSUhEUgAAACMAAAAhCAYAAABTERJSAAACpUlEQVRYCa2XvW7bQAzH6SRApyJAkSHwlqHoJHSNgSx+lQx9iD5AH6KDX0VLAHctNHboFmQoCnTs0Kb40yJL8cg7WY4A43Q8fvxM8k7Sik64rq/ePtfMn358W9XW/dqFF7TmFuBxuKPV9S40eX66p3VHCjsHbDa5QDx+viTadCFAKtwPtP7wi5drULNgALIIwtONUBlQE+bFQASsAlSFURAi2n78K+507D+dHV8yWCdAKYyCbDrabr8qQHSzCCoAOoucWxC7jqB9//7wQ1bGK8qarKXjpiP0IWKJTpgZhhnuRCcf94OWD5BLrnX3QNLQBUyWFdTZZmBRaSJaU6740AvOEQsCn5j3feSdwh5LM8exHtjR/8LHfo+WZs0OebYmQSYwWiJZPWHkMgb2EZA08gSGbYMSQe6d+7nEld3myxr5EBt5vJQ9sx/ig2zTpT2iTls3mQ/EJKISxjm0aU2b0NksnZZlMp4Awmk3B5xZrt76Mvp5ZBxnZjxT1AH3Uf2RUDjPSuIVxxJBHMLwGdJ6CLpDUGLwH0g2gehkY1Gm319+HnStQ0MvjqLdgjXIbZ+JfjiOfiXmJDN4Rtzs8CI1ZYwCh82cZKsGgrWb3Tk/nyYwOPTeXb2Otzb+deNVAo5DSE8TZBoqCqOnry3P6GRugCiDngMPXHsdSnTOIoapgVjD6n1rxzkI8SUlwvziZBDTJ0UGEwABsVlhGF4ISiMGdsx6Rs+jRnDrCyA2K1jTnrGK2b3+c38oZgaJPAKB6nQPJ8aFeGYmCzsiykCge1RmYJCVKgrsZTUQ6B4yc0StUSrtER8tmQMCn7e+R7w6v5Av2VF4q/9+/4de3b7xPnkuWZBF+QKQeTTq1wGAoND8pjZv82ITOYZsDoC1VRgRtgIsCSK+W+M/mSFEURCM3rAAAAAASUVORK5CYII=","base64");
+
+commands.push({
+	name: "count",
+	description: "Estimate how many clients are looking at the channel",
+	exec: async i => {
+		var count = 0;
+		var route = `/tmp/${Math.random()}`;
+		app.get(route, (req, res) => {
+			if (mediaProxyUAs.includes(req.headers["user-agent"])) count++;
+			res.type("png").send(img);
+		});
+		await i.reply(config.base_uri + route);
+		await new Promise(r => setTimeout(r, 1000));
+		await i.editReply(`It appears there might be **${count}** clients viewing this channel right now.`);
+	}
+});

datastore.js

@@ -0,0 +1,31 @@
+var fs = require("fs");
+var config = require("./config");
+
+module.exports = class DataStore {
+	constructor(id) {
+		if (id.includes('/')) throw new Error("NO");
+		this.dir = `${config.data_dir}/${id}/`;
+		if (!fs.existsSync(this.dir)) fs.mkdirSync(this.dir);
+	}
+	get(key) {
+		if (key.includes('/')) throw new Error("NO");
+		try {
+			return fs.readFileSync(this.dir + key, "utf8") || true;
+		} catch (error) {
+			if (error.code == "ENOENT") return false;
+			else throw error;
+		}
+	}
+	put(key, value) {
+		if (key.includes('/')) throw new Error("NO");
+		return fs.writeFileSync(this.dir + key, String(value) || '');
+	}
+	del(key) {
+		if (key.includes('/')) throw new Error("NO");
+		try {
+			return fs.unlinkSync(this.dir + key);
+		} catch (error) {
+			if (error.code != "ENOENT") throw error;
+		}
+	}
+}

discord-misc.js

@@ -0,0 +1,81 @@
+var client = require("./client.js");
+var config = require("./config");
+
+
+client.on("guildMemberAdd", member => {
+	if (member.guild.id != config.guild) return;
+	// add role
+	member.roles.add(member.user.bot ? config.bot_role : config.human_role);
+	// welcome message
+	/*setTimeout(() => {
+		client.channels.resolve(config.default_channel)?.send(
+			`Welcome ${member}. Please tell from where you entered this server and some other info about yourself in order to gain access to message history.`
+		);
+	}, 3000);*/
+	member.roles.add(config.verified_role);
+});
+// join message
+/*client.on("messageDelete", message => {
+	if (message.channel.id != config.default_channel) return;
+	if (message.type != "GUILD_MEMBER_JOIN") return;
+	client.channels.resolve(config.default_channel)?.send(
+		`sussy baka ${message.author} deleted their join message ||(from <t:${Math.floor(message.createdAt.valueOf()/1000)}>)||`
+	);
+});*/
+client.on("guildMemberRemove", member => {
+	if (member.guild.id != config.guild) return;
+	// leave message
+	client.channels.resolve(config.default_channel)?.send(random([
+		`${member.user.username} left`,
+		`${member.user.username} disappeared`,
+		`${member.user.username.toLowerCase()} is gone`
+	]));
+});
+
+
+client.on("messageCreate", message => {
+	// comment thread on announcements
+	message.channel.id == config.announcement_channel && message.startThread({name: "Comments"});
+	// stupid m bot
+	message.author.id == "732072478519722096" && message.content.endsWith("is bad letter m is much better") && message.delete();
+});
+
+
+// add reactions to video and audio
+{
+	let a = async m => {
+		if (m.guild?.id != config.guild) return;
+		if ((m.embeds.some(e => e.type == "video") || m.attachments.some(a => a.contentType?.startsWith('video'))) && !m.g) {
+			m.g = true;
+			m.react(config.mi_emoji);
+		}
+		if (m.attachments.some(a => a.contentType?.startsWith('audio')) && !m.d) {
+			m.d = true;
+			m.react(config.ki_emoji);
+		}
+	}
+	client.on("messageCreate", a);
+	client.on("messageUpdate", (r, q) => a(q));
+}
+
+// thing to access archived channels
+client.on("voiceStateUpdate", (oldState, newState) => {
+	if (newState.guild.id != config.guild) return;
+	if (oldState.channelId != config.archive_portal_voice_channel && newState.channelId == config.archive_portal_voice_channel) {
+		// join
+		newState.member?.roles.add(config.view_archived_channels_role);
+	} else if (oldState.channelId == config.archive_portal_voice_channel && newState.channelId != config.archive_portal_voice_channel) {
+		// leave
+		newState.member?.roles.remove(config.view_archived_channels_role);
+	}
+});
+
+// save deleted emojis
+client.on("emojiDelete", emoji => {
+	client.channels.resolve(config.bot_channel)?.send({
+		content: "emoji deleted",
+		files: [{attachment: emoji.url, name: `${emoji.name}.${emoji.url.split('.').pop()}`}]
+	});
+});
+
+//g=setInterval(() => client.guilds.resolve(config.guild)?.setIcon(`mf/${Math.floor(Math.random()*14548)}.png`), 1800000);

docker-build-and-run.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-cd `dirname "$0"`
-docker stop ldb
-docker rm ldb
-docker build --no-cache -t ledlamp/lampdiscordbot .
-docker run -d --name ldb --restart=unless-stopped -p 127.0.0.1:9251:9251 --env-file=secrets.env -v /srv/ldb/data:/app/data ledlamp/lampdiscordbot

eval-exec.js

@@ -4,11 +4,12 @@ var Discord = require("discord.js");
 
 
 client.on("messageCreate", async function (message) {
+	if (message.author.id == client.user.id) return;
 	if (!message.member?.roles.cache.has(config.admin_role)) return;
 	if (message.content.startsWith("!>")) {
 		with (message) {
 			try {
-				var x = await eval(message.content.substr(2).trim());
+				var x = await eval(message.content.substring(2).trim());
 			} catch(e) {
 				var x = e.message;
 			}

index.js

@@ -1,13 +1,21 @@
+process.title = "lamp discord bot";
 process.on("unhandledRejection", error => {
-	console.error("Unhandled Rejection:\n" + error.stack);
+	console.error("Unhandled Rejection:\n", error.stack || error);
 });
 
 require("./util"); // global variables set in here
 require("./client");
+require("./discord-misc");
 require('./eval-exec');
 require('./colors');
 require('./www');
 require('./pinboard');
 require('./pixiv-embedder');
-require('./漢字ゲーム');
 require('./translate2');
+require('./world-clock');
+require('./buttonthing');
+require("./activitytracker");
+require("./vocabularygame");
+require("./pixiv-subscribe");
+require("./count-cmd");
+require("./masto");

ldb.service

@@ -0,0 +1,14 @@
+[Unit]
+Description=Bot for Lamp Discord Server
+After=network.target
+
+[Service]
+User=ldb
+Group=ldb
+WorkingDirectory=/srv/ldb
+EnvironmentFile=/srv/ldb/secrets.env
+ExecStart=node index.js
+Restart=on-success
+
+[Install]
+WantedBy=multi-user.target

masto.js

@@ -0,0 +1,39 @@
+var {login} = require("masto");
+var config = require("./config");
+var client = require("./client");
+var {WebhookClient} = require("discord.js");
+
+var webhook = new WebhookClient({url: config.masto_webhook});
+module.exports.webhook = webhook;
+
+client.once("ready", async () => {
+	var donger = await login(config.masto);
+	console.log("donger logged in");
+	module.exports.donger = donger;
+	(async function openStream() {
+		try {
+			var stream = await donger.stream.streamUser();
+			module.exports.stream = stream;
+			stream.on("update", toot => {
+				
+				if (toot.account.id != config.masto_account_id) return;
+				if (toot.visibility != "public") return;
+				if (toot.inReplyToAccountId && toot.inReplyToAccountId != toot.account.id) return;
+
+				webhook.send(toot.url || toot.reblog.url); //todo maybe custom embed
+
+				//todo maybe handle deletes
+			});
+			stream.ws.on("close", () => {
+				console.log("donger stream closed");
+				setTimeout(openStream, 10000);
+			});
+		} catch (error) {
+			console.error("donger stream", error.message);
+			setTimeout(openStream, 60000);
+		}
+	})();
+});
+
+
+

package.json

@@ -1,11 +1,14 @@
 {
   "dependencies": {
+    "@discordjs/voice": "^0.7.5",
     "deepl": "^1.0.12",
-    "discord.js": "^13.1.0",
+    "discord.js": "^13.6.0",
     "express": "^4.17.1",
     "fast-average-color-node": "^1.0.3",
     "kuroshiro": "^1.2.0",
     "kuroshiro-analyzer-kuromoji": "^1.1.0",
+    "libsodium-wrappers": "^0.7.9",
+    "masto": "^4.4.0",
     "node-fetch": "^2.6.1"
   }
 }

pinboard.js

@@ -5,15 +5,31 @@ var Discord = require("discord.js");
 var client = require("./client");
 var config = require("./config");
 var app = require("./www");
+var commands = require("./commands");
+
+
+/*commands.push({
+	type: "MESSAGE",
+	name: "Archive",
+	exec: async i => {
+		let message = await i.channel.messages.fetch(i.targetId);
+		let asdf = await doThing(message, i.user);
+		i.reply({
+			content: `https://discord.com/channels/${asdf.guild.id}/${asdf.channel.id}/${asdf.id}`,
+			ephemeral: true
+		});
+	}
+});*/
+
 
 client.on("messageReactionAdd", async (reaction, user) => {
 	if (reaction.emoji.name == '📍' || reaction.emoji.name == '📌') {
 		if (!reaction.message.guild) return;
 		if (reaction.message.channel.id == config.archive_channel) return;
-		if (reaction.message['has been "pinned"'] || reaction.count > 1) return;
+		if (reaction.message['has been pinned'] || reaction.count > 1) return;
-		reaction.message['has been "pinned"'] = true;
+		reaction.message['has been pinned'] = true;
 
-		if (reaction.message.channel.id == config.porn_channel) {
+		/*if (reaction.message.channel.id == config.porn_channel)*/ {
 			try {
 				await reaction.message.pin();
 			} catch (e) {
@@ -31,35 +47,33 @@ client.on("messageReactionAdd", async (reaction, user) => {
 			}
 		}
 
-		// cache avatar because discord doesn't keep it if they change it
+		doThing(reaction.message, user);
-		var avatarURL = reaction.message.author.avatarURL({dynamic: true});
-		if (avatarURL) {
-			let afn = avatarURL.split('/').pop();
-			let lapath = config.data_dir + "avatars/" + afn;
-			if (!fs.existsSync(lapath)) {
-				try {
-					(await fetch(avatarURL)).body.pipe(fs.createWriteStream(lapath));
-				} catch (error) {
-					console.error("avatar download", error.message);
-				}
-			}
-			avatarURL = `https://${config.web_hostname}/avatars/${afn}`
-		} else avatarURL = reaction.message.author.defaultAvatarURL;
-
-		let imageCandidate = reaction.message.attachments.find(a => [".png",".jpg",".jpeg",".webp",".gif"].some(e => a.url.toLowerCase().endsWith(e)));
-		if (imageCandidate) imageCandidate["will be used for the image of the embed"] = true;
-		else imageCandidate = reaction.message.embeds.find(e => e.type == 'image');
-		let embed = new Discord.MessageEmbed()
-			.setAuthor(reaction.message.member?.displayName || reaction.message.author.username, avatarURL)
-			.setDescription(reaction.message.content)
-			.setImage(imageCandidate?.url)
-			.setFooter(`Pinned by ${reaction.message.guild.members.resolve(user)?.displayName || user.username}`)
-			.setTimestamp(reaction.message.createdAt)
-			.setColor(reaction.message.member?.roles.color?.color);
-		let attachments = reaction.message.attachments.filter(a => !a["will be used for the image of the embed"]).map(a => `[${a.name}](${a.url})`).join('\n');
-		if (attachments) embed.addField("Attachments", attachments);
-		(await client.channels.fetch(config.archive_channel))?.send({content: `https://discord.com/channels/${reaction.message.guild.id}/${reaction.message.channel.id}/${reaction.message.id}`, embeds:[embed]});
 	}
 });
 
+
+async function doThing(message, user) {
+	var avatarURL = message.author.avatarURL({dynamic: true}) || message.author.defaultAvatarURL;
+	var avatarName = avatarURL.split('/').pop();
+	let imageCandidate = message.attachments.find(a => [".png",".jpg",".jpeg",".webp",".gif"].some(e => a.url.toLowerCase().endsWith(e)));
+	if (imageCandidate) imageCandidate["will be used for the image of the embed"] = true;
+	else imageCandidate = message.embeds.find(e => e.type == 'image');
+	let embed = new Discord.MessageEmbed()
+		.setAuthor(message.member?.displayName || message.author.username, `attachment://${avatarName}`)
+		.setDescription(message.content)
+		.setImage(imageCandidate?.url)
+		.setFooter(`Pinned by ${message.guild.members.resolve(user)?.displayName || user.username}`)
+		.setTimestamp(message.createdAt)
+		.setColor(message.member?.roles.color?.color);
+	let attachments = message.attachments.filter(a => !a["will be used for the image of the embed"]).map(a => `[${a.name}](${a.url})`).join('\n');
+	if (attachments) embed.addField("Attachments", attachments);
+	return (await client.channels.fetch(config.archive_channel))?.send({
+		content: `https://discord.com/channels/${message.guild.id}/${message.channel.id}/${message.id}`,
+		files: [{attachment: avatarURL, name: avatarName}],
+		embeds:[embed]
+	});
+}
+
+
+
 app.use("/avatars/", require("express").static(config.data_dir + "avatars/"));

pixiv-embedder.js

@@ -1,16 +1,13 @@
 var fetch = require("node-fetch");
-var https = require("https");
-var fs = require("fs");
-
 var client = require("./client");
 var config = require("./config");
 var commands = require("./commands");
-var app = require("./www");
 
 client.on("messageCreate", async message => {
-	if (message.guild.id != config.guild) return;
+	if (message.guild?.id != config.guild) return;
+	if (message.author.bot) return;
 	if (message.author.id == client.user.id) return;
-	let pixiv_urls = new Set(message.content.match(/https?:\/\/(?:www\.)?pixiv\.net(?:\/en)?\/artworks\/\d+\b/g));
+	let pixiv_urls = new Set(message.content.match(/(?<!\/)https?:\/\/(?:www\.)?pixiv\.net(?:\/en)?\/artworks\/\d+\b/g));
 	if (!pixiv_urls.size) return;
 	message.suppressEmbeds();
 	// suppressing embeds doesn't work on embeds that load after
@@ -45,13 +42,13 @@ commands.push({
 
 
 // using this code for embedding links and for slash commands
-async function embedPixiv(/*message*/ channel, /*array of*/ links, send /* channel.send or interaction.reply function */, showLinks /* include pixiv links in response content */) {
+async function embedPixiv(/*message*/ channel, /*array of*/ links, send = channel.send.bind(channel) /* or interaction.reply function */, showLinks /* include pixiv links in response content */) {
 	for (let link of links) {
 		try {
 			let illust = Object.values(JSON.parse((await (await fetch(link)).text()).match(/<meta name="preload-data" id="meta-preload-data" content='(.*)'>/)[1]).illust)[0];
-			let content;
+			let content = `**${illust.title}**\n`;
 			if (showLinks || illust.illustType == 2) {
-				content = `<${link}>${illust.illustType == 2 ? " is an animation (must open link to play)" : ''}`;
+				content += `<${link}>${illust.illustType == 2 ? " is an animation (must open link to play)" : ''}`;
 			}
 			let images = [];
 			for (let i = 0; i < illust.pageCount; i++) images.push({url: illust.urls.original.replace('p0', 'p'+i)});
@@ -70,9 +67,7 @@ async function embedPixiv(/*message*/ channel, /*array of*/ links, send /* chann
 				}
 			} else await fallback();
 			function fallback() {
-				// save the data already downloaded
+				let urls = images.map(image => image.url.replace("i.pximg.net", "px.owo39.me"));
-				for (let image of images) if (image.data) fs.writeFileSync(config.data_dir + "pixiv-cache/" + image.url.split('?')[0].replace(/\//g, '\\'), image.data);
-				let urls = images.map(image => image.url.replace("https://i.pximg.net/", `https://${config.web_hostname}/pixiv-proxy/`));
 				if (illust.xRestrict && !channel.nsfw) urls = urls.map(url => `||${url} ||`);
 				urls = urls.join('\n');
 				if (urls.length > 2000) {
@@ -92,35 +87,4 @@ async function embedPixiv(/*message*/ channel, /*array of*/ links, send /* chann
 	}
 }
 
-
+module.exports.embedPixiv = embedPixiv;
-
-
-app.use("/pixiv-proxy/", (req, res, next) => {
-	if (req.method != "GET") return next();
-	let local_file_path = config.data_dir + "pixiv-cache/" + req.url.split('?')[0].replace(/\//g, '\\');
-	if (fs.existsSync(local_file_path)) res.sendFile(local_file_path);
-	else {
-		https.get(`https://i.pximg.net${req.url}`, {
-			headers: {
-				"Referer": "https://www.pixiv.net/"
-			}
-		}, function (origin_res) {
-			if (res.statusCode != 200) return res.status(502).send(`upstream said ${res.statusCode}`);
-			res.writeHead(200, {
-				"Content-Type": origin_res.headers["content-type"]
-			});
-			let local_file_stream = fs.createWriteStream(local_file_path);
-			origin_res.on("data", data => {
-				res.write(data);
-				local_file_stream.write(data);
-			});
-			origin_res.on("end", () => {
-				res.end();
-				local_file_stream.end();
-			});
-		}).on("error", error => {
-			res.status(502).send(error.message);
-			console.error("pixiv proxy error,", error.message);
-		});
-	}
-});

pixiv-subscribe.js

@@ -0,0 +1,32 @@
+var client = require("./client");
+var DataStore = require("./datastore");
+var fetch = require("node-fetch");
+var {embedPixiv} = require("./pixiv-embedder");
+var config = require("./config");
+
+async function check(tag, channel) {
+	var ds = new DataStore(`s${tag}`);
+	var t = encodeURIComponent(tag);
+	var data = await (await fetch(`https://www.pixiv.net/ajax/search/artworks/${t}?word=${t}&order=date_d&mode=all&p=1&s_mode=s_tag_full&type=all&lang=en`)).json();
+	var illusts = data.body.illustManga.data;
+	var newPosts = [];
+	for (let owo of illusts) {
+		if (!ds.get(owo.id)) {
+			newPosts.push(owo);
+			ds.put(owo.id);
+		} else break;
+	}
+	for (let i = newPosts.length - 1; i >= 0; i--) {
+		let url = `https://www.pixiv.net/en/artworks/${newPosts[i].id}`;
+		await embedPixiv(
+			client.channels.resolve(channel),
+			[url],
+			undefined,
+			true
+		);
+	}
+}
+module.exports.check = check;
+module.exports.interval = setInterval(function() {
+	config.pixiv_subscriptions.forEach(x => check(x.tag, x.channel));
+}, 1000*60*60);

translate2.js

@@ -6,15 +6,47 @@ var KuromojiAnalyzer = require("kuroshiro-analyzer-kuromoji");
 var kuroshiro = new Kuroshiro();
 kuroshiro.init(new KuromojiAnalyzer());
 
+var lang2flag = {
+	BG: '🇧🇬',
+	CS: '🇨🇿',
+	DA: '🇩🇰',
+	DE: '🇩🇪',
+	EL: '🇬🇷',
+	EN: '🇬🇧',
+	'EN-GB': '🇬🇧',
+	'EN-US': '🇺🇸',
+	ES: '🇪🇸',
+	ET: '🇪🇪',
+	FI: '🇫🇮',
+	FR: '🇫🇷',
+	HU: '🇭🇺',
+	IT: '🇮🇹',
+	JA: '🇯🇵',
+	LT: '🇱🇹',
+	LV: '🇱🇻',
+	NL: '🇳🇱',
+	PL: '🇵🇱',
+	PT: '🇵🇹',
+	'PT-PT': '🇵🇹',
+	'PT-BR': '🇧🇷',
+	RO: '🇷🇴',
+	RU: '🇷🇺',
+	SK: '🇸🇰',
+	SL: '🇸🇮',
+	SV: '🇸🇻',
+	ZH: '🇨🇳'
+};
+
 
 commands.push({
 	name: "toen",
 	description: "Translate text to English",
+	global: true,
 	options: [
 		{
 			type: "STRING",
 			name: "text",
-			description: "Text",
+			description: "Text to translate",
 			required: true
 		}
 	],
@@ -23,20 +55,70 @@ commands.push({
 commands.push({
 	name: "toja",
 	description: "Translate text to Japanese",
+	global: true,
 	options: [
 		{
 			type: "STRING",
 			name: "text",
-			description: "Text",
+			description: "Text to translate",
 			required: true
 		}
 	],
 	exec: i => t(i, "JA")
 });
+commands.push({
+	name: "tolang",
+	description: "Translate text to any language",
+	global: true,
+	options: [
+		{
+			type: "STRING",
+			name: "lang",
+			description: "Language to translate to",
+			required: true,
+			choices: [
+				{ name: 'Bulgarian', value: 'BG' },
+				{ name: 'Czech', value: 'CS' },
+				{ name: 'Danish', value: 'DA' },
+				{ name: 'German', value: 'DE' },
+				{ name: 'Greek', value: 'EL' },
+				{ name: 'English (British)', value: 'EN-GB' },
+				{ name: 'English (American)', value: 'EN-US' },
+				{ name: 'Spanish', value: 'ES' },
+				{ name: 'Estonian', value: 'ET' },
+				{ name: 'Finnish', value: 'FI' },
+				{ name: 'French', value: 'FR' },
+				{ name: 'Hungarian', value: 'HU' },
+				{ name: 'Italian', value: 'IT' },
+				{ name: 'Japanese', value: 'JA' },
+				{ name: 'Lithuanian', value: 'LT' },
+				{ name: 'Latvian', value: 'LV' },
+				{ name: 'Dutch', value: 'NL' },
+				{ name: 'Polish', value: 'PL' },
+//				{ name: 'Portuguese (all Portuguese varieties excluding Brazilian Portuguese)', value: 'PT-PT' },
+				{ name: 'Portuguese (Brazilian)', value: 'PT-BR' },
+				{ name: 'Romanian', value: 'RO' },
+				{ name: 'Russian', value: 'RU' },
+				{ name: 'Slovak', value: 'SK' },
+				{ name: 'Slovenian', value: 'SL' },
+				{ name: 'Swedish', value: 'SV' },
+				{ name: 'Chinese', value: 'ZH' }
+			]
+		},
+		{
+			type: "STRING",
+			name: "text",
+			description: "Text to translate",
+			required: true
+		}
+	],
+	exec: i => t(i, i.options.getString("lang"))
+});
 
 async function t(i, target_lang) {
 	var text = i.options.getString("text");
 	await i.deferReply();
+
 	try {
 		var translation = (await deepl({
 			text,
@@ -47,15 +129,40 @@ async function t(i, target_lang) {
 	} catch (error) {
 		return void await i.editReply(error.message);
 	}
-	if (translation.detected_source_language == "JA") {
+
-		try {
+	if (translation.detected_source_language == "JA") try {
-			var input_romaji = await kuroshiro.convert(text, {to: "romaji", mode: "spaced"});
+		var input_romaji = await kuroshiro.convert(text, {to: "romaji", mode: "spaced"});
-		} catch (error) {}
+	} catch (error) {}
-	}
+	if (target_lang == "JA") try {
-	if (target_lang == "JA") {
+		var output_romaji = await kuroshiro.convert(translation.text, {to: "romaji", mode: "spaced"});
-		try {
+	} catch (error) {}
-			var output_romaji = await kuroshiro.convert(translation.text, {to: "romaji", mode: "spaced"});
+
-		} catch (error) {}
+	let input_flag = lang2flag[translation.detected_source_language] || `[${translation.detected_source_language}]`;
-	}
+	let output_flag = lang2flag[target_lang] || `[${target_lang}]`;
-	await i.editReply(`${text}${input_romaji ? `\n${input_romaji}` : ''}\n${translation.text}${output_romaji ? `\n${output_romaji}` : ''}`);
+
+	let msg = input_flag + ' ' + text;
+	if (input_romaji) msg += '\n' + input_flag + ' ' + input_romaji;
+	msg += '\n' + output_flag + ' ' + translation.text;
+	if (output_romaji) msg += '\n' + output_flag + ' ' + output_romaji;
+
+	await i.editReply(msg);
+
+	try {
+		var reverse_translation = (await deepl({
+			text: translation.text,
+			target_lang: translation.detected_source_language,
+			free_api: true,
+			auth_key: config.deepl_auth_key
+		})).data.translations[0];
+		if (normalize(text) != normalize(reverse_translation.text)){
+			if (translation.detected_source_language == "JA") try {
+				var reverse_romaji = await kuroshiro.convert(reverse_translation.text, {to: "romaji", mode: "spaced"});
+			} catch (error) {}
+			await i.editReply(`${msg}\n🔁 ${reverse_translation.text}${reverse_romaji ? `\n🔁 ${reverse_romaji}` : ''}`);
+		}
+	} catch(error) {}
+}
+
+function normalize(text) {
+	return text.toLowerCase()//.split('').filter(x => x.match(/[a-z0-9 ]/)).join('');
 }

world-clock.js

@@ -0,0 +1,21 @@
+var client = require("./client");
+var config = require("./config");
+
+client.once("ready", () => {
+	(function clock() {
+		var d = new Date();
+		for (let x of config.world_clock) {
+			let t = x.flag + ' ' + Intl.DateTimeFormat("en", {
+				timeZone: x.timezone,
+				hour: 'numeric',
+				//minute: 'numeric',
+				timeZoneName: 'long',
+				hour12: true
+			}).format(d);
+			t = t.replace(/[a-z]+(?: |$)/g, ''); // most of the abbrv are GMT+n >:(
+			client.channels.resolve(x.channel)?.setName(t);
+		}
+		d.setMinutes(60);
+		setTimeout(clock, d - Date.now());
+	})();
+});