diff --git a/.editorconfig b/.editorconfig index def7baa1a8..3dd30c3033 100644 --- a/.editorconfig +++ b/.editorconfig @@ -2,7 +2,7 @@ root = true [*] indent_style = tab -indent_size = 2 +indent_size = 4 charset = utf-8 insert_final_newline = true end_of_line = lf diff --git a/.github/ISSUE_TEMPLATE/01_bug-report.yml b/.github/ISSUE_TEMPLATE/01_bug-report.yml deleted file mode 100644 index 03618103dc..0000000000 --- a/.github/ISSUE_TEMPLATE/01_bug-report.yml +++ /dev/null @@ -1,91 +0,0 @@ -name: 🐛 Bug Report -description: Create a report to help us improve -labels: ["⚠️bug?"] - -body: - - type: markdown - attributes: - value: | - Thanks for reporting! - First, in order to avoid duplicate Issues, please search to see if the problem you found has already been reported. - Also, If you are NOT owner/admin of server, PLEASE DONT REPORT SERVER SPECIFIC ISSUES TO HERE! (e.g. feature XXX is not working in cherrypick.example) Please try with another CherryPick servers, and if your issue is only reproducible with specific server, contact your server's owner/admin first. - - - type: textarea - attributes: - label: 💡 Summary - description: Tell us what the bug is - validations: - required: true - - - type: textarea - attributes: - label: 🥰 Expected Behavior - description: Tell us what should happen - validations: - required: true - - - type: textarea - attributes: - label: 🤬 Actual Behavior - description: | - Tell us what happens instead of the expected behavior. - Please include errors from the developer console and/or server log files if you have access to them. - validations: - required: true - - - type: textarea - attributes: - label: 📝 Steps to Reproduce - placeholder: | - 1. - 2. - 3. - validations: - required: false - - - type: textarea - attributes: - label: 💻 Frontend Environment - description: | - Tell us where on the platform it happens - DO NOT WRITE "latest". Please provide the specific version. - - Examples: - * Model and OS of the device(s): MacBook Pro (14inch, 2021), macOS Ventura 13.4 - * Browser: Chrome 113.0.5672.126 - * Server URL: kokonect.link - * CherryPick: 4.x.x (Misskey: 2023.x.x) - value: | - * Model and OS of the device(s): - * Browser: - * Server URL: - * CherryPick: - render: markdown - validations: - required: false - - - type: textarea - attributes: - label: 🛰 Backend Environment (for server admin) - description: | - Tell us where on the platform it happens - DO NOT WRITE "latest". Please provide the specific version. - If you are using a managed service, put that after the version. - - Examples: - * Installation Method or Hosting Service: docker compose, k8s/docker, systemd, "CherryPick install shell script", development environment - * CherryPick: 4.x.x (Misskey: 2023.x.x) - * Node: 20.x.x - * PostgreSQL: 15.x.x - * Redis: 7.x.x - * OS and Architecture: Ubuntu 22.04.2 LTS aarch64 - value: | - * Installation Method or Hosting Service: - * CherryPick: - * Node: - * PostgreSQL: - * Redis: - * OS and Architecture: - render: markdown - validations: - required: false diff --git a/.github/ISSUE_TEMPLATE/02_feature-request.yml b/.github/ISSUE_TEMPLATE/02_feature-request.yml deleted file mode 100644 index 8420475b3e..0000000000 --- a/.github/ISSUE_TEMPLATE/02_feature-request.yml +++ /dev/null @@ -1,17 +0,0 @@ -name: ✨ Feature Request -description: Suggest an idea for this project -labels: ["✨Feature"] - -body: - - type: textarea - attributes: - label: Summary - description: Tell us what the suggestion is - validations: - required: true - - type: textarea - attributes: - label: Purpose - description: Describe the specific problem or need you think this feature will solve, and who it will help. - validations: - required: true \ No newline at end of file diff --git a/locales/index.d.ts b/locales/index.d.ts index 9464a7fa18..7c36291ec4 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -2054,10 +2054,6 @@ export interface Locale { "morePatrons": string; "patrons": string; "projectMembers": string; - "_kokonect": { - "serverStatus": string; - "donate": string; - }; "_cherrypick": { "about": string; "translation": string; diff --git a/packages/cherrypick-js/src/autogen/apiClientJSDoc.ts b/packages/cherrypick-js/src/autogen/apiClientJSDoc.ts index d6426cf9eb..4158cb41ed 100644 --- a/packages/cherrypick-js/src/autogen/apiClientJSDoc.ts +++ b/packages/cherrypick-js/src/autogen/apiClientJSDoc.ts @@ -1,7 +1,7 @@ /* - * version: 4.6.0-beta.3 + * version: 4.6.5 * basedMisskeyVersion: 2023.12.0-beta.3 - * generatedAt: 2023-12-13T12:46:52.814Z + * generatedAt: 2023-12-14T06:43:41.905Z */ import type { SwitchCaseResponseType } from '../api.js'; diff --git a/packages/cherrypick-js/src/autogen/endpoint.ts b/packages/cherrypick-js/src/autogen/endpoint.ts index f54de70e16..a30ba5bd8e 100644 --- a/packages/cherrypick-js/src/autogen/endpoint.ts +++ b/packages/cherrypick-js/src/autogen/endpoint.ts @@ -1,7 +1,7 @@ /* - * version: 4.6.0-beta.3 + * version: 4.6.5 * basedMisskeyVersion: 2023.12.0-beta.3 - * generatedAt: 2023-12-13T12:46:52.812Z + * generatedAt: 2023-12-14T06:43:41.903Z */ import type { diff --git a/packages/cherrypick-js/src/autogen/entities.ts b/packages/cherrypick-js/src/autogen/entities.ts index f4f00d19a7..8f65b486fe 100644 --- a/packages/cherrypick-js/src/autogen/entities.ts +++ b/packages/cherrypick-js/src/autogen/entities.ts @@ -1,7 +1,7 @@ /* - * version: 4.6.0-beta.3 + * version: 4.6.5 * basedMisskeyVersion: 2023.12.0-beta.3 - * generatedAt: 2023-12-13T12:46:52.811Z + * generatedAt: 2023-12-14T06:43:41.902Z */ import { operations } from './types.js'; diff --git a/packages/cherrypick-js/src/autogen/models.ts b/packages/cherrypick-js/src/autogen/models.ts index c7ea808ea1..e8f008d20c 100644 --- a/packages/cherrypick-js/src/autogen/models.ts +++ b/packages/cherrypick-js/src/autogen/models.ts @@ -1,7 +1,7 @@ /* - * version: 4.6.0-beta.3 + * version: 4.6.5 * basedMisskeyVersion: 2023.12.0-beta.3 - * generatedAt: 2023-12-13T12:46:52.810Z + * generatedAt: 2023-12-14T06:43:41.901Z */ import { components } from './types.js'; diff --git a/packages/cherrypick-js/src/autogen/types.ts b/packages/cherrypick-js/src/autogen/types.ts index 8f1d6028e5..632d4e4735 100644 --- a/packages/cherrypick-js/src/autogen/types.ts +++ b/packages/cherrypick-js/src/autogen/types.ts @@ -2,9 +2,9 @@ /* eslint @typescript-eslint/no-explicit-any: 0 */ /* - * version: 4.6.0-beta.3 + * version: 4.6.5 * basedMisskeyVersion: 2023.12.0-beta.3 - * generatedAt: 2023-12-13T12:46:52.733Z + * generatedAt: 2023-12-14T06:43:41.822Z */ /** @@ -4820,6 +4820,7 @@ export type operations = { enableReceivePrerelease: boolean; skipVersion: boolean; skipCherryPickVersion?: string | null; + disableTimelinePreview: boolean; }; }; }; @@ -9002,6 +9003,8 @@ export type operations = { enableReceivePrerelease?: boolean; skipVersion?: boolean; skipCherryPickVersion?: string | null; + disableTimelinePreview?: boolean; + privateInstance?: boolean; }; }; }; @@ -16510,7 +16513,7 @@ export type operations = { content: { 'application/json': { /** @enum {string} */ - name: 'notes1' | 'notes10' | 'notes100' | 'notes500' | 'notes1000' | 'notes5000' | 'notes10000' | 'notes20000' | 'notes30000' | 'notes40000' | 'notes50000' | 'notes60000' | 'notes70000' | 'notes80000' | 'notes90000' | 'notes100000' | 'login3' | 'login7' | 'login15' | 'login30' | 'login60' | 'login100' | 'login200' | 'login300' | 'login400' | 'login500' | 'login600' | 'login700' | 'login800' | 'login900' | 'login1000' | 'passedSinceAccountCreated1' | 'passedSinceAccountCreated2' | 'passedSinceAccountCreated3' | 'loggedInOnBirthday' | 'loggedInOnNewYearsDay' | 'noteClipped1' | 'noteFavorited1' | 'myNoteFavorited1' | 'profileFilled' | 'markedAsCat' | 'following1' | 'following10' | 'following50' | 'following100' | 'following300' | 'followers1' | 'followers10' | 'followers50' | 'followers100' | 'followers300' | 'followers500' | 'followers1000' | 'collectAchievements30' | 'viewAchievements3min' | 'iLoveCherryPick' | 'foundTreasure' | 'client30min' | 'client60min' | 'noteDeletedWithin1min' | 'postedAtLateNight' | 'postedAt0min0sec' | 'selfQuote' | 'htl20npm' | 'viewInstanceChart' | 'outputHelloWorldOnScratchpad' | 'open3windows' | 'driveFolderCircularReference' | 'reactWithoutRead' | 'clickedClickHere' | 'justPlainLucky' | 'setNameToSyuilo' | 'setNameToNoriDev' | 'cookieClicked' | 'brainDiver' | 'smashTestNotificationButton' | 'tutorialCompleted'; + name: 'notes1' | 'notes10' | 'notes100' | 'notes500' | 'notes1000' | 'notes5000' | 'notes10000' | 'notes20000' | 'notes30000' | 'notes40000' | 'notes50000' | 'notes60000' | 'notes70000' | 'notes80000' | 'notes90000' | 'notes100000' | 'login3' | 'login7' | 'login15' | 'login30' | 'login60' | 'login100' | 'login200' | 'login300' | 'login400' | 'login500' | 'login600' | 'login700' | 'login800' | 'login900' | 'login1000' | 'passedSinceAccountCreated1' | 'passedSinceAccountCreated2' | 'passedSinceAccountCreated3' | 'loggedInOnBirthday' | 'loggedInOnNewYearsDay' | 'noteClipped1' | 'noteFavorited1' | 'myNoteFavorited1' | 'profileFilled' | 'markedAsCat' | 'following1' | 'following10' | 'following50' | 'following100' | 'following300' | 'followers1' | 'followers10' | 'followers50' | 'followers100' | 'followers300' | 'followers500' | 'followers1000' | 'collectAchievements30' | 'viewAchievements3min' | 'iLoveLycheeBridge' | 'foundTreasure' | 'client30min' | 'client60min' | 'noteDeletedWithin1min' | 'postedAtLateNight' | 'postedAt0min0sec' | 'selfQuote' | 'htl20npm' | 'viewInstanceChart' | 'outputHelloWorldOnScratchpad' | 'open3windows' | 'driveFolderCircularReference' | 'reactWithoutRead' | 'clickedClickHere' | 'justPlainLucky' | 'setNameToSyuilo' | 'setNameToNoriDev' | 'cookieClicked' | 'brainDiver' | 'smashTestNotificationButton' | 'tutorialCompleted'; }; }; }; @@ -19669,9 +19672,9 @@ export type operations = { description: string | null; langs: string[]; tosUrl: string | null; - /** @default https://github.com/kokonect-link/cherrypick */ + /** @default https://github.com/LycheeBridge/LycheeBridge */ repositoryUrl: string; - /** @default https://github.com/kokonect-link/cherrypick/issues/new */ + /** @default https://github.com/LycheeBridge/LycheeBridge/issues/new */ feedbackUrl: string; defaultDarkTheme: string | null; defaultLightTheme: string | null; @@ -19710,6 +19713,8 @@ export type operations = { translatorAvailable: boolean; proxyAccountName: string | null; mediaProxy: string; + disableTimelinePreview: boolean; + privateInstance: boolean; features?: { registration: boolean; localTimeline: boolean;