diff --git a/.config/ci.yml b/.config/ci.yml index 5fcf78b737..45cfa82287 100644 --- a/.config/ci.yml +++ b/.config/ci.yml @@ -1,5 +1,5 @@ #━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ -# Sharkey configuration +# Pawkey configuration #━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ # ┌──────────────────────────────┐ @@ -9,14 +9,14 @@ # First of all, let me tell you a story that may possibly be # boring to you and possibly important to you. # -# Sharkey is licensed under the AGPLv3 license. This license is +# Pawkey is licensed under the AGPLv3 license. This license is # known to be often misunderstood. Please read the following # instructions carefully and select the appropriate option so # that you do not negligently cause a license violation. # # -------- -# Option 1: If you host Sharkey AS-IS (without any changes to +# Option 1: If you host Pawkey AS-IS (without any changes to # the source code. forks are not included). # # Step 1: Congratulations! You don't need to do anything. @@ -28,8 +28,8 @@ # this repository. Strictly speaking, it doesn't have # to be a Git repository, but you'll probably use Git! # -# Step 1: Build and run the Sharkey server first. -# Step 2: Open in +# Step 1: Build and run the Pawkey server first. +# Step 2: Open in # your browser with the administrator account. # Step 3: Enter the URL of your Git repository in the # "Repository URL" field. @@ -37,7 +37,7 @@ # -------- # Option 3: If neither of the above applies to you. # (In this case, the source code should be published -# on the Sharkey interface. IT IS NOT ENOUGH TO +# on the Pawkey interface. IT IS NOT ENOUGH TO # DISCLOSE THE SOURCE CODE WHEN A USER REQUESTS IT BY # E-MAIL OR OTHER MEANS. If you are not satisfied # with this, it is recommended that you read the @@ -65,10 +65,10 @@ # Password to initiate setting up admin account. # It will not be used after the initial setup is complete. # -# Be sure to change this when you set up Sharkey via the Internet. +# Be sure to change this when you set up Pawkey via the Internet. # -# The provider of the service who sets up Sharkey on behalf of the customer should -# set this value to something unique when generating the Sharkey config file, +# The provider of the service who sets up Pawkey on behalf of the customer should +# set this value to something unique when generating the Pawkey config file, # and provide it to the customer. # # setupPassword: example_password_please_change_this_or_you_will_get_hacked @@ -86,11 +86,11 @@ url: http://misskey.local #───┘ Port and TLS settings └─────────────────────────────────── # -# Sharkey requires a reverse proxy to support HTTPS connections. +# Pawkey requires a reverse proxy to support HTTPS connections. # # +----- https://example.tld/ ------------+ # +------+ |+-------------+ +----------------+| -# | User | ---> || Proxy (443) | ---> | Sharkey (3000) || +# | User | ---> || Proxy (443) | ---> | Pawkey (3000) || # +------+ |+-------------+ +----------------+| # +---------------------------------------+ # @@ -98,7 +98,7 @@ url: http://misskey.local # An encrypted connection with HTTPS is highly recommended # because tokens may be transferred in GET requests. -# The port that your Sharkey server should listen on. +# The port that your Pawkey server should listen on. port: 3000 # ┌──────────────────────────┐ @@ -304,8 +304,8 @@ proxyBypassHosts: #proxySmtp: socks5://127.0.0.1:1080 # use SOCKS5 # Path to the directory that uploaded media will be saved to -# Defaults to a folder called "files" in the Sharkey directory -#mediaDirectory: /var/lib/sharkey +# Defaults to a folder called "files" in the Pawkey directory +#mediaDirectory: /var/lib/pawkey # Media Proxy #mediaProxy: https://example.com/proxy @@ -316,7 +316,7 @@ proxyRemoteFiles: true # Movie Thumbnail Generation URL # There is no reference implementation. -# For example, Sharkey will point to the following URL: +# For example, Pawkey will point to the following URL: # https://example.com/thumbnail.webp?thumbnail=1&url=https%3A%2F%2Fstorage.example.com%2Fpath%2Fto%2Fvideo.mp4 #videoThumbnailGenerator: https://example.com @@ -350,7 +350,7 @@ attachLdSignatureForRelays: true # - 80 # - 443 -#customMOTD: ['Hello World', 'The sharks rule all', 'Shonks'] +#customMOTD: ['Hello World', 'Paws rule all', 'Paws'] # Disable automatic redirect for ActivityPub object lookup. (default: false) # This is a strong defense against potential impersonation attacks if the viewer instance has inadequate validation. diff --git a/.config/cypress-devcontainer.yml b/.config/cypress-devcontainer.yml index 97263da68f..df3801d2a6 100644 --- a/.config/cypress-devcontainer.yml +++ b/.config/cypress-devcontainer.yml @@ -267,7 +267,7 @@ proxyBypassHosts: #proxySmtp: socks5://127.0.0.1:1080 # use SOCKS5 # Path to the directory that uploaded media will be saved to -# Defaults to a folder called "files" in the Sharkey directory +# Defaults to a folder called "files" in the Pawkey directory #mediaDirectory: /var/lib/sharkey # Media Proxy diff --git a/.config/docker_example.yml b/.config/docker_example.yml index 3aaa56e333..c3cabc5aff 100644 --- a/.config/docker_example.yml +++ b/.config/docker_example.yml @@ -1,5 +1,5 @@ #━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ -# Sharkey configuration +# Pawkey configuration #━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ # ┌──────────────────────────────┐ @@ -9,14 +9,14 @@ # First of all, let me tell you a story that may possibly be # boring to you and possibly important to you. # -# Sharkey is licensed under the AGPLv3 license. This license is +# Pawkey is licensed under the AGPLv3 license. This license is # known to be often misunderstood. Please read the following # instructions carefully and select the appropriate option so # that you do not negligently cause a license violation. # # -------- -# Option 1: If you host Sharkey AS-IS (without any changes to +# Option 1: If you host Pawkey AS-IS (without any changes to # the source code. forks are not included). # # Step 1: Congratulations! You don't need to do anything. @@ -28,8 +28,8 @@ # this repository. Strictly speaking, it doesn't have # to be a Git repository, but you'll probably use Git! # -# Step 1: Build and run the Sharkey server first. -# Step 2: Open in +# Step 1: Build and run the Pawkey server first. +# Step 2: Open in # your browser with the administrator account. # Step 3: Enter the URL of your Git repository in the # "Repository URL" field. @@ -37,7 +37,7 @@ # -------- # Option 3: If neither of the above applies to you. # (In this case, the source code should be published -# on the Sharkey interface. IT IS NOT ENOUGH TO +# on the Pawkey interface. IT IS NOT ENOUGH TO # DISCLOSE THE SOURCE CODE WHEN A USER REQUESTS IT BY # E-MAIL OR OTHER MEANS. If you are not satisfied # with this, it is recommended that you read the @@ -65,10 +65,10 @@ # Password to initiate setting up admin account. # It will not be used after the initial setup is complete. # -# Be sure to change this when you set up Sharkey via the Internet. +# Be sure to change this when you set up Pawkey via the Internet. # -# The provider of the service who sets up Sharkey on behalf of the customer should -# set this value to something unique when generating the Sharkey config file, +# The provider of the service who sets up Pawkey on behalf of the customer should +# set this value to something unique when generating the Pawkey config file, # and provide it to the customer. # # setupPassword: example_password_please_change_this_or_you_will_get_hacked @@ -87,11 +87,11 @@ url: https://example.tld/ #───┘ Port and TLS settings └─────────────────────────────────── # -# Sharkey requires a reverse proxy to support HTTPS connections. +# Pawkey requires a reverse proxy to support HTTPS connections. # # +----- https://example.tld/ ------------+ # +------+ |+-------------+ +----------------+| -# | User | ---> || Proxy (443) | ---> | Sharkey (3000) || +# | User | ---> || Proxy (443) | ---> | Pawkey (3000) || # +------+ |+-------------+ +----------------+| # +---------------------------------------+ # @@ -99,7 +99,7 @@ url: https://example.tld/ # An encrypted connection with HTTPS is highly recommended # because tokens may be transferred in GET requests. -# The port that your Sharkey server should listen on. +# The port that your Pawkey server should listen on. port: 3000 # ┌──────────────────────────┐ @@ -358,8 +358,8 @@ proxyBypassHosts: #proxySmtp: socks5://127.0.0.1:1080 # use SOCKS5 # Path to the directory that uploaded media will be saved to -# Defaults to a folder called "files" in the Sharkey directory -#mediaDirectory: /var/lib/sharkey +# Defaults to a folder called "files" in the Pawkey directory +#mediaDirectory: /var/lib/pawkey # Media Proxy # Reference Implementation: https://github.com/misskey-dev/media-proxy @@ -373,7 +373,7 @@ proxyRemoteFiles: true # Movie Thumbnail Generation URL # There is no reference implementation. -# For example, Sharkey will point to the following URL: +# For example, Pawkey will point to the following URL: # https://example.com/thumbnail.webp?thumbnail=1&url=https%3A%2F%2Fstorage.example.com%2Fpath%2Fto%2Fvideo.mp4 #videoThumbnailGenerator: https://example.com @@ -407,7 +407,7 @@ attachLdSignatureForRelays: true # - 80 # - 443 -#customMOTD: ['Hello World', 'The sharks rule all', 'Shonks'] +#customMOTD: ['Hello World', 'Paws rule all', 'Paws'] # Disable automatic redirect for ActivityPub object lookup. (default: false) # This is a strong defense against potential impersonation attacks if the viewer instance has inadequate validation. @@ -458,10 +458,10 @@ attachLdSignatureForRelays: true # Transparently compress every websocket message on clients that support it. # Trades server CPU usage for reduced bandwidth usage and a faster frontend on the client. # If you're not using jemalloc, this may cause memory fragmentation and performance issues! (https://www.npmjs.com/package/ws#websocket-compression) -# jemalloc is used by default in the Sharkey Docker image and may be set up manually otherwise: https://github.com/jemalloc/jemalloc/wiki/getting-started +# jemalloc is used by default in the Pawkey Docker image and may be set up manually otherwise: https://github.com/jemalloc/jemalloc/wiki/getting-started websocketCompression: false -# Inject arbitrary HTML tags to customize Sharkey without having to fork it +# Inject arbitrary HTML tags to customize Pawkey without having to fork it #customHtml: # head: | # diff --git a/.config/example.yml b/.config/example.yml index 8cac42c050..aacfaee6e6 100644 --- a/.config/example.yml +++ b/.config/example.yml @@ -1,5 +1,5 @@ #━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ -# Sharkey configuration +# Pawkey configuration #━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ # ┌──────────────────────────────┐ @@ -9,14 +9,14 @@ # First of all, let me tell you a story that may possibly be # boring to you and possibly important to you. # -# Sharkey is licensed under the AGPLv3 license. This license is +# Pawkey is licensed under the AGPLv3 license. This license is # known to be often misunderstood. Please read the following # instructions carefully and select the appropriate option so # that you do not negligently cause a license violation. # # -------- -# Option 1: If you host Sharkey AS-IS (without any changes to +# Option 1: If you host Pawkey AS-IS (without any changes to # the source code. forks are not included). # # Step 1: Congratulations! You don't need to do anything. @@ -28,8 +28,8 @@ # this repository. Strictly speaking, it doesn't have # to be a Git repository, but you'll probably use Git! # -# Step 1: Build and run the Sharkey server first. -# Step 2: Open in +# Step 1: Build and run the Pawkey server first. +# Step 2: Open in # your browser with the administrator account. # Step 3: Enter the URL of your Git repository in the # "Repository URL" field. @@ -37,7 +37,7 @@ # -------- # Option 3: If neither of the above applies to you. # (In this case, the source code should be published -# on the Sharkey interface. IT IS NOT ENOUGH TO +# on the Pawkey interface. IT IS NOT ENOUGH TO # DISCLOSE THE SOURCE CODE WHEN A USER REQUESTS IT BY # E-MAIL OR OTHER MEANS. If you are not satisfied # with this, it is recommended that you read the @@ -65,10 +65,10 @@ # Password to initiate setting up admin account. # It will not be used after the initial setup is complete. # -# Be sure to change this when you set up Sharkey via the Internet. +# Be sure to change this when you set up Pawkey via the Internet. # -# The provider of the service who sets up Sharkey on behalf of the customer should -# set this value to something unique when generating the Sharkey config file, +# The provider of the service who sets up Pawkey on behalf of the customer should +# set this value to something unique when generating the Pawkey config file, # and provide it to the customer. # # setupPassword: example_password_please_change_this_or_you_will_get_hacked @@ -86,11 +86,11 @@ url: https://example.tld/ #───┘ Port and TLS settings └─────────────────────────────────── # -# Sharkey requires a reverse proxy to support HTTPS connections. +# Pawkey requires a reverse proxy to support HTTPS connections. # # +----- https://example.tld/ ------------+ # +------+ |+-------------+ +----------------+| -# | User | ---> || Proxy (443) | ---> | Sharkey (3000) || +# | User | ---> || Proxy (443) | ---> | Pawkey (3000) || # +------+ |+-------------+ +----------------+| # +---------------------------------------+ # @@ -98,13 +98,13 @@ url: https://example.tld/ # An encrypted connection with HTTPS is highly recommended # because tokens may be transferred in GET requests. -# The port that your Sharkey server should listen on. +# The port that your Pawkey server should listen on. port: 3000 # the address to bind to, defaults to "every address" # address: '0.0.0.0' # You can also use UNIX domain socket. -# socket: /path/to/sharkey.sock +# socket: /path/to/pawkey.sock # chmodSocket: '777' # ┌──────────────────────────┐ @@ -115,10 +115,10 @@ db: port: 5432 # Database name - db: sharkey + db: pawkey # Auth - user: sharkey + user: pawkey pass: example-misskey-pass ## Log a warning to the server console if any query takes longer than this to complete. @@ -361,8 +361,8 @@ proxyBypassHosts: #proxySmtp: socks5://127.0.0.1:1080 # use SOCKS5 # Path to the directory that uploaded media will be saved to -# Defaults to a folder called "files" in the Sharkey directory -#mediaDirectory: /var/lib/sharkey +# Defaults to a folder called "files" in the Pawkey directory +#mediaDirectory: /var/lib/pawkey # Media Proxy # Reference Implementation: https://github.com/misskey-dev/media-proxy @@ -376,7 +376,7 @@ proxyRemoteFiles: true # Movie Thumbnail Generation URL # There is no reference implementation. -# For example, Sharkey will point to the following URL: +# For example, Pawkey will point to the following URL: # https://example.com/thumbnail.webp?thumbnail=1&url=https%3A%2F%2Fstorage.example.com%2Fpath%2Fto%2Fvideo.mp4 #videoThumbnailGenerator: https://example.com @@ -410,7 +410,7 @@ attachLdSignatureForRelays: true # - 80 # - 443 -#customMOTD: ['Hello World', 'The sharks rule all', 'Shonks'] +#customMOTD: ['Hello World', 'Paws rule all', 'Paws'] # Disable automatic redirect for ActivityPub object lookup. (default: false) # This is a strong defense against potential impersonation attacks if the viewer instance has inadequate validation. @@ -464,10 +464,10 @@ attachLdSignatureForRelays: true # Transparently compress every websocket message on clients that support it. # Trades server CPU usage for reduced bandwidth usage and a faster frontend on the client. # If you're not using jemalloc, this may cause memory fragmentation and performance issues! (https://www.npmjs.com/package/ws#websocket-compression) -# jemalloc is used by default in the Sharkey Docker image and may be set up manually otherwise: https://github.com/jemalloc/jemalloc/wiki/getting-started +# jemalloc is used by default in the Pawkey Docker image and may be set up manually otherwise: https://github.com/jemalloc/jemalloc/wiki/getting-started websocketCompression: false -# Inject arbitrary HTML tags to customize Sharkey without having to fork it +# Inject arbitrary HTML tags to customize Pawkey without having to fork it #customHtml: # head: | # diff --git a/.devcontainer/devcontainer.yml b/.devcontainer/devcontainer.yml index 1f8192101b..a9e25406ce 100644 --- a/.devcontainer/devcontainer.yml +++ b/.devcontainer/devcontainer.yml @@ -200,7 +200,7 @@ proxyBypassHosts: #proxySmtp: socks5://127.0.0.1:1080 # use SOCKS5 # Path to the directory that uploaded media will be saved to -# Defaults to a folder called "files" in the Sharkey directory +# Defaults to a folder called "files" in the Pawkey directory #mediaDirectory: /var/lib/sharkey # Media Proxy diff --git a/.gitlab/issue_templates/bug.md b/.gitlab/issue_templates/bug.md index a909067269..054418096c 100644 --- a/.gitlab/issue_templates/bug.md +++ b/.gitlab/issue_templates/bug.md @@ -1,7 +1,7 @@ +💁 Having trouble with deployment? [Ask the support chat.]() +🔒 Found a security vulnerability? [Please disclose it responsibly.](https://git.leafus.net/pawkey/pawkey/-/blob/stable/SECURITY.md) +🤝 By submitting this feature request, you agree to follow our [Contribution Guidelines.](https://git.leafus.net/pawkey/pawkey/-/blob/stable/CONTRIBUTING.md) --> # **What happened?** @@ -10,10 +10,10 @@ # **Version** - + # **Instance** - + # **What type of issue is this?** @@ -22,7 +22,7 @@ # **What operating system are you using? (Client-side issues only)** -# **How do you deploy Sharkey on your server? (Server-side issues only)** +# **How do you deploy Pawkey on your server? (Server-side issues only)** # **What operating system are you using? (Server-side issues only)** @@ -30,6 +30,6 @@ # **Contribution Guidelines** -By submitting this issue, you agree to follow our [Contribution Guidelines](https://activitypub.software/TransFem-org/Sharkey/-/blob/develop/CONTRIBUTING.md) +By submitting this issue, you agree to follow our [Contribution Guidelines](https://git.leafus.net/pawkey/pawkey/-/blob/stable/CONTRIBUTING.md) - [ ] I agree to follow this project's Contribution Guidelines - [ ] I have searched the issue tracker for similar issues, and this is not a duplicate. diff --git a/.gitlab/issue_templates/feature.md b/.gitlab/issue_templates/feature.md index a77f9335fe..478a42b41e 100644 --- a/.gitlab/issue_templates/feature.md +++ b/.gitlab/issue_templates/feature.md @@ -1,7 +1,7 @@ +💁 Having trouble with deployment? [Ask the support chat.]() +🔒 Found a security vulnerability? [Please disclose it responsibly.](https://git.leafus.net/pawkey/pawkey/-/blob/stable/SECURITY.md) +🤝 By submitting this feature request, you agree to follow our [Contribution Guidelines.](https://git.leafus.net/pawkey/pawkey/-/blob/stable/CONTRIBUTING.md) --> # **What feature would you like implemented?** @@ -10,12 +10,12 @@ # **Version** - + # **Instance** - + # **Contribution Guidelines** -By submitting this issue, you agree to follow our [Contribution Guidelines](https://activitypub.software/TransFem-org/Sharkey/-/blob/develop/CONTRIBUTING.md) +By submitting this issue, you agree to follow our [Contribution Guidelines](https://activitypub.software/TransFem-org/Pawkey/-/blob/develop/CONTRIBUTING.md) - [ ] I agree to follow this project's Contribution Guidelines - [ ] I have searched the issue tracker for similar requests, and this is not a duplicate. diff --git a/.gitlab/merge_request_templates/default.md b/.gitlab/merge_request_templates/default.md index 389b2c8cbe..9bd0a2957d 100644 --- a/.gitlab/merge_request_templates/default.md +++ b/.gitlab/merge_request_templates/default.md @@ -1,4 +1,4 @@ - + # **What does this MR do?** @@ -6,7 +6,7 @@ %{all_commits} # **Contribution Guidelines** -By submitting this merge request, you agree to follow our [Contribution Guidelines](https://activitypub.software/TransFem-org/Sharkey/-/blob/develop/CONTRIBUTING.md) +By submitting this merge request, you agree to follow our [Contribution Guidelines](https://git.leafus.net/pawkey/pawkey/-/blob/stable/CONTRIBUTING.md) - [ ] I agree to follow this project's Contribution Guidelines - [ ] I have made sure to test this merge request diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e1a12926cc..a9bb81f0b0 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,5 +1,5 @@ # Contribution guide -We're glad you're interested in contributing to Sharkey! In this document you will find the information you need to contribute to the project. +We're glad you're interested in contributing to Pawkey! In this document you will find the information you need to contribute to the project. ## Roadmap See [ROADMAP.md](./ROADMAP.md) for the upstream Misskey roadmap. @@ -133,7 +133,7 @@ An actual domain will be assigned so you can test the federation. - `x.y.z` is the new version you are trying to release. 3. Deploy and perform a simple QA check. Also verify that the tests passed. 4. Merge it. (Do not squash commit) -5. Create a [release](https://activitypub.software/TransFem-org/Sharkey/-/releases) +5. Create a [release](https://git.leafus.net/pawkey/pawkey/-/releases) - The target branch must be `stable` - The tag name must be the version @@ -257,7 +257,7 @@ See [`/packages/backend/test-federation/README.md`](/packages/backend/test-feder - `MISSKEY_WEBFINGER_USE_HTTP`: If it's set true, WebFinger requests will be http instead of https, useful for testing federation between servers in localhost. NEVER USE IN PRODUCTION. ## Continuous integration -Sharkey uses GitLab CI for executing automated tests. +Pawkey uses GitLab CI for executing automated tests. Configuration files are located in [`/.gitlab-ci.yml`](.gitlab-ci.yml). ## Vue @@ -624,7 +624,7 @@ ESMではディレクトリインポートは廃止されているのと、デ ### Memory Caches -Sharkey offers multiple memory cache implementations, each meant for a different use case. +Pawkey offers multiple memory cache implementations, each meant for a different use case. The following table compares the available options: | Cache | Type | Consistency | Persistence | Data Source | Cardinality | Eviction | Description | diff --git a/Dockerfile b/Dockerfile index e6e60992e3..a1aa75e3e1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ RUN apk add py3-pip py3-setuptools RUN corepack enable -WORKDIR /sharkey +WORKDIR /pawkey COPY --link . ./ @@ -23,8 +23,8 @@ RUN --mount=type=cache,target=/root/.local/share/pnpm/store,sharing=locked \ pnpm i --frozen-lockfile --aggregate-output RUN pnpm build RUN node scripts/trim-deps.mjs -RUN mv packages/frontend/assets sharkey-assets -RUN mv packages/frontend-embed/assets sharkey-embed-assets +RUN mv packages/frontend/assets pawkey-assets +RUN mv packages/frontend-embed/assets pawkey-embed-assets RUN --mount=type=cache,target=/root/.local/share/pnpm/store,sharing=locked \ pnpm prune RUN rm -r node_modules packages/frontend packages/frontend-shared packages/frontend-embed packages/sw @@ -40,47 +40,47 @@ ENV COREPACK_DEFAULT_TO_LATEST=0 RUN apk add ffmpeg tini jemalloc pixman pango cairo libpng librsvg font-noto font-noto-cjk font-noto-thai \ && corepack enable \ - && addgroup -g "${GID}" sharkey \ - && adduser -D -u "${UID}" -G sharkey -h /sharkey sharkey \ - && mkdir /sharkey/files \ - && chown sharkey:sharkey /sharkey/files \ + && addgroup -g "${GID}" pawkey \ + && adduser -D -u "${UID}" -G pawkey -h /pawkey pawkey \ + && mkdir /pawkey/files \ + && chown pawkey:pawkey /pawkey/files \ && find / -type d -path /sys -prune -o -type d -path /proc -prune -o -type f -perm /u+s -exec chmod u-s {} \; \ && find / -type d -path /sys -prune -o -type d -path /proc -prune -o -type f -perm /g+s -exec chmod g-s {} \; -USER sharkey -WORKDIR /sharkey +USER pawkey +WORKDIR /pawkey # add package.json to add pnpm -COPY --chown=sharkey:sharkey ./package.json ./package.json +COPY --chown=pawkey:pawkey ./package.json ./package.json RUN corepack install -COPY --chown=sharkey:sharkey --from=build /sharkey/node_modules ./node_modules -COPY --chown=sharkey:sharkey --from=build /sharkey/packages/backend/node_modules ./packages/backend/node_modules -COPY --chown=sharkey:sharkey --from=build /sharkey/packages/misskey-js/node_modules ./packages/misskey-js/node_modules -COPY --chown=sharkey:sharkey --from=build /sharkey/packages/misskey-reversi/node_modules ./packages/misskey-reversi/node_modules -COPY --chown=sharkey:sharkey --from=build /sharkey/packages/misskey-bubble-game/node_modules ./packages/misskey-bubble-game/node_modules -COPY --chown=sharkey:sharkey --from=build /sharkey/packages/megalodon/node_modules ./packages/megalodon/node_modules -COPY --chown=sharkey:sharkey --from=build /sharkey/built ./built -COPY --chown=sharkey:sharkey --from=build /sharkey/packages/misskey-js/built ./packages/misskey-js/built -COPY --chown=sharkey:sharkey --from=build /sharkey/packages/misskey-reversi/built ./packages/misskey-reversi/built -COPY --chown=sharkey:sharkey --from=build /sharkey/packages/misskey-bubble-game/built ./packages/misskey-bubble-game/built -COPY --chown=sharkey:sharkey --from=build /sharkey/packages/backend/built ./packages/backend/built -COPY --chown=sharkey:sharkey --from=build /sharkey/packages/megalodon/lib ./packages/megalodon/lib -COPY --chown=sharkey:sharkey --from=build /sharkey/fluent-emojis ./fluent-emojis -COPY --chown=sharkey:sharkey --from=build /sharkey/tossface-emojis/dist ./tossface-emojis/dist -COPY --chown=sharkey:sharkey --from=build /sharkey/sharkey-assets ./packages/frontend/assets -COPY --chown=sharkey:sharkey --from=build /sharkey/sharkey-embed-assets ./packages/frontend-embed/assets +COPY --chown=pawkey:pawkey --from=build /pawkey/node_modules ./node_modules +COPY --chown=pawkey:pawkey --from=build /pawkey/packages/backend/node_modules ./packages/backend/node_modules +COPY --chown=pawkey:pawkey --from=build /pawkey/packages/misskey-js/node_modules ./packages/misskey-js/node_modules +COPY --chown=pawkey:pawkey --from=build /pawkey/packages/misskey-reversi/node_modules ./packages/misskey-reversi/node_modules +COPY --chown=pawkey:pawkey --from=build /pawkey/packages/misskey-bubble-game/node_modules ./packages/misskey-bubble-game/node_modules +COPY --chown=pawkey:pawkey --from=build /pawkey/packages/megalodon/node_modules ./packages/megalodon/node_modules +COPY --chown=pawkey:pawkey --from=build /pawkey/built ./built +COPY --chown=pawkey:pawkey --from=build /pawkey/packages/misskey-js/built ./packages/misskey-js/built +COPY --chown=pawkey:pawkey --from=build /pawkey/packages/misskey-reversi/built ./packages/misskey-reversi/built +COPY --chown=pawkey:pawkey --from=build /pawkey/packages/misskey-bubble-game/built ./packages/misskey-bubble-game/built +COPY --chown=pawkey:pawkey --from=build /pawkey/packages/backend/built ./packages/backend/built +COPY --chown=pawkey:pawkey --from=build /pawkey/packages/megalodon/lib ./packages/megalodon/lib +COPY --chown=pawkey:pawkey --from=build /pawkey/fluent-emojis ./fluent-emojis +COPY --chown=pawkey:pawkey --from=build /pawkey/tossface-emojis/dist ./tossface-emojis/dist +COPY --chown=pawkey:pawkey --from=build /pawkey/pawkey-assets ./packages/frontend/assets +COPY --chown=pawkey:pawkey --from=build /pawkey/pawkey-embed-assets ./packages/frontend-embed/assets -COPY --chown=sharkey:sharkey pnpm-workspace.yaml ./pnpm-workspace.yaml -COPY --chown=sharkey:sharkey packages/backend/package.json ./packages/backend/package.json -COPY --chown=sharkey:sharkey packages/backend/scripts/check_connect.js ./packages/backend/scripts/check_connect.js -COPY --chown=sharkey:sharkey packages/backend/ormconfig.js ./packages/backend/ormconfig.js -COPY --chown=sharkey:sharkey packages/backend/migration ./packages/backend/migration -COPY --chown=sharkey:sharkey packages/backend/assets ./packages/backend/assets -COPY --chown=sharkey:sharkey packages/megalodon/package.json ./packages/megalodon/package.json -COPY --chown=sharkey:sharkey packages/misskey-js/package.json ./packages/misskey-js/package.json -COPY --chown=sharkey:sharkey packages/misskey-reversi/package.json ./packages/misskey-reversi/package.json -COPY --chown=sharkey:sharkey packages/misskey-bubble-game/package.json ./packages/misskey-bubble-game/package.json +COPY --chown=pawkey:pawkey pnpm-workspace.yaml ./pnpm-workspace.yaml +COPY --chown=pawkey:pawkey packages/backend/package.json ./packages/backend/package.json +COPY --chown=pawkey:pawkey packages/backend/scripts/check_connect.js ./packages/backend/scripts/check_connect.js +COPY --chown=pawkey:pawkey packages/backend/ormconfig.js ./packages/backend/ormconfig.js +COPY --chown=pawkey:pawkey packages/backend/migration ./packages/backend/migration +COPY --chown=pawkey:pawkey packages/backend/assets ./packages/backend/assets +COPY --chown=pawkey:pawkey packages/megalodon/package.json ./packages/megalodon/package.json +COPY --chown=pawkey:pawkey packages/misskey-js/package.json ./packages/misskey-js/package.json +COPY --chown=pawkey:pawkey packages/misskey-reversi/package.json ./packages/misskey-reversi/package.json +COPY --chown=pawkey:pawkey packages/misskey-bubble-game/package.json ./packages/misskey-bubble-game/package.json ENV LD_PRELOAD=/usr/lib/libjemalloc.so.2 ENV NODE_ENV=production diff --git a/IMPORTANT_NOTES.md b/IMPORTANT_NOTES.md index 54d0440bea..ed10dc6931 100644 --- a/IMPORTANT_NOTES.md +++ b/IMPORTANT_NOTES.md @@ -1,6 +1,6 @@ # Basic Precautions -When using a service with Sharkey, there are several important points to keep in mind. +When using a service with Pawkey, there are several important points to keep in mind. 1. Because it is decentralized, there is no guarantee that data you upload will be deleted from all other servers even if you delete it once. (However, this applies to the internet in general.) @@ -11,6 +11,6 @@ Any data uploaded, whether shared via post or not, will be publicly accessible. 4. Account deletion can be a resource-intensive process and may take a long time. In cases with a lot of uploaded data, it may even be impossible to delete an account. -5. Please disable ad blockers. Some servers may rely on advertising revenue to cover operating costs. Additionally, ad blockers can mistakenly block content and features unrelated to ads, potentially causing issues with the client's functionality and preventing normal use of Sharkey. Therefore, we recommend turning off ad blockers and similar features when using Sharkey. +5. Please disable ad blockers. Some servers may rely on advertising revenue to cover operating costs. Additionally, ad blockers can mistakenly block content and features unrelated to ads, potentially causing issues with the client's functionality and preventing normal use of Pawkey. Therefore, we recommend turning off ad blockers and similar features when using Pawkey. Please understand these points and enjoy using the service. diff --git a/README.md b/README.md index 8f1a851b68..3c2dff3438 100644 --- a/README.md +++ b/README.md @@ -1,22 +1,21 @@
- - Sharkey logo + + Pawkey logo -**🌎 **[Sharkey](https://joinsharkey.org/)** is an open source, decentralized social media platform that's free forever! 🚀** - +**🌎 **[Pawkey](https://pawkey.dev)** is an open source, decentralized social media platform that's free forever! 🚀** --- - + create an instance become a contributor - - join the community + - + donate --- @@ -25,21 +24,19 @@
- - ## ✨ Features - **ActivityPub support**\ -Not on Sharkey? No problem! Not only can Sharkey instances talk to each other, but you can make friends with people on other networks like Mastodon and Pixelfed! +Not on Pawkey? No problem! Not only can Pawkey instances talk to each other, but you can make friends with people on other networks like Mastodon and Pixelfed! - **Federated Backgrounds and Music status**\ You can add a background to your profile as well as a music status via ListenBrainz, show everyone what music you are currently listening to - **Mastodon API**\ -Sharkey implements the Mastodon API unlike normal Misskey +Pawkey implements the Mastodon API unlike normal Misskey - **UI/UX Improvements**\ -Sharkey makes some UI/UX improvements to make it easier to navigate +Pawkey makes some UI/UX improvements to make it easier to navigate - **Sign-Up Approval**\ -With Sharkey, you can enable sign-ups, subject to manual moderator approval and mandatory user-provided reasons for joining. +With Pawkey, you can enable sign-ups, subject to manual moderator approval and mandatory user-provided reasons for joining. - **Rich Web UI**\ - Sharkey has a rich and easy to use Web UI! + Pawkey has a rich and easy to use Web UI! It is highly customizable, from changing the layout and adding widgets to making custom themes. Furthermore, plugins can be created using AiScript, an original programming language. - And much more... @@ -50,4 +47,4 @@ With Sharkey, you can enable sign-ups, subject to manual moderator approval and ## Documentation -Sharkey Documentation can be found at [Sharkey Documentation](https://docs.joinsharkey.org/docs/install/fresh/) +Pawkey Documentation can be found at [Pawkey Documentation](https://pawkey.dev/docs) diff --git a/SECURITY.md b/SECURITY.md index 499fa2c1fa..21788a619c 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -1,12 +1,12 @@ # Reporting Security Issues -If you discover a security issue in Sharkey, please report it by sending an -email to [admin@transfem.org](mailto:admin@transfem.org). +If you discover a security issue in Pawkey, please report it by sending an +email to [leafus@pawkey.dev](mailto:leafus@pawkey.dev). This will allow us to assess the risk, and make a fix available before we add a bug report to the GitLab repository. -Thanks for helping make Sharkey safe for everyone. +Thanks for helping make Pawkey safe for everyone. > [!note] > CNA [requires](https://www.cve.org/ResourcesSupport/AllResources/CNARules#section_5-2_Description) that CVEs include a description in English for inclusion in the CVE Catalog. diff --git a/chart/files/default.yml b/chart/files/default.yml index 6fb8b3eed5..57529c2c6c 100644 --- a/chart/files/default.yml +++ b/chart/files/default.yml @@ -1,5 +1,5 @@ #━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ -# Sharkey configuration +# Pawkey configuration #━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ # ┌──────────────────────────────┐ @@ -9,14 +9,14 @@ # First of all, let me tell you a story that may possibly be # boring to you and possibly important to you. # -# Sharkey is licensed under the AGPLv3 license. This license is +# Pawkey is licensed under the AGPLv3 license. This license is # known to be often misunderstood. Please read the following # instructions carefully and select the appropriate option so # that you do not negligently cause a license violation. # # -------- -# Option 1: If you host Sharkey AS-IS (without any changes to +# Option 1: If you host Pawkey AS-IS (without any changes to # the source code. forks are not included). # # Step 1: Congratulations! You don't need to do anything. @@ -28,8 +28,8 @@ # this repository. Strictly speaking, it doesn't have # to be a Git repository, but you'll probably use Git! # -# Step 1: Build and run the Sharkey server first. -# Step 2: Open in +# Step 1: Build and run the Pawkey server first. +# Step 2: Open in # your browser with the administrator account. # Step 3: Enter the URL of your Git repository in the # "Repository URL" field. @@ -37,7 +37,7 @@ # -------- # Option 3: If neither of the above applies to you. # (In this case, the source code should be published -# on the Sharkey interface. IT IS NOT ENOUGH TO +# on the Pawkey interface. IT IS NOT ENOUGH TO # DISCLOSE THE SOURCE CODE WHEN A USER REQUESTS IT BY # E-MAIL OR OTHER MEANS. If you are not satisfied # with this, it is recommended that you read the @@ -65,10 +65,10 @@ # Password to initiate setting up admin account. # It will not be used after the initial setup is complete. # -# Be sure to change this when you set up Sharkey via the Internet. +# Be sure to change this when you set up Pawkey via the Internet. # -# The provider of the service who sets up Sharkey on behalf of the customer should -# set this value to something unique when generating the Sharkey config file, +# The provider of the service who sets up Pawkey on behalf of the customer should +# set this value to something unique when generating the Pawkey config file, # and provide it to the customer. # # setupPassword: example_password_please_change_this_or_you_will_get_hacked @@ -86,14 +86,14 @@ #───┘ Port and TLS settings └─────────────────────────────────── # -# Sharkey supports two deployment options for public. +# Pawkey supports two deployment options for public. # # Option 1: With Reverse Proxy # # +----- https://example.tld/ ------------+ # +------+ |+-------------+ +----------------+| -# | User | ---> || Proxy (443) | ---> | Sharkey (3000) || +# | User | ---> || Proxy (443) | ---> | Pawkey (3000) || # +------+ |+-------------+ +----------------+| # +---------------------------------------+ # @@ -104,15 +104,15 @@ # # +- https://example.tld/ -+ # +------+ | +---------------+ | -# | User | ---> | | Sharkey (443) | | +# | User | ---> | | Pawkey (443) | | # +------+ | +---------------+ | # +------------------------+ # -# You need to run Sharkey as root. +# You need to run Pawkey as root. # You need to set Certificate in 'https' section. # To use option 1, uncomment below line. -port: 3000 # A port that your Sharkey server should listen. +port: 3000 # A port that your Pawkey server should listen. # To use option 2, uncomment below lines. #port: 443 @@ -319,7 +319,7 @@ checkActivityPubGetSignature: false # '127.0.0.1/32' #] -#customMOTD: ['Hello World', 'The sharks rule all', 'Shonks'] +#customMOTD: ['Hello World', 'Paws rule all', 'paws'] # Disable automatic redirect for ActivityPub object lookup. (default: false) # This is a strong defense against potential impersonation attacks if the viewer instance has inadequate validation. diff --git a/compose_example.yml b/compose_example.yml index de13722edc..3de7b3bac8 100644 --- a/compose_example.yml +++ b/compose_example.yml @@ -1,6 +1,6 @@ services: web: -# image: registry.activitypub.software/transfem-org/sharkey:latest +# image: registry.leafus.net/pawkey/pawkey:latest build: . restart: always links: @@ -16,20 +16,20 @@ services: ports: - "3000:3000" networks: - - shonk + - puppy # env_file: # - .config/docker.env environment: - NODE_OPTIONS="--max-old-space-size=8192" volumes: - - ./files:/sharkey/files - - ./.config:/sharkey/.config:ro + - ./files:/pawkey/files + - ./.config:/pawkey/.config:ro redis: restart: always - image: redis:7-alpine + image: redis:8-alpine networks: - - shonk + - puppy volumes: - ./redis:/data healthcheck: @@ -41,7 +41,7 @@ services: restart: always image: groonga/pgroonga:4.0.1-alpine-17 networks: - - shonk + - puppy env_file: - .config/docker.env volumes: @@ -55,7 +55,7 @@ services: # restart: always # image: mcaptcha/mcaptcha:latest # networks: -# shonk: +# puppy: # aliases: # - localhost # ports: @@ -76,7 +76,7 @@ services: # mcaptcha_redis: # image: mcaptcha/cache:latest # networks: -# - shonk +# - puppy # healthcheck: # test: "redis-cli ping" # interval: 5s @@ -90,10 +90,10 @@ services: # - MEILI_ENV=production # - MEILI_MASTER_KEY=ChangeThis # networks: -# - shonk +# - puppy # volumes: # - ./meili_data:/meili_data networks: - shonk: + puppy: diff --git a/locales/index.d.ts b/locales/index.d.ts index a22a8e893e..e6eb9fb3af 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -18,14 +18,14 @@ export interface Locale extends ILocale { */ "headlineMisskey": string; /** - * Welcome! Sharkey is an open source, decentralized microblogging service. + * Welcome! Pawkey is an open source, decentralized microblogging service. * Create "notes" to share your thoughts with everyone around you. 📡 * With "reactions", you can also quickly express your feelings about everyone's notes. 👍 * Let's explore a new world! 🚀 */ "introMisskey": string; /** - * {name} is one of the services powered by the open source platform Sharkey which is based on Misskey (referred to as a "Misskey instance"). + * {name} is one of the services powered by the open source platform Pawkey which is based on Misskey (referred to as a "Misskey instance"). */ "poweredByMisskeyDescription": ParameterizedString<"name">; /** @@ -727,7 +727,7 @@ export interface Locale extends ILocale { */ "flagAsBot": string; /** - * Enable this option if this account is controlled by a program. If enabled, it will act as a flag for other developers to prevent endless interaction chains with other bots and adjust Sharkey's internal systems to treat this account as a bot. + * Enable this option if this account is controlled by a program. If enabled, it will act as a flag for other developers to prevent endless interaction chains with other bots and adjust Pawkey's internal systems to treat this account as a bot. */ "flagAsBotDescription": string; /** @@ -1019,7 +1019,7 @@ export interface Locale extends ILocale { */ "pinLimitExceeded": string; /** - * Installation of Sharkey has been finished! Please create an admin user. + * Installation of Pawkey has been finished! Please create an admin user. */ "intro": string; /** @@ -1799,7 +1799,7 @@ export interface Locale extends ILocale { */ "about": string; /** - * About Sharkey + * About Pawkey */ "aboutMisskey": string; /** @@ -2355,7 +2355,7 @@ export interface Locale extends ILocale { */ "notUseSound": string; /** - * Output sounds only if Sharkey is active. + * Output sounds only if Pawkey is active. */ "useSoundOnlyWhenActive": string; /** @@ -2423,7 +2423,7 @@ export interface Locale extends ILocale { */ "scratchpad": string; /** - * The Scratchpad provides an environment for AiScript experiments. You can write, execute, and check the results of it interacting with Sharkey in it. + * The Scratchpad provides an environment for AiScript experiments. You can write, execute, and check the results of it interacting with Pawkey in it. */ "scratchpadDescription": string; /** @@ -3211,8 +3211,8 @@ export interface Locale extends ILocale { */ "sendErrorReports": string; /** - * When turned on, detailed error information will be shared with Sharkey when a problem occurs, helping to improve the quality of Sharkey. - * This will include information such the version of your OS, what browser you're using, your activity in Sharkey, etc. + * When turned on, detailed error information will be shared with Pawkey when a problem occurs, helping to improve the quality of Pawkey. + * This will include information such the version of your OS, what browser you're using, your activity in Pawkey, etc. */ "sendErrorReportsDescription": string; /** @@ -3592,7 +3592,7 @@ export interface Locale extends ILocale { */ "learnMore": string; /** - * Sharkey has been updated! + * Pawkey has been updated! */ "misskeyUpdated": string; /** @@ -4128,11 +4128,11 @@ export interface Locale extends ILocale { */ "remindMeLater": string; /** - * Have you taken a liking to Sharkey? + * Have you taken a liking to Pawkey? */ "didYouLikeMisskey": string; /** - * {host} uses the free software, Sharkey. We would highly appreciate your donations so development of Sharkey can continue! + * {host} uses the free software, Pawkey. We would highly appreciate your donations so development of Pawkey can continue! */ "pleaseDonate": ParameterizedString<"host">; /** @@ -4640,7 +4640,7 @@ export interface Locale extends ILocale { */ "later": string; /** - * To Sharkey + * To Pawkey */ "goToMisskey": string; /** @@ -4888,7 +4888,7 @@ export interface Locale extends ILocale { */ "repositoryUrl": string; /** - * If there is a repository where the source code is publicly available, enter its URL. If you are using Sharkey as-is (without any changes to the source code), enter https://activitypub.software/TransFem-org/Sharkey/. + * If there is a repository where the source code is publicly available, enter its URL. If you are using Pawkey as-is (without any changes to the source code), enter https://git.leafus.net/pawkey/pawkey. */ "repositoryUrlDescription": string; /** @@ -6028,7 +6028,7 @@ export interface Locale extends ILocale { */ "haveFun": ParameterizedString<"name">; /** - * You can proceed to a tutorial on how to use {name} (Sharkey) or you can exit the setup here and start using it immediately. + * You can proceed to a tutorial on how to use {name} (Pawkey) or you can exit the setup here and start using it immediately. */ "youCanContinueTutorial": ParameterizedString<"name">; /** @@ -6067,7 +6067,7 @@ export interface Locale extends ILocale { */ "title": string; /** - * Here, you can learn the basics of using Sharkey and its features. + * Here, you can learn the basics of using Pawkey and its features. */ "description": string; }; @@ -6077,7 +6077,7 @@ export interface Locale extends ILocale { */ "title": string; /** - * Posts on Sharkey are called 'Notes.' Notes are arranged chronologically on the timeline and are updated in real-time. + * Posts on Pawkey are called 'Notes.' Notes are arranged chronologically on the timeline and are updated in real-time. */ "description": string; /** @@ -6129,7 +6129,7 @@ export interface Locale extends ILocale { */ "title": string; /** - * Sharkey provides multiple timelines based on usage (some may not be available depending on the server's policies). + * Pawkey provides multiple timelines based on usage (some may not be available depending on the server's policies). */ "description1": string; /** @@ -6167,7 +6167,7 @@ export interface Locale extends ILocale { */ "title": string; /** - * When posting a note on Sharkey, various options are available. The posting form looks like this. + * When posting a note on Pawkey, various options are available. The posting form looks like this. */ "description1": string; "_visibility": { @@ -6267,7 +6267,7 @@ export interface Locale extends ILocale { */ "title": string; /** - * The functions introduced here are just a small part. For a more detailed understanding of using Sharkey, please refer to {link}. + * The functions introduced here are just a small part. For a more detailed understanding of using Pawkey, please refer to {link}. */ "description": ParameterizedString<"link">; }; @@ -6421,7 +6421,7 @@ export interface Locale extends ILocale { * * While migration of followers is automatic, you must manually prepare some steps to migrate the list of users you are following. To do so, carry out a follows export that you will later import on the new account in the settings menu. The same procedure applies to your lists as well as your muted and blocked users. * - * (This explanation applies to Sharkey v13.12.0 and later. Other ActivityPub software, such as Mastodon, might function differently.) + * (This explanation applies to Pawkey v13.12.0 and later. Other ActivityPub software, such as Mastodon, might function differently.) */ "moveAccountDescription": string; /** @@ -6461,7 +6461,7 @@ export interface Locale extends ILocale { "_types": { "_notes1": { /** - * just setting up my shonk + * lick yo paws, wub ur fur */ "title": string; /** @@ -6469,7 +6469,7 @@ export interface Locale extends ILocale { */ "description": string; /** - * Have a good time with Sharkey! + * Have a good time with Pawkey! */ "flavor": string; }; @@ -6793,7 +6793,7 @@ export interface Locale extends ILocale { */ "description": string; /** - * Thank you for using Sharkey! + * Thank you for using Pawkey! */ "flavor": string; }; @@ -6993,15 +6993,15 @@ export interface Locale extends ILocale { }; "_iLoveMisskey": { /** - * I Love Sharkey + * I Love Pawkey */ "title": string; /** - * Post "I ❤ #Sharkey" + * Post "I ❤ #Pawkey" */ "description": string; /** - * Sharkey's development team greatly appreciates your support! + * Pawkey's development team greatly appreciates your support! */ "flavor": string; }; @@ -7021,17 +7021,17 @@ export interface Locale extends ILocale { */ "title": string; /** - * Keep Sharkey opened for at least 30 minutes + * Keep Pawkey opened for at least 30 minutes */ "description": string; }; "_client60min": { /** - * No "Miss" in Sharkey + * No "Miss" in Pawkey */ "title": string; /** - * Keep Sharkey opened for at least 60 minutes + * Keep Pawkey opened for at least 60 minutes */ "description": string; }; @@ -7251,7 +7251,7 @@ export interface Locale extends ILocale { */ "description": string; /** - * Sharkey-Sharkey La-Tu-Ma + * Pawkey-Pawkey La-Tu-Ma */ "flavor": string; }; @@ -7267,7 +7267,7 @@ export interface Locale extends ILocale { }; "_tutorialCompleted": { /** - * Sharkey Elementary Course Diploma + * Pawkey Elementary Course Diploma */ "title": string; /** @@ -8049,7 +8049,7 @@ export interface Locale extends ILocale { }; "_aboutMisskey": { /** - * Sharkey is open-source software based on Misskey which has been in development by syuilo since 2014. + * Pawkey is open-source software based on Misskey which has been in development by syuilo since 2014. */ "about": string; /** @@ -8069,11 +8069,11 @@ export interface Locale extends ILocale { */ "original": string; /** - * {name} uses a modified version of the original Sharkey. + * {name} uses a modified version of the original Pawkey. */ "thisIsModifiedVersion": ParameterizedString<"name">; /** - * Translate Sharkey + * Translate Pawkey */ "translation": string; /** @@ -8093,13 +8093,13 @@ export interface Locale extends ILocale { */ "projectMembers": string; /** - * Sharkey original + * Pawkey original */ - "original_sharkey": string; + "original_pawkey": string; /** - * Donate to Sharkey + * Donate to Pawkey */ - "donate_sharkey": string; + "donate_pawkey": string; /** * Testers */ @@ -8567,7 +8567,7 @@ export interface Locale extends ILocale { */ "driveFileDurationWarn": string; /** - * Long audio may disrupt using Sharkey. Still continue? + * Long audio may disrupt using Pawkey. Still continue? */ "driveFileDurationWarnDescription": string; /** @@ -11405,7 +11405,7 @@ export interface Locale extends ILocale { */ "summaryProxy": string; /** - * Generate previews using Summaly Proxy, instead of Sharkey itself. + * Generate previews using Summaly Proxy, instead of Pawkey itself. */ "summaryProxyDescription": string; /** @@ -12137,9 +12137,9 @@ export interface Locale extends ILocale { */ "abuseMarkAsResolved": string; /** - * Sharkey specific changes are translated in its own {link}. + * Pawkey specific changes are translated in its own {link}. */ - "i18nInfoSharkey": ParameterizedString<"link">; + "i18nInfoPawkey": ParameterizedString<"link">; /** * Show instance ticker on replies */ @@ -12429,11 +12429,11 @@ export interface Locale extends ILocale { */ "uncommonFeature": string; /** - * MFM is a markup language used on Misskey, Sharkey, Firefish, Akkoma, and more that can be used in many places. Here you can view a list of all available MFM syntax. + * MFM is a markup language used on Misskey, Pawkey, Firefish, Akkoma, and more that can be used in many places. Here you can view a list of all available MFM syntax. */ "intro": string; /** - * Sharkey expands the world of the Fediverse + * Pawkey expands the world of the Fediverse */ "dummy": string; /** @@ -12838,7 +12838,7 @@ export interface Locale extends ILocale { */ "robotsTxt": string; /** - * Adding entries here will override the default robots.txt packaged with Sharkey. + * Adding entries here will override the default robots.txt packaged with Pawkey. */ "robotsTxtDescription": string; /** diff --git a/locales/pl-PL.yml b/locales/pl-PL.yml index 46f8939137..fb1391b2a1 100644 --- a/locales/pl-PL.yml +++ b/locales/pl-PL.yml @@ -1,8 +1,8 @@ --- _lang_: "Polski" -headlineMisskey: "Sieć połączona wpisami" -introMisskey: "Misskey jest serwisem mikroblogowym typu open source.\nMisskey to opensource'owy serwis mikroblogowy, w którym możesz tworzyć \"notatki\", aby dzielić się tym, co się dzieje i opowiadać wszystkim o sobie.\nMożesz również użyć funkcji \"Reakcje\", aby szybko dodać własne reakcje do notatek innych użytkowników👍.\nOdkrywaj nowy świat🚀!" -poweredByMisskeyDescription: "{name} jest jedną z usług działającą na otwartoźródłowej platformie Misskey (określana jako \"instancja Misskey\")." +headlinePawkey: "Sieć połączona wpisami" +introPawkey: "Pawkey jest serwisem mikroblogowym typu open source.\nPawkey to opensource'owy serwis mikroblogowy, w którym możesz tworzyć \"notatki\", aby dzielić się tym, co się dzieje i opowiadać wszystkim o sobie.\nMożesz również użyć funkcji \"Reakcje\", aby szybko dodać własne reakcje do notatek innych użytkowników👍.\nOdkrywaj nowy świat🚀!" +poweredByPawkeyDescription: "{name} jest jedną z usług działającą na otwartoźródłowej platformie Pawkey (określana jako \"instancja Pawkey\")." monthAndDay: "{month}-{day}" search: "Szukaj" notifications: "Powiadomienia" @@ -167,7 +167,7 @@ youCanCleanRemoteFilesCache: "Możesz wyczyścić cache poprzez kliknięcie przy cacheRemoteSensitiveFiles: "Przechowuj wrażliwe zdalne pliki w pamięci podręcznej" cacheRemoteSensitiveFilesDescription: "Gdy ta opcja jest wyłączona, wrażliwe pliki zdalne są wczytywane bezpośrednio ze zdalnej instancji bez cacheowania." flagAsBot: "To konto jest botem" -flagAsBotDescription: "Jeżeli ten kanał jest kontrolowany przez jakiś program, ustaw tę opcję. Jeżeli włączona, będzie działać jako flaga informująca innych programistów, aby zapobiegać nieskończonej interakcji z różnymi botami i dostosowywać wewnętrzne systemy Misskey, traktując konto jako bota." +flagAsBotDescription: "Jeżeli ten kanał jest kontrolowany przez jakiś program, ustaw tę opcję. Jeżeli włączona, będzie działać jako flaga informująca innych programistów, aby zapobiegać nieskończonej interakcji z różnymi botami i dostosowywać wewnętrzne systemy Pawkey, traktując konto jako bota." flagAsCat: "To konto jest kotem" flagAsCatDescription: "Przełącz tę opcję, aby konto było oznaczone jako kot." flagShowTimelineReplies: "Pokazuj odpowiedzi na osi czasu" @@ -230,7 +230,7 @@ noUsers: "Brak użytkowników" editProfile: "Edytuj profil" noteDeleteConfirm: "Czy na pewno chcesz usunąć ten wpis?" pinLimitExceeded: "Nie możesz przypiąć więcej wpisów." -intro: "Zakończono instalację Misskey! Utwórz konto administratora." +intro: "Zakończono instalację Pawkey! Utwórz konto administratora." done: "Gotowe" processing: "Przetwarzanie" preview: "Podgląd" @@ -420,7 +420,7 @@ exploreFediverse: "Eksploruj Fediwersum" popularTags: "Tagi na czasie" userList: "Listy" about: "Informacje" -aboutMisskey: "O Misskey" +aboutMisskey: "O Pawkey" administrator: "Admin" token: "Token" 2fa: "Klucz 2FA " @@ -556,7 +556,7 @@ popout: "Popout" volume: "Głośność" masterVolume: "Głośność główna" notUseSound: "Wyłącz dźwięk" -useSoundOnlyWhenActive: "Puszczaj dźwięki tylko, gdy Misskey jest aktywne." +useSoundOnlyWhenActive: "Puszczaj dźwięki tylko, gdy Pawkey jest aktywne." details: "Szczegóły" chooseEmoji: "Wybierz emoji" unableToProcess: "Nie udało się dokończyć działania." @@ -572,7 +572,7 @@ sort: "Sortuj" ascendingOrder: "Rosnąco" descendingOrder: "Malejąco" scratchpad: "Brudnopis" -scratchpadDescription: "Brudnopis zawiera eksperymentalne środowisko dla AiScript. Możesz pisać, wykonywać i sprawdzać wyniki w interakcji z Misskey." +scratchpadDescription: "Brudnopis zawiera eksperymentalne środowisko dla AiScript. Możesz pisać, wykonywać i sprawdzać wyniki w interakcji z Pawkey." uiInspector: "Inspektor UI" output: "Wyjście" script: "Skrypt" @@ -709,7 +709,7 @@ unclip: "Odczep" confirmToUnclipAlreadyClippedNote: "Ten wpis jest już częścią klipu \"{name}\". Czy chcesz ją usunąć z tego klipu?" public: "Publiczny" private: "Prywatne" -i18nInfo: "Misskey jest tłumaczone na wiele języków przez wolontariuszy. Możesz pomóc na {link}." +i18nInfo: "Pawkey jest tłumaczone na wiele języków przez wolontariuszy. Możesz pomóc na {link}." manageAccessTokens: "Zarządzaj tokenami dostępu" accountInfo: "Informacje o koncie" notesCount: "Liczba wpisów" @@ -763,7 +763,7 @@ onlineUsersCount: "{n} osób jest online" nUsers: "{n} użytkowników" nNotes: "{n} wpisów" sendErrorReports: "Wyślij raporty o błędach" -sendErrorReportsDescription: "Gdy włączone, jeśli wystąpi problem, szczegółowe informacje o błędach będą udostępniane Misskey, pomagając ulepszyć jakość Misskey.\nBędzie to zawierało informacje takie jak wersja twojego systemu operacyjnego, jakiej przeglądarki używasz, twoja aktywność w Misskey, itd." +sendErrorReportsDescription: "Gdy włączone, jeśli wystąpi problem, szczegółowe informacje o błędach będą udostępniane Pawkey, pomagając ulepszyć jakość Pawkey.\nBędzie to zawierało informacje takie jak wersja twojego systemu operacyjnego, jakiej przeglądarki używasz, twoja aktywność w Pawkey, itd." myTheme: "Mój motyw" backgroundColor: "Tło" accentColor: "Akcent" @@ -858,7 +858,7 @@ hashtags: "Hashtag" troubleshooting: "Rozwiązywanie problemów" useBlurEffect: "Użyj efektów rozmycia w UI" learnMore: "Dowiedz się więcej" -misskeyUpdated: "Misskey zostało zaktualizowane!" +misskeyUpdated: "Pawkey zostało zaktualizowane!" whatIsNew: "Pokaż zmiany" translate: "Przetłumacz" translatedFrom: "Przetłumaczone z {x}" @@ -991,8 +991,8 @@ numberOfLikes: "Liczba polubień" show: "Wyświetlanie" neverShow: "Nie pokazuj ponownie" remindMeLater: "Przypomnij później" -didYouLikeMisskey: "Czy Misskey się tobie spodobało?" -pleaseDonate: "{host} używa darmowego oprogramowania — Misskey. Bylibyśmy bardzo wdzięczni za datki, które pozwolą na kontynuację rozwoju Misskey!" +didYouLikePawkey: "Czy Pawkey się tobie spodobało?" +pleaseDonate: "{host} używa darmowego oprogramowania — Pawkey. Bylibyśmy bardzo wdzięczni za datki, które pozwolą na kontynuację rozwoju Pawkey!" correspondingSourceIsAvailable: "Odpowiedni kod źródłowy jest dostępny pod {anchor}." roles: "Role" role: "Rola" @@ -1135,13 +1135,13 @@ _registry: keys: "Klucz" domain: "Domena" createKey: "Utwórz klucz" -_aboutMisskey: - about: "Misskey jest oprogramowanie open source rozwijanym przez syuilo od 2014." +_aboutPawkey: + about: "Pawkey jest oprogramowanie open source rozwijanym przez syuilo od 2014." contributors: "Główni twórcy" allContributors: "Wszyscy twórcy" source: "Kod źródłowy" - translation: "Tłumacz Misskey" - donate: "Przekaż darowiznę na Misskey" + translation: "Tłumacz Pawkey" + donate: "Przekaż darowiznę na Pawkey" morePatrons: "Naprawdę doceniam wsparcie ze strony wielu niewymienionych tu osób. Dziękuję! 🥰" patrons: "Wspierający" _instanceTicker: diff --git a/package.json b/package.json index 5055eff10f..276609eb58 100644 --- a/package.json +++ b/package.json @@ -1,10 +1,10 @@ { - "name": "sharkey", + "name": "pawkey", "version": "2025.4.4", - "codename": "shonk", + "codename": "pawjob", "repository": { "type": "git", - "url": "https://activitypub.software/TransFem-org/Sharkey.git" + "url": "https://git.leafus.net/pawkey/pawkey.git" }, "packageManager": "pnpm@9.6.0", "workspaces": [ diff --git a/packages/backend/assets/apple-touch-icon.png b/packages/backend/assets/apple-touch-icon.png index 1498542aa4..c7798acd5d 100644 Binary files a/packages/backend/assets/apple-touch-icon.png and b/packages/backend/assets/apple-touch-icon.png differ diff --git a/packages/backend/assets/favicon.ico b/packages/backend/assets/favicon.ico index 44af545411..5e53f5fd25 100644 Binary files a/packages/backend/assets/favicon.ico and b/packages/backend/assets/favicon.ico differ diff --git a/packages/backend/assets/favicon.png b/packages/backend/assets/favicon.png index 3763b9b1ae..6ac50c8c7a 100644 Binary files a/packages/backend/assets/favicon.png and b/packages/backend/assets/favicon.png differ diff --git a/packages/backend/assets/icons/192.png b/packages/backend/assets/icons/192.png index 3763b9b1ae..4fd683bfb5 100644 Binary files a/packages/backend/assets/icons/192.png and b/packages/backend/assets/icons/192.png differ diff --git a/packages/backend/assets/icons/512.png b/packages/backend/assets/icons/512.png index a7371de50c..f9f5f8ecfe 100644 Binary files a/packages/backend/assets/icons/512.png and b/packages/backend/assets/icons/512.png differ diff --git a/packages/backend/assets/splash.png b/packages/backend/assets/splash.png index a7371de50c..f9f5f8ecfe 100644 Binary files a/packages/backend/assets/splash.png and b/packages/backend/assets/splash.png differ diff --git a/packages/backend/migration/1557761316509-AddSomeUrls.js b/packages/backend/migration/1557761316509-AddSomeUrls.js index c73f30c49f..f133666f1f 100644 --- a/packages/backend/migration/1557761316509-AddSomeUrls.js +++ b/packages/backend/migration/1557761316509-AddSomeUrls.js @@ -6,8 +6,8 @@ export class AddSomeUrls1557761316509 { async up(queryRunner) { await queryRunner.query(`ALTER TABLE "meta" ADD "ToSUrl" character varying(512)`); - await queryRunner.query(`ALTER TABLE "meta" ADD "repositoryUrl" character varying(512) NOT NULL DEFAULT 'https://git.joinsharkey.org/Sharkey/Sharkey'`); - await queryRunner.query(`ALTER TABLE "meta" ADD "feedbackUrl" character varying(512) DEFAULT 'https://git.joinsharkey.org/Sharkey/Sharkey/issues/new/choose'`); + await queryRunner.query(`ALTER TABLE "meta" ADD "repositoryUrl" character varying(512) NOT NULL DEFAULT 'https://git.leafus.net/pawkey/pawkey'`); + await queryRunner.query(`ALTER TABLE "meta" ADD "feedbackUrl" character varying(512) DEFAULT 'https://git.leafus.net/pawkey/pawkey/issues/new/choose'`); } async down(queryRunner) { await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "feedbackUrl"`); diff --git a/packages/backend/migration/1605585339718-instance-pinned-pages.js b/packages/backend/migration/1605585339718-instance-pinned-pages.js index 8f4c806439..f829a67143 100644 --- a/packages/backend/migration/1605585339718-instance-pinned-pages.js +++ b/packages/backend/migration/1605585339718-instance-pinned-pages.js @@ -8,7 +8,7 @@ export class instancePinnedPages1605585339718 { this.name = 'instancePinnedPages1605585339718'; } async up(queryRunner) { - await queryRunner.query(`ALTER TABLE "meta" ADD "pinnedPages" character varying(512) array NOT NULL DEFAULT '{"/featured", "/channels", "/explore", "/pages", "/about-sharkey"}'::varchar[]`); + await queryRunner.query(`ALTER TABLE "meta" ADD "pinnedPages" character varying(512) array NOT NULL DEFAULT '{"/featured", "/channels", "/explore", "/pages", "/about-pawkey"}'::varchar[]`); } async down(queryRunner) { await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "pinnedPages"`); diff --git a/packages/backend/migration/1678427401214-remove-unused.js b/packages/backend/migration/1678427401214-remove-unused.js index da9c252b19..0b525ba434 100644 --- a/packages/backend/migration/1678427401214-remove-unused.js +++ b/packages/backend/migration/1678427401214-remove-unused.js @@ -13,6 +13,6 @@ export class removeUnused1678427401214 { async down(queryRunner) { await queryRunner.query(`ALTER TABLE "meta" ADD "pinnedClipId" character varying(32)`); - await queryRunner.query(`ALTER TABLE "meta" ADD "pinnedPages" character varying(512) array NOT NULL DEFAULT '{/featured,/channels,/explore,/pages,/about-sharkey}'`); + await queryRunner.query(`ALTER TABLE "meta" ADD "pinnedPages" character varying(512) array NOT NULL DEFAULT '{/featured,/channels,/explore,/pages,/about-pawkey}'`); } } diff --git a/packages/backend/migration/1708342829000-SharkeyRepositoryUrl.js b/packages/backend/migration/1708342829000-SharkeyRepositoryUrl.js index 0853ed4edd..c57161dff1 100644 --- a/packages/backend/migration/1708342829000-SharkeyRepositoryUrl.js +++ b/packages/backend/migration/1708342829000-SharkeyRepositoryUrl.js @@ -7,16 +7,16 @@ export class SharkeyRepositoryUrl1708342829000 { name = 'SharkeyRepositoryUrl1708342829000' async up(queryRunner) { - await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "repositoryUrl" SET DEFAULT 'https://activitypub.software/TransFem-org/Sharkey/'`); - await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "feedbackUrl" SET DEFAULT 'https://activitypub.software/TransFem-org/Sharkey/-/issues/new'`); - await queryRunner.query(`UPDATE "meta" SET "repositoryUrl"=DEFAULT WHERE "repositoryUrl" IN ('https://git.joinsharkey.org/Sharkey/Sharkey','https://github.com/transfem-org/sharkey','https://github.com/misskey-dev/misskey')`); - await queryRunner.query(`UPDATE "meta" SET "feedbackUrl"=DEFAULT WHERE "feedbackUrl" IN ('https://git.joinsharkey.org/Sharkey/Sharkey/issues/new/choose','https://github.com/transfem-org/sharkey/issues/new','https://github.com/misskey-dev/misskey/issues/new')`); + await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "repositoryUrl" SET DEFAULT 'https://git.leafus.net/pawkey/pawkey'`); + await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "feedbackUrl" SET DEFAULT 'https://git.leafus.net/pawkey/pawkey/-/issues/new'`); + await queryRunner.query(`UPDATE "meta" SET "repositoryUrl"=DEFAULT WHERE "repositoryUrl" IN ('https://git.joinsharkey.org/Sharkey/Sharkey','https://github.com/transfem-org/sharkey','https://github.com/misskey-dev/misskey','https://activitypub.software/TransFem-org/Sharkey/')`); + await queryRunner.query(`UPDATE "meta" SET "feedbackUrl"=DEFAULT WHERE "feedbackUrl" IN ('https://git.joinsharkey.org/Sharkey/Sharkey/issues/new/choose','https://github.com/transfem-org/sharkey/issues/new','https://github.com/misskey-dev/misskey/issues/new','https://activitypub.software/TransFem-org/Sharkey/-/issues/new')`); } async down(queryRunner) { - await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "repositoryUrl" SET DEFAULT 'https://git.joinsharkey.org/Sharkey/Sharkey'`); - await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "feedbackUrl" SET DEFAULT 'https://git.joinsharkey.org/Sharkey/Sharkey/issues/new/choose'`); - await queryRunner.query(`UPDATE "meta" SET "repositoryUrl"=DEFAULT WHERE "repositoryUrl" IN ('https://git.joinsharkey.org/Sharkey/Sharkey','https://github.com/transfem-org/sharkey','https://github.com/misskey-dev/misskey')`); - await queryRunner.query(`UPDATE "meta" SET "feedbackUrl"=DEFAULT WHERE "feedbackUrl" IN ('https://git.joinsharkey.org/Sharkey/Sharkey/issues/new/choose','https://github.com/transfem-org/sharkey/issues/new','https://github.com/misskey-dev/misskey/issues/new')`); + await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "repositoryUrl" SET DEFAULT 'https://activitypub.software/TransFem-org/Sharkey/'`); + await queryRunner.query(`ALTER TABLE "meta" ALTER COLUMN "feedbackUrl" SET DEFAULT 'https://activitypub.software/TransFem-org/Sharkey/-/issues/new'`); + await queryRunner.query(`UPDATE "meta" SET "repositoryUrl"=DEFAULT WHERE "repositoryUrl" IN ('https://git.leafus.net/pawkey/pawkey')`); + await queryRunner.query(`UPDATE "meta" SET "feedbackUrl"=DEFAULT WHERE "feedbackUrl" IN ('https://git.leafus.net/pawkey/pawkey/-/issues/new')`); } } diff --git a/packages/backend/src/boot/master.ts b/packages/backend/src/boot/master.ts index a90228eabc..316f6d48bd 100644 --- a/packages/backend/src/boot/master.ts +++ b/packages/backend/src/boot/master.ts @@ -32,26 +32,24 @@ const themeColor = chalk.hex('#86b300'); function greet() { if (!envOption.quiet) { - //#region Misskey logo - console.log(themeColor(' _____ _ _ ')); - console.log(themeColor('/ ___| | | | ')); - console.log(themeColor('\\ `--.| |__ __ _ _ __| | _____ _ _ ')); - console.log(themeColor(' `--. \\ \'_ \\ / _` | \'__| |/ / _ \\ | | |')); - console.log(themeColor('/\\__/ / | | | (_| | | | < __/ |_| |')); - console.log(themeColor('\\____/|_| |_|\\__,_|_| |_|\\_\\___|\\__, |')); - console.log(themeColor(' __/ |')); - console.log(themeColor(' |___/ ')); + //#region Pawkey logo + console.log(themeColor(' ____ _ ')); + console.log(themeColor('| _ \\ __ ___ _| | _____ _ _ ')); + console.log(themeColor('| |_) / _` \\ \\ /\\ / / |/ / _ \\ | | |')); + console.log(themeColor('| __/ (_| |\\ V V /| < __/ |_| |')); + console.log(themeColor('|_| \\__,_| \\_/\\_/ |_|\\_\\___|\\__, |')); + console.log(themeColor(' |___/ ')); //#endregion - console.log(' Sharkey is an open-source decentralized microblogging platform.'); - console.log(chalk.rgb(255, 136, 0)(' If you like Sharkey, please donate to support development. https://opencollective.com/sharkey')); + console.log(' Pawkey is an open-source decentralized microblogging platform.'); + console.log(chalk.rgb(255, 136, 0)(' If you like Pawkey, please donate to support development. https://leafus.net/donate')); console.log(''); console.log(chalkTemplate`--- ${os.hostname()} {gray (PID: ${process.pid.toString()})} ---`); } - bootLogger.info('Welcome to Sharkey!'); - bootLogger.info(`Sharkey v${meta.version}`, null, true); + bootLogger.info('Welcome to Pawkey!'); + bootLogger.info(`Pawkey v${meta.version}`, null, true); } /** @@ -74,7 +72,7 @@ export async function masterMain() { process.exit(1); } - bootLogger.info('Sharkey initialized'); + bootLogger.succ('Pawkey initialized'); if (config.sentryForBackend) { Sentry.init({ @@ -91,7 +89,7 @@ export async function masterMain() { maxBreadcrumbs: 0, // Set release version - release: 'Sharkey@' + meta.version, + release: 'Pawkey@' + meta.version, ...config.sentryForBackend.options, }); diff --git a/packages/backend/src/boot/worker.ts b/packages/backend/src/boot/worker.ts index 494e7c8c10..23a3f857b5 100644 --- a/packages/backend/src/boot/worker.ts +++ b/packages/backend/src/boot/worker.ts @@ -37,7 +37,7 @@ export async function workerMain() { maxBreadcrumbs: 0, // Set release version - release: "Sharkey@" + meta.version, + release: "Pawkey@" + meta.version, ...config.sentryForBackend.options, }); diff --git a/packages/backend/src/core/activitypub/misc/contexts.ts b/packages/backend/src/core/activitypub/misc/contexts.ts index fa003b1791..4f8325cf86 100644 --- a/packages/backend/src/core/activitypub/misc/contexts.ts +++ b/packages/backend/src/core/activitypub/misc/contexts.ts @@ -579,7 +579,7 @@ const extension_context_definition = { firefish: 'https://joinfirefish.org/ns#', speakAsCat: 'firefish:speakAsCat', // Sharkey - sharkey: 'https://joinsharkey.org/ns#', + sharkey: 'https://leafus.net/pawkey', hideOnlineStatus: 'sharkey:hideOnlineStatus', backgroundUrl: 'sharkey:backgroundUrl', listenbrainz: 'sharkey:listenbrainz', diff --git a/packages/backend/src/models/Meta.ts b/packages/backend/src/models/Meta.ts index b590015732..b032c6b459 100644 --- a/packages/backend/src/models/Meta.ts +++ b/packages/backend/src/models/Meta.ts @@ -430,14 +430,14 @@ export class MiMeta { @Column('varchar', { length: 1024, - default: 'https://activitypub.software/TransFem-org/Sharkey/', - nullable: true, + default: 'https://git.leafus.net/pawkey/pawkey/', + nullable: false, }) public repositoryUrl: string | null; @Column('varchar', { length: 1024, - default: 'https://activitypub.software/TransFem-org/Sharkey/-/issues/new', + default: 'https://git.leafus.net/pawkey/pawkey/-/issues/new', nullable: true, }) public feedbackUrl: string | null; diff --git a/packages/backend/src/queue/processors/CheckModeratorsActivityProcessorService.ts b/packages/backend/src/queue/processors/CheckModeratorsActivityProcessorService.ts index 7821cd3d1d..a49cd61a55 100644 --- a/packages/backend/src/queue/processors/CheckModeratorsActivityProcessorService.ts +++ b/packages/backend/src/queue/processors/CheckModeratorsActivityProcessorService.ts @@ -46,7 +46,7 @@ function generateModeratorInactivityMail(remainingTime: ModeratorInactivityRemai 'To Moderators,', '', `No moderator has been active for a period of time. After further ${timeVariant} of inactivity, the instance will switch to invitation only.`, - 'If you do not wish that to happen, please log into Sharkey to update your last active date and time.', + 'If you do not wish that to happen, please log into Pawkey to update your last active date and time.', ]; const html = message.join('
'); diff --git a/packages/backend/src/server/NodeinfoServerService.ts b/packages/backend/src/server/NodeinfoServerService.ts index 55e8827696..dd941e10c3 100644 --- a/packages/backend/src/server/NodeinfoServerService.ts +++ b/packages/backend/src/server/NodeinfoServerService.ts @@ -76,7 +76,7 @@ export class NodeinfoServerService { // eslint-disable-next-line @typescript-eslint/no-explicit-any const document: any = { software: { - name: 'sharkey', + name: 'pawkey', version: this.config.version, homepage: nodeinfo_homepage, repository: meta.repositoryUrl, diff --git a/packages/backend/src/server/api/endpoints/sponsors.ts b/packages/backend/src/server/api/endpoints/sponsors.ts index 8e1ac749d5..fd4196960c 100644 --- a/packages/backend/src/server/api/endpoints/sponsors.ts +++ b/packages/backend/src/server/api/endpoints/sponsors.ts @@ -9,7 +9,7 @@ import { SponsorsService } from '@/core/SponsorsService.js'; export const meta = { tags: ['meta'], - description: 'Get Sharkey Sponsors or Instance Sponsors', + description: 'Get Pawkey Sponsors or Instance Sponsors', requireCredential: false, requireCredentialPrivateMode: false, diff --git a/packages/backend/src/server/api/mastodon/endpoints/instance.ts b/packages/backend/src/server/api/mastodon/endpoints/instance.ts index cfca5b1350..59d0b7d813 100644 --- a/packages/backend/src/server/api/mastodon/endpoints/instance.ts +++ b/packages/backend/src/server/api/mastodon/endpoints/instance.ts @@ -40,10 +40,10 @@ export class ApiInstanceMastodon { const instance = data.data; const response: MastodonEntity.Instance = { uri: this.config.host, - title: this.meta.name || 'Sharkey', - description: this.meta.description || 'This is a vanilla Sharkey Instance. It doesn\'t seem to have a description.', + title: this.meta.name || 'Pawkey', + description: this.meta.description || 'This is a vanilla Pawkey Instance. It doesn\'t seem to have a description.', email: instance.email || '', - version: `3.0.0 (compatible; Sharkey ${this.config.version}; like Akkoma)`, + version: `3.0.0 (compatible; Pawkey ${this.config.version}; like Akkoma)`, urls: instance.urls, stats: { user_count: instance.stats.user_count, diff --git a/packages/backend/src/server/api/mastodon/endpoints/meta.ts b/packages/backend/src/server/api/mastodon/endpoints/meta.ts new file mode 100644 index 0000000000..663584fe60 --- /dev/null +++ b/packages/backend/src/server/api/mastodon/endpoints/meta.ts @@ -0,0 +1,66 @@ +/* + * SPDX-FileCopyrightText: marie and other Pawkey contributors + * SPDX-License-Identifier: AGPL-3.0-only + */ + +import { Entity } from 'megalodon'; +import { FILE_TYPE_BROWSERSAFE } from '@/const.js'; +import type { Config } from '@/config.js'; +import type { MiMeta } from '@/models/Meta.js'; + +/* eslint-disable @typescript-eslint/prefer-nullish-coalescing */ +export async function getInstance( + response: Entity.Instance, + contact: Entity.Account, + config: Config, + meta: MiMeta, +) { + return { + uri: config.url, + title: meta.name || 'Pawkey', + short_description: meta.description || 'This is a vanilla Pawkey Instance. It doesn\'t seem to have a description.', + description: meta.description || 'This is a vanilla Pawkey Instance. It doesn\'t seem to have a description.', + email: response.email || '', + version: `3.0.0 (compatible; Pawkey ${config.version})`, + urls: response.urls, + stats: { + user_count: response.stats.user_count, + status_count: response.stats.status_count, + domain_count: response.stats.domain_count, + }, + thumbnail: meta.backgroundImageUrl || '/static-assets/transparent.png', + languages: meta.langs, + registrations: !meta.disableRegistration || response.registrations, + approval_required: meta.approvalRequiredForSignup, + invites_enabled: response.registrations, + configuration: { + accounts: { + max_featured_tags: 20, + }, + statuses: { + max_characters: config.maxNoteLength, + max_media_attachments: 16, + characters_reserved_per_url: response.uri.length, + }, + media_attachments: { + supported_mime_types: FILE_TYPE_BROWSERSAFE, + image_size_limit: 10485760, + image_matrix_limit: 16777216, + video_size_limit: 41943040, + video_frame_rate_limit: 60, + video_matrix_limit: 2304000, + }, + polls: { + max_options: 10, + max_characters_per_option: 150, + min_expiration: 50, + max_expiration: 2629746, + }, + reactions: { + max_reactions: 1, + }, + }, + contact_account: contact, + rules: [], + }; +} diff --git a/packages/backend/src/server/api/openapi/gen-spec.ts b/packages/backend/src/server/api/openapi/gen-spec.ts index 85d1fd0bce..77554d044b 100644 --- a/packages/backend/src/server/api/openapi/gen-spec.ts +++ b/packages/backend/src/server/api/openapi/gen-spec.ts @@ -19,7 +19,7 @@ export function genOpenapiSpec(config: Config, includeSelfRef = false) { externalDocs: { description: 'Repository', - url: 'https://activitypub.software/TransFem-org/Sharkey', + url: 'https://git.leafus.net/pawkey/pawkey', }, servers: [{ @@ -97,7 +97,7 @@ export function genOpenapiSpec(config: Config, includeSelfRef = false) { description: desc, externalDocs: { description: 'Source code', - url: `https://activitypub.software/TransFem-org/Sharkey/-/tree/develop/packages/backend/src/server/api/endpoints/${endpoint.name}.ts`, + url: `https://git.leafus.net/pawkey/pawkey/-/tree/stable/packages/backend/src/server/api/endpoints/${endpoint.name}.ts`, }, ...(endpoint.meta.tags ? { tags: [endpoint.meta.tags[0]], diff --git a/packages/backend/src/server/web/ClientServerService.ts b/packages/backend/src/server/web/ClientServerService.ts index c40d042fa4..9f9c887df9 100644 --- a/packages/backend/src/server/web/ClientServerService.ts +++ b/packages/backend/src/server/web/ClientServerService.ts @@ -206,7 +206,7 @@ export class ClientServerService { @bindThis private async generateCommonPugData(meta: MiMeta) { return { - instanceName: meta.name ?? 'Sharkey', + instanceName: meta.name ?? 'Pawkey', icon: meta.iconUrl, appleTouchIcon: meta.app512IconUrl, themeColor: meta.themeColor, @@ -435,7 +435,7 @@ export class ClientServerService { // OpenSearch XML fastify.get('/opensearch.xml', async (request, reply) => { - const name = this.meta.name ?? 'Sharkey'; + const name = this.meta.name ?? 'Pawkey'; let content = ''; content += ''; content += `${name}`; @@ -456,7 +456,7 @@ export class ClientServerService { return await reply.view('base', { img: this.meta.bannerUrl, url: this.config.url, - title: this.meta.name ?? 'Sharkey', + title: this.meta.name ?? 'Pawkey', desc: this.meta.description, customHead: this.config.customHtml.head, ...await this.generateCommonPugData(this.meta), @@ -822,7 +822,7 @@ export class ClientServerService { reply.header('Cache-Control', 'public, max-age=3600'); return await reply.view('base-embed', { - title: this.meta.name ?? 'Sharkey', + title: this.meta.name ?? 'Pawkey', ...await this.generateCommonPugData(this.meta), embedCtx: htmlSafeJsonStringify({ user: _user, @@ -845,7 +845,7 @@ export class ClientServerService { reply.header('Cache-Control', 'public, max-age=3600'); return await reply.view('base-embed', { - title: this.meta.name ?? 'Sharkey', + title: this.meta.name ?? 'Pawkey', ...await this.generateCommonPugData(this.meta), embedCtx: htmlSafeJsonStringify({ note: _note, @@ -866,7 +866,7 @@ export class ClientServerService { reply.header('Cache-Control', 'public, max-age=3600'); return await reply.view('base-embed', { - title: this.meta.name ?? 'Sharkey', + title: this.meta.name ?? 'Pawkey', ...await this.generateCommonPugData(this.meta), embedCtx: htmlSafeJsonStringify({ clip: _clip, @@ -879,7 +879,7 @@ export class ClientServerService { reply.header('Cache-Control', 'public, max-age=3600'); return await reply.view('base-embed', { - title: this.meta.name ?? 'Sharkey', + title: this.meta.name ?? 'Pawkey', ...await this.generateCommonPugData(this.meta), }); }); diff --git a/packages/backend/src/server/web/FeedService.ts b/packages/backend/src/server/web/FeedService.ts index a622ae7e34..8b1f44a002 100644 --- a/packages/backend/src/server/web/FeedService.ts +++ b/packages/backend/src/server/web/FeedService.ts @@ -62,7 +62,7 @@ export class FeedService { id: author.link, title: `${author.name} (@${user.username}@${this.config.host})`, updated: notes.length !== 0 ? this.idService.parse(notes[0].id).date : undefined, - generator: 'Sharkey', + generator: 'Pawkey', description: `${user.notesCount} Notes, ${profile.followingVisibility === 'public' ? user.followingCount : '?'} Following, ${profile.followersVisibility === 'public' ? user.followersCount : '?'} Followers${profile.description ? ` · ${profile.description}` : ''}`, link: author.link, image: (user.avatarId == null ? null : user.avatarUrl) ?? this.userEntityService.getIdenticonUrl(user), diff --git a/packages/backend/src/server/web/boot.embed.js b/packages/backend/src/server/web/boot.embed.js index 4f27e2fb30..bdbb0b4acf 100644 --- a/packages/backend/src/server/web/boot.embed.js +++ b/packages/backend/src/server/web/boot.embed.js @@ -106,18 +106,18 @@ const locale = JSON.parse(localStorage.getItem('locale') || '{}'); - const title = locale?._bootErrors?.title || 'Failed to initialize Sharkey'; + const title = locale?._bootErrors?.title || 'Failed to initialize Pawkey'; const reload = locale?.reload || 'Reload'; document.body.innerHTML = ` -
${title}
-
Failed to initialize Sharkey
+
読み込みに失敗しました
+
Failed to initialize Pawkey
Error Code: ${code}
`; addStyle(` - #sharkey_app, + #pawkey_app, #splash { display: none !important; } diff --git a/packages/backend/src/server/web/boot.js b/packages/backend/src/server/web/boot.js index 0488161513..875160c53c 100644 --- a/packages/backend/src/server/web/boot.js +++ b/packages/backend/src/server/web/boot.js @@ -85,7 +85,7 @@ //#region Theme const theme = localStorage.getItem('theme'); - const themeFontFaceName = 'sharkey-theme-font-face'; + const themeFontFaceName = 'pawkey-theme-font-face'; if (theme) { let existingFontFace; document.fonts.forEach((v) => { if (v.family === themeFontFaceName) existingFontFace = v;}); @@ -164,7 +164,7 @@ const locale = JSON.parse(localStorage.getItem('locale') || '{}'); const messages = Object.assign({ - title: 'Failed to initialize Sharkey', + title: 'Failed to initialize Pawkey', solution: 'The following actions may solve the problem.', solution1: 'Update your os and browser', solution2: 'Disable an adblocker', @@ -234,7 +234,7 @@ font-family: BIZ UDGothic, Roboto, HelveticaNeue, Arial, sans-serif; } - #sharkey_app, + #pawkey_app, #splash { display: none !important; } diff --git a/packages/backend/src/server/web/error.css b/packages/backend/src/server/web/error.css index 8d03ceadf0..8137f3a296 100644 --- a/packages/backend/src/server/web/error.css +++ b/packages/backend/src/server/web/error.css @@ -8,7 +8,7 @@ font-family: BIZ UDGothic, Roboto, HelveticaNeue, Arial, sans-serif; } -#sharkey_app, +#pawkey_app, #splash { display: none !important; } diff --git a/packages/backend/src/server/web/error.js b/packages/backend/src/server/web/error.js index 4c6ae730b3..7020631b13 100644 --- a/packages/backend/src/server/web/error.js +++ b/packages/backend/src/server/web/error.js @@ -10,7 +10,7 @@ const locale = JSON.parse(localStorage.getItem('locale') || '{}'); const messages = Object.assign({ - title: 'Failed to initialize Sharkey', + title: 'Failed to initialize Pawkey', serverError: 'If reloading after a period of time does not resolve the problem, contact the server administrator with the following ERROR ID.', solution: 'The following actions may solve the problem.', solution1: 'Update your os and browser', diff --git a/packages/backend/src/server/web/manifest.json b/packages/backend/src/server/web/manifest.json index 990843bef8..625ed39ce3 100644 --- a/packages/backend/src/server/web/manifest.json +++ b/packages/backend/src/server/web/manifest.json @@ -1,6 +1,6 @@ { - "short_name": "Sharkey", - "name": "Sharkey", + "short_name": "Pawkey", + "name": "Pawkey", "start_url": "/", "display": "standalone", "background_color": "#313a42", diff --git a/packages/backend/src/server/web/views/base-embed.pug b/packages/backend/src/server/web/views/base-embed.pug index 6ef9281b8f..9430900a0f 100644 --- a/packages/backend/src/server/web/views/base-embed.pug +++ b/packages/backend/src/server/web/views/base-embed.pug @@ -9,11 +9,11 @@ html(class='embed') head meta(charset='utf-8') - meta(name='application-name' content='Sharkey') + meta(name='application-name' content='Pawkey') meta(name='referrer' content='origin') meta(name='theme-color' content= themeColor || '#86b300') meta(name='theme-color-orig' content= themeColor || '#86b300') - meta(property='og:site_name' content= instanceName || 'Sharkey') + meta(property='og:site_name' content= instanceName || 'Pawkey') meta(property='instance_url' content= instanceUrl) meta(name='viewport' content='width=device-width, initial-scale=1') meta(name='format-detection' content='telephone=no,date=no,address=no,email=no,url=no') @@ -32,7 +32,7 @@ html(class='embed') title block title - = title || 'Sharkey' + = title || 'Pawkey' block meta meta(name='robots' content='noindex') diff --git a/packages/backend/src/server/web/views/base.pug b/packages/backend/src/server/web/views/base.pug index d9d750281d..c51995430a 100644 --- a/packages/backend/src/server/web/views/base.pug +++ b/packages/backend/src/server/web/views/base.pug @@ -8,36 +8,32 @@ doctype html // - - _____ _ _ - / ___| | | | - \ `--.| |__ __ _ _ __| | _____ _ _ - `--. \ '_ \ / _` | '__| |/ / _ \ | | | - /\__/ / | | | (_| | | | < __/ |_| | - \____/|_| |_|\__,_|_| |_|\_\___|\__, | - __/ | - |___/ - - Thank you for using Sharkey! - If you are reading this message... how about joining the development? - https://activitypub.software/TransFem-org/Sharkey + ____ _ + | _ \ __ ___ _| | _____ _ _ + | |_) / _` \ \ /\ / / |/ / _ \ | | | + | __/ (_| |\ V V /| < __/ |_| | + |_| \__,_| \_/\_/ |_|\_\___|\__, | + |___/ + Thank you for using Pawkey! + If you are reading this message... You like gay femboy furries >:3 html head meta(charset='utf-8') - meta(name='application-name' content='Sharkey') + meta(name='application-name' content='Pawkey') meta(name='referrer' content='origin') meta(name='theme-color' content= themeColor || '#86b300') meta(name='theme-color-orig' content= themeColor || '#86b300') - meta(property='og:site_name' content= instanceName || 'Sharkey') + meta(property='og:site_name' content= instanceName || 'Pawkey') meta(property='instance_url' content= instanceUrl) meta(name='viewport' content='width=device-width, initial-scale=1') meta(name='format-detection' content='telephone=no,date=no,address=no,email=no,url=no') link(rel='icon' href= icon || '/favicon.ico') link(rel='apple-touch-icon' href= appleTouchIcon || '/apple-touch-icon.png') link(rel='manifest' href='/manifest.json') - link(rel='search' type='application/opensearchdescription+xml' title=(title || "Sharkey") href=`${baseUrl}/opensearch.xml`) + link(rel='search' type='application/opensearchdescription+xml' title=(title || "Pawkey") href=`${baseUrl}/opensearch.xml`) link(rel='prefetch' href=serverErrorImageUrl) link(rel='prefetch' href=infoImageUrl) link(rel='prefetch' href=notFoundImageUrl) @@ -56,7 +52,7 @@ html title block title - = title || 'Sharkey' + = title || 'Pawkey' if noindex meta(name='robots' content='noindex') @@ -67,7 +63,7 @@ html block meta block og - meta(property='og:title' content= title || 'Sharkey') + meta(property='og:title' content= title || 'Pawkey') meta(property='og:description' content= desc || '✨🌎✨ A interplanetary communication platform ✨🚀✨') meta(property='og:image' content= img) meta(property='twitter:card' content='summary') diff --git a/packages/backend/src/server/web/views/bios.pug b/packages/backend/src/server/web/views/bios.pug index 53e4e223b9..78a2ea947a 100644 --- a/packages/backend/src/server/web/views/bios.pug +++ b/packages/backend/src/server/web/views/bios.pug @@ -4,8 +4,8 @@ html head meta(charset='utf-8') - meta(name='application-name' content='Sharkey') - title Sharkey Repair Tool + meta(name='application-name' content='Pawkey') + title Pawkey Repair Tool style include ../bios.css script @@ -13,7 +13,7 @@ html body header - h1 Sharkey Repair Tool #{version} + h1 Pawkey Repair Tool #{version} main div.tabs button#ls edit local storage diff --git a/packages/backend/src/server/web/views/cli.pug b/packages/backend/src/server/web/views/cli.pug index b2dcf3025a..6ea3738fb5 100644 --- a/packages/backend/src/server/web/views/cli.pug +++ b/packages/backend/src/server/web/views/cli.pug @@ -4,8 +4,8 @@ html head meta(charset='utf-8') - meta(name='application-name' content='Sharkey') - title Sharkey Cli + meta(name='application-name' content='Pawkey') + title Pawkey Cli style include ../cli.css script @@ -13,7 +13,7 @@ html body header - h1 Sharkey Cli #{version} + h1 Pawkey Cli #{version} main div#form textarea#text diff --git a/packages/backend/src/server/web/views/error.pug b/packages/backend/src/server/web/views/error.pug index 99b9634bd8..7870dfba8c 100644 --- a/packages/backend/src/server/web/views/error.pug +++ b/packages/backend/src/server/web/views/error.pug @@ -2,18 +2,14 @@ doctype html // - - _____ _ _ - / ___| | | | - \ `--.| |__ __ _ _ __| | _____ _ _ - `--. \ '_ \ / _` | '__| |/ / _ \ | | | - /\__/ / | | | (_| | | | < __/ |_| | - \____/|_| |_|\__,_|_| |_|\_\___|\__, | - __/ | - |___/ + ____ _ + | _ \ __ ___ _| | _____ _ _ + | |_) / _` \ \ /\ / / |/ / _ \ | | | + | __/ (_| |\ V V /| < __/ |_| | + |_| \__,_| \_/\_/ |_|\_\___|\__, | + |___/ - Thank you for using Sharkey! - If you are reading this message... how about joining the development? - https://activitypub.software/TransFem-org/Sharkey + Thank you for using Pawkey! html @@ -21,12 +17,12 @@ html head meta(charset='utf-8') meta(name='viewport' content='width=device-width, initial-scale=1') - meta(name='application-name' content='Sharkey') + meta(name='application-name' content='Pawkey') meta(name='referrer' content='origin') title block title - = 'An error has occurred... | Sharkey' + = 'An error has occurred... | Pawkey' style include ../error.css @@ -40,7 +36,7 @@ body path(d="M12 9v2m0 4v.01") path(d="M5 19h14a2 2 0 0 0 1.84 -2.75l-7.1 -12.25a2 2 0 0 0 -3.5 0l-7.1 12.25a2 2 0 0 0 1.75 2.75") - h1(data-i18n="title") Failed to initialize Sharkey + h1(data-i18n="title") Failed to initialize Pawkey button.button-big(onclick="location.reload();") span.button-label-big(data-i18n-reload) Reload diff --git a/packages/backend/src/server/web/views/flush.pug b/packages/backend/src/server/web/views/flush.pug index 648dd23c55..fbf5c29ec3 100644 --- a/packages/backend/src/server/web/views/flush.pug +++ b/packages/backend/src/server/web/views/flush.pug @@ -4,7 +4,7 @@ html #msg script. const msg = document.getElementById('msg'); - const successText = `\nSuccess Flush! Back to Sharkey\n成功しました。Sharkeyを開き直してください。`; + const successText = `\nSuccess Flush! Back to Pawkey\n成功しました。Pawkeyを開き直してください。`; message('Start flushing.'); diff --git a/packages/backend/src/server/web/views/info-card.pug b/packages/backend/src/server/web/views/info-card.pug index 0a95ea7b17..7cf5c023dd 100644 --- a/packages/backend/src/server/web/views/info-card.pug +++ b/packages/backend/src/server/web/views/info-card.pug @@ -4,7 +4,7 @@ html head meta(charset='utf-8') - meta(name='application-name' content='Sharkey') + meta(name='application-name' content='Pawkey') title= meta.name || host style. html, body { diff --git a/packages/frontend-embed/src/boot.ts b/packages/frontend-embed/src/boot.ts index f11cfef8fd..727bb2bf83 100644 --- a/packages/frontend-embed/src/boot.ts +++ b/packages/frontend-embed/src/boot.ts @@ -23,7 +23,7 @@ import { i18n, updateI18n } from '@/i18n.js'; import type { Theme } from '@/theme.js'; -console.log('Sharkey Embed'); +console.log('Pawkey Embed'); //#region Embedパラメータの取得・パース const params = new URLSearchParams(location.search); @@ -117,7 +117,7 @@ app.provide(DI.embedParams, embedParams); // https://github.com/misskey-dev/misskey/pull/8575#issuecomment-1114239210 // なぜか2回実行されることがあるため、mountするdivを1つに制限する const rootEl = ((): HTMLElement => { - const MISSKEY_MOUNT_DIV_ID = 'sharkey_app'; + const MISSKEY_MOUNT_DIV_ID = 'pawkey_app'; const currentRoot = document.getElementById(MISSKEY_MOUNT_DIV_ID); diff --git a/packages/frontend-embed/src/style.scss b/packages/frontend-embed/src/style.scss index 529bb606be..759ecd7b0b 100644 --- a/packages/frontend-embed/src/style.scss +++ b/packages/frontend-embed/src/style.scss @@ -63,7 +63,7 @@ html, body { scroll-behavior: smooth; } -#sharkey_app { +#pawkey_app { height: 100%; } diff --git a/packages/frontend/assets/icon.png b/packages/frontend/assets/icon.png new file mode 100644 index 0000000000..6ac50c8c7a Binary files /dev/null and b/packages/frontend/assets/icon.png differ diff --git a/packages/frontend/assets/pawkey.png b/packages/frontend/assets/pawkey.png new file mode 100644 index 0000000000..e256f357ab Binary files /dev/null and b/packages/frontend/assets/pawkey.png differ diff --git a/packages/frontend/src/boot/common.ts b/packages/frontend/src/boot/common.ts index 918a3703c3..124263bc6a 100644 --- a/packages/frontend/src/boot/common.ts +++ b/packages/frontend/src/boot/common.ts @@ -28,8 +28,8 @@ import { fetchCustomEmojis } from '@/custom-emojis.js'; import { prefer } from '@/preferences.js'; import { $i } from '@/i.js'; -export async function common(createVue: () => Promise>) { - console.info(`Sharkey v${version}`); +export async function common(createVue: () => App) { + console.info(`Pawkey v${version}`); if (_DEV_) { console.warn('Development mode!!!'); @@ -267,7 +267,7 @@ export async function common(createVue: () => Promise>) { // https://github.com/misskey-dev/misskey/pull/8575#issuecomment-1114239210 // なぜか2回実行されることがあるため、mountするdivを1つに制限する const rootEl = ((): HTMLElement => { - const MISSKEY_MOUNT_DIV_ID = 'sharkey_app'; + const MISSKEY_MOUNT_DIV_ID = 'pawkey_app'; const currentRoot = window.document.getElementById(MISSKEY_MOUNT_DIV_ID); diff --git a/packages/frontend/src/boot/main-boot.ts b/packages/frontend/src/boot/main-boot.ts index 0ce71978f2..2cae8a4d5d 100644 --- a/packages/frontend/src/boot/main-boot.ts +++ b/packages/frontend/src/boot/main-boot.ts @@ -335,7 +335,7 @@ export async function mainBoot() { } const modifiedVersionMustProminentlyOfferInAgplV3Section13Read = miLocalStorage.getItem('modifiedVersionMustProminentlyOfferInAgplV3Section13Read'); - if (modifiedVersionMustProminentlyOfferInAgplV3Section13Read !== 'true' && instance.repositoryUrl !== 'https://activitypub.software/TransFem-org/Sharkey/') { + if (modifiedVersionMustProminentlyOfferInAgplV3Section13Read !== 'true' && instance.repositoryUrl !== 'https://git.leafus.net/pawkey/pawkey') { const { dispose } = popup(defineAsyncComponent(() => import('@/components/MkSourceCodeAvailablePopup.vue')), {}, { closed: () => dispose(), }); diff --git a/packages/frontend/src/components/MkSignupDialog.rules.vue b/packages/frontend/src/components/MkSignupDialog.rules.vue index 3034f2269b..d94f6a9b73 100644 --- a/packages/frontend/src/components/MkSignupDialog.rules.vue +++ b/packages/frontend/src/components/MkSignupDialog.rules.vue @@ -47,7 +47,7 @@ SPDX-License-Identifier: AGPL-3.0-only - {{ i18n.ts.basicNotesBeforeCreateAccount }} + {{ i18n.ts.basicNotesBeforeCreateAccount }} {{ i18n.ts.agree }} diff --git a/packages/frontend/src/components/MkSourceCodeAvailablePopup.vue b/packages/frontend/src/components/MkSourceCodeAvailablePopup.vue index 84dc244b23..889505ccfa 100644 --- a/packages/frontend/src/components/MkSourceCodeAvailablePopup.vue +++ b/packages/frontend/src/components/MkSourceCodeAvailablePopup.vue @@ -27,7 +27,7 @@ SPDX-License-Identifier: AGPL-3.0-only
diff --git a/packages/frontend/src/components/MkTutorialDialog.Note.vue b/packages/frontend/src/components/MkTutorialDialog.Note.vue index ddb22f7d8c..a5b2809c28 100644 --- a/packages/frontend/src/components/MkTutorialDialog.Note.vue +++ b/packages/frontend/src/components/MkTutorialDialog.Note.vue @@ -67,7 +67,7 @@ const exampleNote = reactive({ onlineStatus: 'unknown', badgeRoles: [], }, - text: 'just setting up my shonk', + text: 'getting a pawjob rn', cw: null, visibility: 'public', localOnly: false, diff --git a/packages/frontend/src/components/MkUpdated.vue b/packages/frontend/src/components/MkUpdated.vue index 3685be6359..d1f1272680 100644 --- a/packages/frontend/src/components/MkUpdated.vue +++ b/packages/frontend/src/components/MkUpdated.vue @@ -27,7 +27,7 @@ const modal = useTemplateRef('modal'); const whatIsNew = () => { modal.value?.close(); - window.open(`https://activitypub.software/TransFem-org/Sharkey/-/releases/${version}`, '_blank'); + window.open(`https://git.leafus.net/pawkey/pawkey/-/releases/${version}`, '_blank'); }; onMounted(() => { diff --git a/packages/frontend/src/pages/about-sharkey.vue b/packages/frontend/src/pages/about-pawkey.vue similarity index 92% rename from packages/frontend/src/pages/about-sharkey.vue rename to packages/frontend/src/pages/about-pawkey.vue index 94e899e408..5cc807cc2a 100644 --- a/packages/frontend/src/pages/about-sharkey.vue +++ b/packages/frontend/src/pages/about-pawkey.vue @@ -11,8 +11,8 @@ SPDX-License-Identifier: AGPL-3.0-only
- -
Sharkey
+ +
Pawkey
v{{ version }}
@@ -22,16 +22,13 @@ SPDX-License-Identifier: AGPL-3.0-only
- {{ i18n.ts._aboutMisskey.about }}
{{ i18n.ts.learnMore }} + {{ i18n.ts._aboutMisskey.about }}
{{ i18n.ts.learnMore }}
- I #Sharkey + I #Pawkey
- +
- - {{ i18n.tsx._aboutMisskey.thisIsModifiedVersion({ name: instance.name ?? '' }) }} - {{ i18n.ts._aboutMisskey.source }} @@ -48,16 +45,11 @@ SPDX-License-Identifier: AGPL-3.0-only
- + - {{ i18n.ts._aboutMisskey.source }} ({{ i18n.ts._aboutMisskey.original_sharkey }}) + {{ i18n.ts._aboutMisskey.source }} ({{ i18n.ts._aboutMisskey.original_pawkey }}) - - - {{ i18n.ts._aboutMisskey.donate_sharkey }} - -
@@ -133,7 +125,17 @@ const easterEggEmojis = ref<{ const easterEggEngine = ref<{ stop: () => void } | null>(null); const everyone = ref([ { - heading: i18n.ts._aboutMisskey.projectMembers, + heading: 'Pawkey Creators', + people: fisher_yates([ + { + handle: '@Leafus', + avatar: 'https://git.leafus.net/uploads/-/system/user/avatar/2/avatar.png?width=192', + link: 'https://leafus.net', + }, + ]), + }, + { + heading: 'Sharkey Contributors', link: { label: i18n.ts._aboutMisskey.allContributors, url: 'https://activitypub.software/TransFem-org/Sharkey/-/graphs/develop', @@ -182,7 +184,7 @@ const everyone = ref([ ]), }, { - heading: i18n.ts._aboutMisskey.testers, + heading: 'Sharkey Testers', people: [ { handle: '@lucent', @@ -322,7 +324,7 @@ function gravity() { function iLoveMisskey() { os.post({ - initialText: 'I $[jelly ❤] #Sharkey', + initialText: 'I $[jelly ❤] #Pawkey', instant: true, }); } diff --git a/packages/frontend/src/pages/about.overview.vue b/packages/frontend/src/pages/about.overview.vue index 241ee3c388..26d7c6142e 100644 --- a/packages/frontend/src/pages/about.overview.vue +++ b/packages/frontend/src/pages/about.overview.vue @@ -22,13 +22,12 @@ SPDX-License-Identifier: AGPL-3.0-only
- - +
- + {{ i18n.ts.aboutMisskey }} diff --git a/packages/frontend/src/pages/settings/general.vue b/packages/frontend/src/pages/settings/general.vue new file mode 100644 index 0000000000..8d95bd9d0d --- /dev/null +++ b/packages/frontend/src/pages/settings/general.vue @@ -0,0 +1,623 @@ + + + + + diff --git a/packages/frontend/src/pages/welcome.entrance.a.vue b/packages/frontend/src/pages/welcome.entrance.a.vue index eb0e3269d1..a462cfbcf4 100644 --- a/packages/frontend/src/pages/welcome.entrance.a.vue +++ b/packages/frontend/src/pages/welcome.entrance.a.vue @@ -13,7 +13,13 @@ SPDX-License-Identifier: AGPL-3.0-only
Powered by
-
+
+ + + + +
+
@@ -34,8 +40,8 @@ import * as Misskey from 'misskey-js'; import XTimeline from './welcome.timeline.vue'; import MarqueeText from '@/components/MkMarquee.vue'; import MkFeaturedPhotos from '@/components/MkFeaturedPhotos.vue'; -import misskeysvg from '/client-assets/sharkey.svg'; -import { misskeyApiGet } from '@/utility/misskey-api.js'; +import misskeysvg from '/client-assets/pawkey.png'; +import { misskeyApiGet } from '@/scripts/misskey-api.js'; import MkVisitorDashboard from '@/components/MkVisitorDashboard.vue'; import { getProxiedImageUrl } from '@/utility/media-proxy.js'; import { instance as meta } from '@/instance.js'; diff --git a/packages/frontend/src/pages/welcome.setup.vue b/packages/frontend/src/pages/welcome.setup.vue index 4d9c0bb742..15c949e251 100644 --- a/packages/frontend/src/pages/welcome.setup.vue +++ b/packages/frontend/src/pages/welcome.setup.vue @@ -8,8 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-only
- -
Welcome to Sharkey!
+
Welcome to Pawkey!
v{{ version }}
diff --git a/packages/frontend/src/router.definition.ts b/packages/frontend/src/router.definition.ts index 1bd1f4fd13..8a95ec9e23 100644 --- a/packages/frontend/src/router.definition.ts +++ b/packages/frontend/src/router.definition.ts @@ -204,8 +204,8 @@ export const ROUTE_DEF = [{ path: '/contact', component: page(() => import('@/pages/contact.vue')), }, { - path: '/about-sharkey', - component: page(() => import('@/pages/about-sharkey.vue')), + path: '/about-pawkey', + component: page(() => import('@/pages/about-pawkey.vue')), }, { path: '/invite', name: 'invite', diff --git a/packages/frontend/src/ui/_common_/common.ts b/packages/frontend/src/ui/_common_/common.ts index fcb9f2acfc..ab0c92c709 100644 --- a/packages/frontend/src/ui/_common_/common.ts +++ b/packages/frontend/src/ui/_common_/common.ts @@ -167,8 +167,8 @@ export function openInstanceMenu(ev: MouseEvent) { menuItems.push({ type: 'link', text: i18n.ts.aboutMisskey, - icon: 'sk-icons sk-shark sk-icons-lg', - to: '/about-sharkey', + icon: 'ph-paw-print ph-bold ph-lg', + to: '/about-pawkey', }); os.popupMenu(menuItems, ev.currentTarget ?? ev.target, { diff --git a/packages/frontend/src/ui/deck.vue b/packages/frontend/src/ui/deck.vue index ed85bb3bc5..1b27566248 100644 --- a/packages/frontend/src/ui/deck.vue +++ b/packages/frontend/src/ui/deck.vue @@ -223,6 +223,28 @@ window.document.documentElement.style.overflowY = 'hidden'; window.document.documentElement.style.scrollBehavior = 'auto'; + + +