diff --git a/.docs/Docker.md b/.docs/Docker.md index 294e353b..fa4870cf 100644 --- a/.docs/Docker.md +++ b/.docs/Docker.md @@ -17,7 +17,7 @@ Note the `:stable` tag. DiscordChatExporter images are tagged according to the f - `stable` — latest stable version release. This tag is updated with each release of a new project version. Recommended for personal use. - `x.y.z` (e.g. `2.30.1`) — specific stable version release. This tag is pushed when the corresponding version is released and never updated thereafter. Recommended for use in automation scenarios. -- `latest` — latest (potentially unstable) build. This tag is updated with each new commit to the `master` branch. Not recommended, unless you want to test a new feature that has not been released in a stable version yet. +- `latest` — latest (potentially unstable) build. This tag is updated with each new commit to the `prime` branch. Not recommended, unless you want to test a new feature that has not been released in a stable version yet. You can see all available tags [here](https://hub.docker.com/r/tyrrrz/discordchatexporter/tags?ordering=name). @@ -57,7 +57,7 @@ You can also use the current working directory as the output directory by specif - `-v $PWD:/out` in Bash - `-v $pwd.Path:/out` in PowerShell -For more information, please refer to the [Dockerfile](https://github.com/Tyrrrz/DiscordChatExporter/blob/master/DiscordChatExporter.Cli.dockerfile) and [Docker documentation](https://docs.docker.com/engine/reference/run). +For more information, please refer to the [Dockerfile](https://github.com/Tyrrrz/DiscordChatExporter/blob/prime/DiscordChatExporter.Cli.dockerfile) and [Docker documentation](https://docs.docker.com/engine/reference/run). To get your Token and Channel IDs, please refer to [this page](Token-and-IDs.md). diff --git a/.docs/Scheduling-Linux.md b/.docs/Scheduling-Linux.md index 721810ed..7534d2e6 100644 --- a/.docs/Scheduling-Linux.md +++ b/.docs/Scheduling-Linux.md @@ -11,7 +11,7 @@ ```bash #!/bin/bash -# Info: https://github.com/Tyrrrz/DiscordChatExporter/blob/master/.docs +# Info: https://github.com/Tyrrrz/DiscordChatExporter/blob/prime/.docs TOKEN=tokenhere CHANNELID=channelhere diff --git a/.docs/Scheduling-MacOS.md b/.docs/Scheduling-MacOS.md index 91f61106..78e362a9 100644 --- a/.docs/Scheduling-MacOS.md +++ b/.docs/Scheduling-MacOS.md @@ -12,7 +12,7 @@ ```bash #!/bin/bash -# Info: https://github.com/Tyrrrz/DiscordChatExporter/blob/master/.docs +# Info: https://github.com/Tyrrrz/DiscordChatExporter/blob/prime/.docs TOKEN=tokenhere CHANNELID=channelhere diff --git a/.docs/Scheduling-Windows.md b/.docs/Scheduling-Windows.md index 6033da15..f8729c3d 100644 --- a/.docs/Scheduling-Windows.md +++ b/.docs/Scheduling-Windows.md @@ -5,7 +5,7 @@ 1. Open a text editor such as Notepad and paste: ```console -# Info: https://github.com/Tyrrrz/DiscordChatExporter/blob/master/.docs +# Info: https://github.com/Tyrrrz/DiscordChatExporter/blob/prime/.docs $TOKEN = "tokenhere" $CHANNEL = "channelhere" diff --git a/.docs/Using-the-CLI.md b/.docs/Using-the-CLI.md index 20c6315e..36de6c95 100644 --- a/.docs/Using-the-CLI.md +++ b/.docs/Using-the-CLI.md @@ -29,21 +29,20 @@ Type the following command in your terminal of choice, then press ENTER to run i > **Note**: > On Windows, if you're using the default Command Prompt (`cmd`), omit the leading `./` at the start of the command. - > **Docker** users, please refer to the [Docker usage instructions](Docker.md). ## CLI commands -| Command | Description | -|-------------------------|------------------------------------------------------| -| export | Exports a channel | -| exportdm | Exports all direct message channels | -| exportguild | Exports all channels within the specified server | -| exportall | Exports all accessible channels | -| channels | Outputs the list of channels in the given server | -| dm | Outputs the list of direct message channels | -| guilds | Outputs the list of accessible servers | -| guide | Explains how to obtain token, server, and channel ID | +| Command | Description | +| ----------- | ---------------------------------------------------- | +| export | Exports a channel | +| exportdm | Exports all direct message channels | +| exportguild | Exports all channels within the specified server | +| exportall | Exports all accessible channels | +| channels | Outputs the list of channels in the given server | +| dm | Outputs the list of direct message channels | +| guilds | Outputs the list of accessible servers | +| guide | Explains how to obtain token, server, and channel ID | To use the commands, you'll need a token. For the instructions on how to get a token, please refer to [this page](Token-and-IDs.md), or run `./DiscordChatExporter.Cli guide`. @@ -222,7 +221,7 @@ Use `--filter` to filter what messages are included in the export. ./DiscordChatExporter.Cli export -t "mfa.Ifrn" -c 53555 --filter "from:Tyrrrz has:image" ``` -Documentation on message filter syntax can be found [here](https://github.com/Tyrrrz/DiscordChatExporter/blob/master/.docs/Message-filters.md). +Documentation on message filter syntax can be found [here](https://github.com/Tyrrrz/DiscordChatExporter/blob/prime/.docs/Message-filters.md). ### Export channels from a specific server diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 1c401ac5..8f417a93 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,10 +1,10 @@ blank_issues_enabled: false contact_links: - name: ⚠ Feature request - url: https://github.com/Tyrrrz/.github/blob/master/docs/project-status.md + url: https://github.com/Tyrrrz/.github/blob/prime/docs/project-status.md about: Sorry, but this project is in maintenance mode and no longer accepts new feature requests. - name: 📖 Documentation - url: https://github.com/Tyrrrz/DiscordChatExporter/blob/master/.docs + url: https://github.com/Tyrrrz/DiscordChatExporter/blob/prime/.docs about: Find usage guides and frequently asked questions. - name: 🗨 Discussions url: https://github.com/Tyrrrz/DiscordChatExporter/discussions/new diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index d188536c..acc92edd 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -4,12 +4,12 @@ on: workflow_dispatch: push: branches: - - master + - prime tags: - "*" pull_request: branches: - - master + - prime jobs: # Outputs from this job aren't really used, but it's here to verify that the Dockerfile builds correctly @@ -44,8 +44,8 @@ jobs: if-no-files-found: error deploy: - # Deploy to DockerHub only on tag push or master branch push - if: ${{ github.ref_type == 'tag' || github.ref_type == 'branch' && github.ref_name == 'master' }} + # Deploy to DockerHub only on tag push or prime branch push + if: ${{ github.ref_type == 'tag' || github.ref_type == 'branch' && github.ref_name == 'prime' }} runs-on: ubuntu-latest timeout-minutes: 10 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index dec27732..7905c03f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,12 +4,12 @@ on: workflow_dispatch: push: branches: - - master + - prime tags: - "*" pull_request: branches: - - master + - prime env: DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true diff --git a/DiscordChatExporter.Cli/Commands/GuideCommand.cs b/DiscordChatExporter.Cli/Commands/GuideCommand.cs index 4c3a8df0..f4bd09cf 100644 --- a/DiscordChatExporter.Cli/Commands/GuideCommand.cs +++ b/DiscordChatExporter.Cli/Commands/GuideCommand.cs @@ -74,7 +74,7 @@ public class GuideCommand : ICommand using (console.WithForegroundColor(ConsoleColor.DarkCyan)) { console.Output.WriteLine( - "https://github.com/Tyrrrz/DiscordChatExporter/blob/master/.docs" + "https://github.com/Tyrrrz/DiscordChatExporter/blob/prime/.docs" ); } diff --git a/DiscordChatExporter.Gui/Localization/LocalizationManager.English.cs b/DiscordChatExporter.Gui/Localization/LocalizationManager.English.cs index 56372ea0..c9c2c05e 100644 --- a/DiscordChatExporter.Gui/Localization/LocalizationManager.English.cs +++ b/DiscordChatExporter.Gui/Localization/LocalizationManager.English.cs @@ -42,7 +42,7 @@ public partial class LocalizationManager * Your bot needs to have the **Message Content Intent** enabled to read messages """, [nameof(TokenHelpText)] = - "If you have questions or issues, please refer to the [documentation](https://github.com/Tyrrrz/DiscordChatExporter/tree/master/.docs)", + "If you have questions or issues, please refer to the [documentation](https://github.com/Tyrrrz/DiscordChatExporter/tree/prime/.docs)", // Settings [nameof(SettingsTitle)] = "Settings", [nameof(ThemeLabel)] = "Theme", diff --git a/DiscordChatExporter.Gui/Localization/LocalizationManager.French.cs b/DiscordChatExporter.Gui/Localization/LocalizationManager.French.cs index 3b4d7ad9..31819887 100644 --- a/DiscordChatExporter.Gui/Localization/LocalizationManager.French.cs +++ b/DiscordChatExporter.Gui/Localization/LocalizationManager.French.cs @@ -44,7 +44,7 @@ public partial class LocalizationManager * Votre bot doit avoir l'option **Message Content Intent** activée pour lire les messages """, [nameof(TokenHelpText)] = - "Pour les questions ou problèmes, veuillez consulter la [documentation](https://github.com/Tyrrrz/DiscordChatExporter/tree/master/.docs)", + "Pour les questions ou problèmes, veuillez consulter la [documentation](https://github.com/Tyrrrz/DiscordChatExporter/tree/prime/.docs)", // Settings [nameof(SettingsTitle)] = "Paramètres", [nameof(ThemeLabel)] = "Thème", diff --git a/DiscordChatExporter.Gui/Localization/LocalizationManager.German.cs b/DiscordChatExporter.Gui/Localization/LocalizationManager.German.cs index a99b9ec4..19d204a1 100644 --- a/DiscordChatExporter.Gui/Localization/LocalizationManager.German.cs +++ b/DiscordChatExporter.Gui/Localization/LocalizationManager.German.cs @@ -44,7 +44,7 @@ public partial class LocalizationManager * Ihr Bot benötigt die aktivierte **Message Content Intent**, um Nachrichten zu lesen """, [nameof(TokenHelpText)] = - "Bei Fragen oder Problemen lesen Sie die [Dokumentation](https://github.com/Tyrrrz/DiscordChatExporter/tree/master/.docs)", + "Bei Fragen oder Problemen lesen Sie die [Dokumentation](https://github.com/Tyrrrz/DiscordChatExporter/tree/prime/.docs)", // Settings [nameof(SettingsTitle)] = "Einstellungen", [nameof(ThemeLabel)] = "Design", diff --git a/DiscordChatExporter.Gui/Localization/LocalizationManager.Spanish.cs b/DiscordChatExporter.Gui/Localization/LocalizationManager.Spanish.cs index 03d21eb0..09228795 100644 --- a/DiscordChatExporter.Gui/Localization/LocalizationManager.Spanish.cs +++ b/DiscordChatExporter.Gui/Localization/LocalizationManager.Spanish.cs @@ -42,7 +42,7 @@ public partial class LocalizationManager * Tu bot necesita tener habilitado **Message Content Intent** para leer mensajes """, [nameof(TokenHelpText)] = - "Si tienes preguntas o problemas, consulta la [documentación](https://github.com/Tyrrrz/DiscordChatExporter/tree/master/.docs)", + "Si tienes preguntas o problemas, consulta la [documentación](https://github.com/Tyrrrz/DiscordChatExporter/tree/prime/.docs)", // Settings [nameof(SettingsTitle)] = "Ajustes", [nameof(ThemeLabel)] = "Tema", diff --git a/DiscordChatExporter.Gui/Localization/LocalizationManager.Ukrainian.cs b/DiscordChatExporter.Gui/Localization/LocalizationManager.Ukrainian.cs index 9ddc56a6..1e8d7457 100644 --- a/DiscordChatExporter.Gui/Localization/LocalizationManager.Ukrainian.cs +++ b/DiscordChatExporter.Gui/Localization/LocalizationManager.Ukrainian.cs @@ -42,7 +42,7 @@ public partial class LocalizationManager * Ваш бот повинен мати включений **Message Content Intent** для читання повідомлень """, [nameof(TokenHelpText)] = - "Якщо у вас є запитання або проблеми, зверніться до [документації](https://github.com/Tyrrrz/DiscordChatExporter/tree/master/.docs)", + "Якщо у вас є запитання або проблеми, зверніться до [документації](https://github.com/Tyrrrz/DiscordChatExporter/tree/prime/.docs)", // Settings [nameof(SettingsTitle)] = "Налаштування", [nameof(ThemeLabel)] = "Тема", diff --git a/DiscordChatExporter.Gui/Program.cs b/DiscordChatExporter.Gui/Program.cs index 1ff84103..ed252016 100644 --- a/DiscordChatExporter.Gui/Program.cs +++ b/DiscordChatExporter.Gui/Program.cs @@ -21,7 +21,7 @@ public static class Program public static string ProjectReleasesUrl { get; } = $"{ProjectUrl}/releases"; - public static string ProjectDocumentationUrl { get; } = ProjectUrl + "/tree/master/.docs"; + public static string ProjectDocumentationUrl { get; } = ProjectUrl + "/tree/prime/.docs"; public static AppBuilder BuildAvaloniaApp() => AppBuilder.Configure().UsePlatformDetect().LogToTrace(); diff --git a/Readme.md b/Readme.md index 78e796e9..9dd66089 100644 --- a/Readme.md +++ b/Readme.md @@ -1,9 +1,9 @@ # DiscordChatExporter -[![Status](https://img.shields.io/badge/status-maintenance-ffd700.svg)](https://github.com/Tyrrrz/.github/blob/master/docs/project-status.md) +[![Status](https://img.shields.io/badge/status-maintenance-ffd700.svg)](https://github.com/Tyrrrz/.github/blob/prime/docs/project-status.md) [![Made in Ukraine](https://img.shields.io/badge/made_in-ukraine-ffd700.svg?labelColor=0057b7)](https://tyrrrz.me/ukraine) -[![Build](https://img.shields.io/github/actions/workflow/status/Tyrrrz/DiscordChatExporter/main.yml?branch=master)](https://github.com/Tyrrrz/DiscordChatExporter/actions) -[![Coverage](https://img.shields.io/codecov/c/github/Tyrrrz/DiscordChatExporter/master)](https://codecov.io/gh/Tyrrrz/DiscordChatExporter) +[![Build](https://img.shields.io/github/actions/workflow/status/Tyrrrz/DiscordChatExporter/main.yml?branch=prime)](https://github.com/Tyrrrz/DiscordChatExporter/actions) +[![Coverage](https://img.shields.io/codecov/c/github/Tyrrrz/DiscordChatExporter/prime)](https://codecov.io/gh/Tyrrrz/DiscordChatExporter) [![Release](https://img.shields.io/github/release/Tyrrrz/DiscordChatExporter.svg)](https://github.com/Tyrrrz/DiscordChatExporter/releases) [![Downloads](https://img.shields.io/github/downloads/Tyrrrz/DiscordChatExporter/total.svg)](https://github.com/Tyrrrz/DiscordChatExporter/releases) [![Pulls](https://img.shields.io/docker/pulls/tyrrrz/discordchatexporter)](https://hub.docker.com/r/tyrrrz/discordchatexporter) @@ -27,7 +27,7 @@ It works with direct messages, group messages, and server channels, and supports > 💬 If you want to chat, **join my [Discord server](https://discord.gg/2SUWKFnHSm)**. -## Terms of use[[?]](https://github.com/Tyrrrz/.github/blob/master/docs/why-so-political.md) +## Terms of use[[?]](https://github.com/Tyrrrz/.github/blob/prime/docs/why-so-political.md) By using this project or its source code, for any purpose and in any shape or form, you grant your **implicit agreement** to all the following statements: