diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 8dbcdc7c..7ac9075f 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest permissions: packages: write - if: github.repository == 'xSke/PluralKit' + if: github.repository == 'PluralKit/PluralKit' steps: - uses: docker/login-action@v1 with: @@ -22,8 +22,8 @@ jobs: context: . push: true tags: | - ghcr.io/xske/pluralkit:${{ env.BRANCH_NAME }} - ghcr.io/xske/pluralkit:${{ github.sha }} - ghcr.io/xske/pluralkit:latest - cache-from: type=registry,ref=ghcr.io/xske/pluralkit:${{ env.BRANCH_NAME }} + ghcr.io/pluralkit/pluralkit:${{ env.BRANCH_NAME }} + ghcr.io/pluralkit/pluralkit:${{ github.sha }} + ghcr.io/pluralkit/pluralkit:latest + cache-from: type=registry,ref=ghcr.io/pluralkit/pluralkit:${{ env.BRANCH_NAME }} cache-to: type=inline diff --git a/.github/workflows/gateway.yml b/.github/workflows/gateway.yml index 9bd64c82..564314af 100644 --- a/.github/workflows/gateway.yml +++ b/.github/workflows/gateway.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest permissions: packages: write - if: github.repository == 'xSke/PluralKit' + if: github.repository == 'PluralKit/PluralKit' steps: - uses: docker/login-action@v1 with: diff --git a/Dockerfile b/Dockerfile index 3930b9e5..cfc1c1c8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ RUN dotnet build -c Release -o bin # Build runtime stage (doesn't include SDK) FROM mcr.microsoft.com/dotnet/aspnet:6.0 -LABEL org.opencontainers.image.source = "https://github.com/xSke/PluralKit" +LABEL org.opencontainers.image.source = "https://github.com/PluralKit/PluralKit" WORKDIR /app COPY --from=build /app ./ diff --git a/Myriad/Rest/DiscordApiClient.cs b/Myriad/Rest/DiscordApiClient.cs index 7fd89356..38ff3635 100644 --- a/Myriad/Rest/DiscordApiClient.cs +++ b/Myriad/Rest/DiscordApiClient.cs @@ -10,7 +10,7 @@ namespace Myriad.Rest; public class DiscordApiClient { - public const string UserAgent = "DiscordBot (https://github.com/xSke/PluralKit/tree/main/Myriad/, v1)"; + public const string UserAgent = "DiscordBot (https://github.com/PluralKit/PluralKit/tree/main/Myriad/, v1)"; private const string DefaultApiBaseUrl = "https://discord.com/api/v10"; private readonly BaseRestClient _client; diff --git a/PluralKit.Bot/Commands/Help.cs b/PluralKit.Bot/Commands/Help.cs index f8289773..a34a6c2a 100644 --- a/PluralKit.Bot/Commands/Help.cs +++ b/PluralKit.Bot/Commands/Help.cs @@ -63,7 +63,7 @@ public class Help "We also have a Discord server for support, discussion, suggestions, announcements, etc: https://discord.gg/PczBt78" ) }, - Footer = new("By @Ske#6201 | Myriad by @Layl#8888 | GitHub: https://github.com/xSke/PluralKit/ | Website: https://pluralkit.me/"), + Footer = new("By @Ske#6201 | Myriad by @Layl#8888 | GitHub: https://github.com/PluralKit/PluralKit/ | Website: https://pluralkit.me/"), Color = DiscordUtils.Blue, }; diff --git a/PluralKit.Bot/Commands/Misc.cs b/PluralKit.Bot/Commands/Misc.cs index aecc3d4d..25bbdf85 100644 --- a/PluralKit.Bot/Commands/Misc.cs +++ b/PluralKit.Bot/Commands/Misc.cs @@ -127,7 +127,7 @@ public class Misc .Footer(new(String.Join(" \u2022 ", new[] { $"PluralKit {BuildInfoService.Version}", (isCluster ? $"Cluster {_botConfig.Cluster.NodeIndex}" : ""), - "https://github.com/xSke/PluralKit", + "https://github.com/PluralKit/PluralKit", "Last restarted:", }))) .Timestamp(process.StartTime.ToString("O")); diff --git a/PluralKit.Bot/Proxy/ProxyTagParser.cs b/PluralKit.Bot/Proxy/ProxyTagParser.cs index d13dd9f5..2c748f9c 100644 --- a/PluralKit.Bot/Proxy/ProxyTagParser.cs +++ b/PluralKit.Bot/Proxy/ProxyTagParser.cs @@ -78,7 +78,7 @@ public class ProxyTagParser // We got a match, extract inner text inner = input.Substring(prefix.Length, input.Length - prefix.Length - suffix.Length); - // (see https://github.com/xSke/PluralKit/pull/181) + // (see https://github.com/PluralKit/PluralKit/pull/181) return inner.Trim() != "\U0000fe0f"; } diff --git a/README.md b/README.md index 1cde6b24..3c569737 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Running the bot requires [.NET 5](https://dotnet.microsoft.com/download) and a P Optionally, it can integrate with [Sentry](https://sentry.io/welcome/) for error reporting and [InfluxDB](https://www.influxdata.com/products/influxdb-overview/) for aggregate statistics. # Configuration -Configuring the bot is done through a JSON configuration file. An example of the configuration format can be seen in [`pluralkit.conf.example`](https://github.com/xSke/PluralKit/blob/master/pluralkit.conf.example). +Configuring the bot is done through a JSON configuration file. An example of the configuration format can be seen in [`pluralkit.conf.example`](https://github.com/PluralKit/PluralKit/blob/master/pluralkit.conf.example). The configuration file needs to be placed in the bot's working directory (usually the repository root) and must be called `pluralkit.conf`. The configuration file is in JSON format (albeit with a `.conf` extension). The following keys are available (using `.` to indicate a nested object level), bolded key names are required: @@ -31,7 +31,7 @@ The bot can also take configuration from environment variables, which will overr ## Docker The easiest way to get the bot running is with Docker. The repository contains a `docker-compose.yml` file ready to use. -* Clone this repository: `git clone https://github.com/xSke/PluralKit` +* Clone this repository: `git clone https://github.com/PluralKit/PluralKit` * Create a `pluralkit.conf` file in the same directory as `docker-compose.yml` containing at least a `PluralKit.Bot.Token` field * (`PluralKit.Database` is overridden in `docker-compose.yml` to point to the Postgres container) * Build the bot: `docker-compose build` @@ -39,7 +39,7 @@ The easiest way to get the bot running is with Docker. The repository contains a In other words: ``` -$ git clone https://github.com/xSke/PluralKit +$ git clone https://github.com/PluralKit/PluralKit $ cd PluralKit $ cp pluralkit.conf.example pluralkit.conf $ nano pluralkit.conf # (or vim, or whatever) @@ -48,7 +48,7 @@ $ docker-compose up -d ## Manually * Install the .NET 6 SDK (see https://dotnet.microsoft.com/download) -* Clone this repository: `git clone https://github.com/xSke/PluralKit` +* Clone this repository: `git clone https://github.com/PluralKit/PluralKit` * Create and fill in a `pluralkit.conf` file in the same directory as `docker-compose.yml` * Run the bot: `dotnet run --project PluralKit.Bot` * Alternatively, `dotnet build -c Release -o build/`, then `dotnet build/PluralKit.Bot.dll` diff --git a/dashboard/src/pages/status.svelte b/dashboard/src/pages/status.svelte index 4c254c03..6a88beb1 100644 --- a/dashboard/src/pages/status.svelte +++ b/dashboard/src/pages/status.svelte @@ -37,7 +37,7 @@ return shard; }); - currentCommitMsg = `Current Git commit: ${pkdata.version.slice(0,7)}`; + currentCommitMsg = `Current Git commit: ${pkdata.version.slice(0,7)}`; if (data[0].cluster_id === 0) { let clusterData = {}; diff --git a/docs/content/.vuepress/config.js b/docs/content/.vuepress/config.js index 62f85010..9701a8dc 100644 --- a/docs/content/.vuepress/config.js +++ b/docs/content/.vuepress/config.js @@ -18,7 +18,7 @@ module.exports = { }, themeConfig: { - repo: 'xSke/PluralKit', + repo: 'PluralKit/PluralKit', docsDir: 'docs/content/', docsBranch: 'main', editLinks: true, diff --git a/docs/content/api/changelog.md b/docs/content/api/changelog.md index d6dc42e2..b351298e 100644 --- a/docs/content/api/changelog.md +++ b/docs/content/api/changelog.md @@ -15,7 +15,7 @@ permalink: /api/changelog * The API now has values for granular member privacy. The new fields are as follows: `visibility`, `name_privacy`, `description_privacy`, `avatar_privacy`, `birthday_privacy`, `pronoun_privacy`, `metadata_privacy`. All are strings and accept the values of `public`, `private` and `null`. * The `privacy` field has now been deprecated and should not be used. It's still returned (mirroring the `visibility` field), and writing to it will write to *all privacy options*. * 2020-05-07 - * The API (v1) is now formally(ish) defined with OpenAPI v3.0. [The definition file can be found here.](https://github.com/xSke/PluralKit/blob/master/PluralKit.API/openapi.yaml) + * The API (v1) is now formally(ish) defined with OpenAPI v3.0. [The definition file can be found here.](https://github.com/PluralKit/PluralKit/blob/master/PluralKit.API/openapi.yaml) * 2020-02-10 * Birthdates with no year can now be stored using `0004` as a year, for better leap year support. Both options remain valid and either may be returned by the API. * Added privacy set/get support, meaning you will now see privacy values in authed requests and can set them. diff --git a/docs/content/faq.md b/docs/content/faq.md index 159ed8f6..04f5b230 100644 --- a/docs/content/faq.md +++ b/docs/content/faq.md @@ -21,7 +21,7 @@ Although this bot is designed with plural systems and their use cases in mind, t You can suggest features in the [support server](https://discord.gg/PczBt78)'s `#suggestions-feedback` channel. Check the `#frequent-suggestions` channel to see if your idea has already been suggested! -We also track feature requests through [Github Issues](https://github.com/xSke/PluralKit/issues). Feel free to open issue reports or feature requests there as well. +We also track feature requests through [Github Issues](https://github.com/PluralKit/PluralKit/issues). Feel free to open issue reports or feature requests there as well. ### How can I support the bot's development? I (the bot author, [Ske](https://twitter.com/floofstrid)) have a Patreon. The income from there goes towards server hosting, domains, infrastructure, my Monster Energy addiction, et cetera. There are no benefits. There might never be any. But nevertheless, it can be found here: [https://www.patreon.com/floofstrid](https://www.patreon.com/floofstrid) @@ -32,7 +32,7 @@ I (the bot author, [Ske](https://twitter.com/floofstrid)) have a Patreon. The in The only people with access to the database or the information the bot processes is the developer, no one else has access. More information about how information is processed is described on the [Privacy Policy](/privacy). -But in short: the bot does not save or log messages beyond metadata necessary for the bot's functioning, and we do not have the ability to read messages going through the bot, proxied or not. The bot is [open-source](https://github.com/xSke/PluralKit), so anyone with technical knowledge can confirm this. +But in short: the bot does not save or log messages beyond metadata necessary for the bot's functioning, and we do not have the ability to read messages going through the bot, proxied or not. The bot is [open-source](https://github.com/PluralKit/PluralKit), so anyone with technical knowledge can confirm this. ### I set all my privacy options to private. Why can others still see some information? There are two possible answers here: @@ -45,7 +45,7 @@ This includes: * the information that would be shown when a member proxies (proxy name/avatar image); * and the system ID on a member card. -For more information about why certain information must be public, see [this github issue](https://github.com/xSke/PluralKit/issues/238). +For more information about why certain information must be public, see [this github issue](https://github.com/PluralKit/PluralKit/issues/238). ### Is there a way to restrict PluralKit usage to a certain role? / Can I remove PluralKit access for specific users in my server? This is not a feature currently available in PluralKit. It may be added in the future. diff --git a/docs/content/privacy-policy.md b/docs/content/privacy-policy.md index 42acaf67..a084cd8c 100644 --- a/docs/content/privacy-policy.md +++ b/docs/content/privacy-policy.md @@ -25,11 +25,11 @@ This is the data PluralKit does *not* collect: System and member information (names, member lists, descriptions, etc) are public by default, and can be looked up by anyone given a system/member ID or an account ID. This can be changed using the [privacy settings](/guide#privacy). -You can export your system information using the `pk;export` command. This does not include message metadata (as the file would be huge). If there's demand for a command to export that, [let me know on GitHub](https://github.com/xSke/PluralKit/issues). +You can export your system information using the `pk;export` command. This does not include message metadata (as the file would be huge). If there's demand for a command to export that, [let me know on GitHub](https://github.com/PluralKit/PluralKit/issues). You can delete your information using `pk;system delete`. This will delete all system information and associated members, switches, and messages. This will not delete your information from the database backups. Contact me if you want that wiped, too. -The bot is [open-source](https://github.com/xSke/PluralKit). While I can't *prove* this is the code that's running on the production server... it is, promise. +The bot is [open-source](https://github.com/PluralKit/PluralKit). While I can't *prove* this is the code that's running on the production server... it is, promise. ## Website diff --git a/docs/content/user-guide.md b/docs/content/user-guide.md index defd01f1..41acceb6 100644 --- a/docs/content/user-guide.md +++ b/docs/content/user-guide.md @@ -286,7 +286,7 @@ You can have any proxy tags you want, including one containing emojis. You can now type a message enclosed in your proxy tags, and it'll be deleted by PluralKit and reposted with the appropriate member name and avatar (if set). **NB:** If you want `` as proxy tags, there is currently a bug where custom server emojis will (wrongly) -be interpreted as proxying with that member (see [issue #37](https://github.com/xSke/PluralKit/issues/37)). The current workaround is to use different proxy tags. +be interpreted as proxying with that member (see [issue #37](https://github.com/PluralKit/PluralKit/issues/37)). The current workaround is to use different proxy tags. ### Using multiple distinct proxy tag pairs If you'd like to proxy a member in multiple ways (for example, a name or a nickname, uppercase and lowercase variants, etc), you can add multiple tag pairs.