merge main into develop

.github/workflows/docker-develop-publish.yml

@@ -10,22 +10,22 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Log in to Docker Hub
-        uses: docker/login-action@28218f9b04b4f3f62068d7b6ce6ca5b26e35336c
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
+        uses: docker/metadata-action@v5
         with:
           images: ecsouthwick/embetter
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@ac9327eae2b366085ac7f6a2d02df8aa8ead720a
+        uses: docker/build-push-action@v5
         with:
           context: .
           push: true

.github/workflows/docker-image.yml

@@ -13,6 +13,6 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Build the Docker image
       run: docker build . --file Dockerfile --tag ecsouthwick/embetter

.github/workflows/docker-latest-publish.yml

@@ -19,22 +19,22 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Log in to Docker Hub
-        uses: docker/login-action@28218f9b04b4f3f62068d7b6ce6ca5b26e35336c
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
+        uses: docker/metadata-action@v5
         with:
           images: ecsouthwick/embetter
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@ac9327eae2b366085ac7f6a2d02df8aa8ead720a
+        uses: docker/build-push-action@v5
         with:
           context: .
           push: true

Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-FROM node:18-alpine
+FROM node:20-alpine
 ENV NODE_ENV=production
 
 WORKDIR /app

PRIVACY.md

@@ -0,0 +1,27 @@
+# Embetter Discord Bot - Privacy Policy
+
+## Introduction
+Welcome to the Privacy Policy for the Embetter Discord Bot. We are committed to protecting your privacy and ensuring you have a secure experience while using our bot. This policy explains what data we collect, how we use it, and what controls you have over your data.
+
+## Data We Collect
+The only data we collect is the identification information for your Discord server, commonly known as the guild ID. This guild ID is essential for customizing and operating Embetter within your specific Discord server.
+
+## No Message Storage
+Rest assured, we do not store any of your messages. Our bot is designed to interact with you in real-time and does not maintain any historical records of your text or voice conversations.
+
+## How We Use Data
+The guild ID we collect is used exclusively for configuring Embetter to function as designed within your Discord server. This includes custom settings, features, and functionalities that you may enable or disable.
+
+## Data Sharing
+We do not share your guild ID or any other data with third parties. The only exceptions would be in compliance with legal requirements or if you explicitly authorize us to do so.
+
+## Security
+While it is true that no method of data storage is completely secure, we take robust security measures to protect the data we do collect. This includes encryption and secure access controls.
+
+## Data Deletion
+To get your data deleted, you can either remove the bot from your server, or contact us directly. Upon receiving your request, we will promptly delete the guild ID and any associated settings from our database.
+
+## Contact Information
+For any questions or concerns about this Privacy Policy, please contact us through our Discord server [here](https://discord.gg/2mhXfRNHak) or via email at [email protected].
+
+Last Updated: 2023-10-24

TERMS.md

@@ -0,0 +1,30 @@
+# Embetter Discord Bot - Terms of Service
+
+## Introduction
+Welcome to Embetter, a Discord bot designed to enhance your Discord experience. By using Embetter, you agree to comply with and be bound by the following Terms of Service. Please read them carefully.
+
+## User Responsibilities
+As a user of Embetter, you agree not to:
+- Abuse or exploit any bugs, glitches, or errors in the bot.
+- Use the bot for any illegal or unauthorized purposes.
+- Spam commands or messages.
+
+## Data Usage
+We may collect data to improve the bot and enhance user experience. This data will not be shared with third parties for commercial purposes.
+
+## Disclaimer
+Embetter is provided "as is" without any warranties of any kind, either express or implied.
+
+## Limitations of Liability
+We will not be liable for any damages or losses incurred from the use or misuse of Embetter.
+
+## Termination of Service
+We reserve the right to terminate or suspend access to our bot without prior notice for conduct that we believe violates these Terms of Service or is harmful to other users of Embetter, us, or third parties, or for any other reason.
+
+## Miscellaneous
+These Terms of Service shall be governed by and construed in accordance with the laws of the jurisdiction in which you reside. Any disputes will be handled in the jurisdiction in which you reside.
+
+## Contact Information
+For any questions about these Terms of Service, please contact us at [email protected].
+
+Last Updated: 2023-10-24

package.json

@@ -13,7 +13,7 @@
   "license": "GPL-3.0",
   "dependencies": {
     "discord.js": "^14.11.0",
-    "mongodb": "^5.7.0",
+    "mongodb": "^6.0.0",
     "open-graph-scraper": "^6.2.1"
   },
   "devDependencies": {

renovate.json

@@ -0,0 +1,11 @@
+{
+    "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+    "extends": [
+        "config:recommended",
+        ":automergeStableNonMajor",
+        "schedule:nonOfficeHours"
+    ],
+    "baseBranches": [
+        "develop"
+    ]
+}

src/commands/slash/utility/help.js

@@ -0,0 +1,35 @@
+// path/to/your/command/files/help.js
+
+const { SlashCommandBuilder, PermissionFlagsBits } = require('discord.js');
+
+module.exports = {
+	data: new SlashCommandBuilder()
+		.setName('help')
+		.setDescription('Displays the help page.')
+		.setDefaultMemberPermissions(PermissionFlagsBits.ViewChannel)
+		.setDMPermission(true),
+	async execute(interaction) {
+		const privacyPolicyLink = 'https://github.com/everettsouthwick/embetter/blob/main/PRIVACY.md';
+
+		const helpMessage = `
+**Embetter help information**
+
+1. **/archive**: Attempts to embed and archive the provided link(s).
+    - Option: \`link\` (required) - Space separated list of link(s) to embed.
+
+2. **/embed**: Attempts to embed the provided link(s).
+    - Option: \`link\` (required) - Space separated list of link(s) to embed.
+
+3. **/mode**: Configure the embed mode.
+    - Subcommand: \`set\` - Sets the mode for embeds. Options: Replace, Reply, Ask, Manual.
+
+4. **/platform**: Configure the platforms.
+    - Subcommand: \`set\` - Sets the platform for embeds. Choices: Instagram, Threads, TikTok, etc.
+    - Subcommand: \`list\` - Lists the platforms and their status.
+
+View our [privacy policy](<${privacyPolicyLink}>) for data retention and privacy information.
+`;
+
+		await interaction.reply({ content: helpMessage, ephemeral: true });
+	},
+};

src/utils/handleLinkResponse.js

@@ -15,17 +15,26 @@ async function sendReplyModeMessage(messageOrInteraction, links, embeds) {
 		new ButtonBuilder().setCustomId('keep').setLabel('Keep').setStyle(ButtonStyle.Primary),
 		new ButtonBuilder().setCustomId('delete').setLabel('Delete').setStyle(ButtonStyle.Danger),
 	)];
-	const options = { content: links.join('\n'), embeds: embeds.length ? embeds : undefined, components };
+	const options = { content: links.join('\n'), embeds: embeds.length ? embeds : undefined, components: embeds.length ? components : undefined };
 	const response = await messageOrInteraction.reply(options);
 
-	if (!isInteraction && !(await checkForEmbed(response, embeds))) return await response.delete();
-	if (!isInteraction) await response.edit({ components });
+	if (!isInteraction) {
+		try {
+			await checkForEmbed(response);
+			await response.edit({ components: components });
+		}
+		catch (e) {
+			await response.delete();
+		}
+	}
 
 	const collector = response.createMessageComponentCollector({ componentType: ComponentType.Button, time: 180000 });
 	collector.on('collect', async (i) => {
-		if (i.customId === 'keep') return collector.stop() && await response.edit({ components: [] });
+		if (isInteraction && i.customId === 'keep') return await collector.stop() && await response.edit({ components: [] });
+		if (i.customId === 'keep') return messageOrInteraction.suppressEmbeds(true) && await collector.stop() && await response.edit({ components: [] });
 		if (i.user.id !== userId && !i.member.permissions.has(PermissionsBitField.Flags.ManageMessages)) return await i.reply({ content: 'You are not authorized to delete this message.', ephemeral: true });
-		await await response.delete() && collector.stop();
+		await collector.stop();
+		await response.delete();
 	});
 	collector.on('end', async () => await response.edit({ components: [] }).catch(() => {}));
 }
@@ -49,10 +58,16 @@ async function sendAskModeMessage(message, links, embeds) {
 async function checkForEmbed(message) {
 	if (message.content.includes('https://web.archive.org/')) return Promise.resolve(true);
 	const startTime = Date.now();
-	return new Promise((resolve) => {
+	return new Promise((resolve, reject) => {
 		const check = setInterval(() => {
-			if (message.embeds.length) return clearInterval(check) && resolve(true);
-			if (Date.now() - startTime > 10000) return clearInterval(check) && resolve(false);
+			if (message.embeds.length) {
+				clearInterval(check);
+				resolve(true);
+			}
+			if (Date.now() - startTime > 10000) {
+				clearInterval(check);
+				reject(false);
+			}
 		}, 200);
 	});
 }