From b9a57715e865e00a6104709ccfedd0f893a9e19f Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 20 Nov 2021 13:54:28 +0900 Subject: [PATCH 01/44] update banner image --- README.md | 2 +- assets/about/banner.svg | 69 ----------------------------------------- 2 files changed, 1 insertion(+), 70 deletions(-) delete mode 100644 assets/about/banner.svg diff --git a/README.md b/README.md index a60f71cac..ce94a054c 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Misskey](/assets/about/banner.svg)](https://join.misskey.page/) +[![Misskey](https://github.com/misskey-dev/assets/blob/main/banner.png?raw=true)](https://join.misskey.page/)

Misskey

diff --git a/assets/about/banner.svg b/assets/about/banner.svg deleted file mode 100644 index 75308c095..000000000 --- a/assets/about/banner.svg +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 5e33ca3da01ef29b0b9953ba3c8093f2c24526d2 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 20 Nov 2021 18:21:18 +0900 Subject: [PATCH 02/44] Update README.md --- README.md | 103 ++++++++---------------------------------------------- 1 file changed, 15 insertions(+), 88 deletions(-) diff --git a/README.md b/README.md index ce94a054c..b08ecb313 100644 --- a/README.md +++ b/README.md @@ -1,116 +1,43 @@ [![Misskey](https://github.com/misskey-dev/assets/blob/main/banner.png?raw=true)](https://join.misskey.page/) -

Misskey

-
-[![Dependencies](https://img.shields.io/david/misskey-dev/misskey.svg?style=for-the-badge&logo=npm)](https://david-dm.org/misskey-dev/misskey) -[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=for-the-badge&logo=github)](http://makeapullrequest.com) -[![Awesome Humane Tech](https://raw.githubusercontent.com/humanetech-community/awesome-humane-tech/main/humane-tech-badge.svg?sanitize=true)](https://github.com/humanetech-community/awesome-humane-tech) +**🌎 A forever evolving, interplanetary microblogging platform. 🚀** -**A forever evolving, interplanetary microblogging platform.** +**Misskey** is a distributed microblogging platform with advanced features such as Reactions and a highly customizable UI. -Misskey is a decentralized microblogging platform born on Earth. -Since it exists within the Fediverse (a universe where various social media platforms are organized), -it is mutually linked with other social media platforms. -Why don't you take a short break from the hustle and bustle of the city, and dive into a new Internet? Find an instance! +[Learn more](https://misskey-hub.net/) Become a Patron!
---- +
-Do you have a question? Or are you experiencing trouble? -Visit [our forum](https://forum.misskey.io/)! - ---- - -![](https://ja.mstdn.wiki/images/e/ed/Deck.jpg) - -:sparkles: Features ----------------------------------------------------------------- -

Posting

-

-Post your ideas, discussion topics, fun moments, or anything else you want to share! Misskey supports text, emoji, pictures, videos, and polls! -

+## ✨ Find an instance +Please see the [Instances list](https://misskey-hub.net/instances.html). ---- +## 📦 Create your own instance +Please see the [Installation Guide](https://misskey-hub.net/docs/install/install.html). -

Reactions

-

-Reactions are the simplest way to respond to others' posts. Simply pick a reaction emote from the list! Reactions on Misskey are much more expressive than other social media services which only allow “liking”. -

- ---- - -

Interface

-

-Customize the UI to your own tastes! No UI will work for everyone, so Misskey is completely customizable. Make Misskey *yours* by editing the style, adjusting timeline layouts, and placing widgets. -

- ---- - -

Misskey Drive

-

-Organize and store your files! Want to post a picture you have already uploaded? Wish you could organize your files into folders? Misskey Drive is a solution! -

- ---- - -...and more! - -:package: Create your own instance ----------------------------------------------------------------- -Please see the [Setup and Installation Guide](https://misskey-hub.net/docs/install/install.html). - -:wrench: Contribution ----------------------------------------------------------------- +## 🛠️ Contribute Please see the [Contribution Guide](./CONTRIBUTING.md). -### Collaborators - - - - - - - - - - - - - - - - - - - - - -
syuiloAyaMorisawamei23acid-chickenrinsukitamainaXelticau1-liquid
@syuilo@AyaMorisawa@mei23@acid-chicken@rinsuki@tamaina@Xeltica@u1-liquid
+## 🚀 Join the community +Misskey's [Discord server is available](https://discord.gg/Wp8gVStHW3). ---- +
-To receive updates of this repo, follow [@repo@misskey.io](https://misskey.io/@repo) on fediverse. +
-Related projects ----------------------------------------------------------------- -- [misskey.js](https://github.com/misskey-dev/misskey.js) - Misskey SDK for JavaScript -- [mfm.js](https://github.com/misskey-dev/mfm.js) - MFM parser - -Sponsors ----------------------------------------------------------------- +## Sponsors
RSS3
-:heart: Backers ----------------------------------------------------------------- +## Backers From 1ec4156b49287ac7403adecbf68b534495d1638d Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 20 Nov 2021 18:22:29 +0900 Subject: [PATCH 03/44] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b08ecb313..be01643dd 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@
- + ## ✨ Find an instance Please see the [Instances list](https://misskey-hub.net/instances.html). From f5bea67515d00a4ff981f6fb11a951abe8c4d8a6 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 21 Nov 2021 13:36:44 +0900 Subject: [PATCH 04/44] =?UTF-8?q?client:=20=E3=83=8E=E3=83=BC=E3=83=88?= =?UTF-8?q?=E3=81=AB=E3=83=A2=E3=83=87=E3=83=AC=E3=83=BC=E3=82=BF=E3=83=BC?= =?UTF-8?q?=E3=83=90=E3=83=83=E3=82=B8=E3=82=92=E8=A1=A8=E7=A4=BA=E3=81=99?= =?UTF-8?q?=E3=82=8B=E3=81=AE=E3=82=92=E5=BB=83=E6=AD=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 9 +++++++++ packages/client/src/components/note-detailed.vue | 8 -------- packages/client/src/components/note-header.vue | 9 --------- packages/client/src/ui/chat/note-header.vue | 8 -------- 4 files changed, 9 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f24c80fc9..d315743fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,15 @@ --> +## 12.x.x (unreleased) + +### Improvements + +### Bugfixes + +### Changes +- クライアント: ノートにモデレーターバッジを表示するのを廃止 + ## 12.97.0 (2021/11/19) ### Improvements diff --git a/packages/client/src/components/note-detailed.vue b/packages/client/src/components/note-detailed.vue index 5fd8e9f6e..378dd6516 100644 --- a/packages/client/src/components/note-detailed.vue +++ b/packages/client/src/components/note-detailed.vue @@ -42,8 +42,6 @@ bot - - @@ -1017,12 +1015,6 @@ export default defineComponent({ border: solid 0.5px var(--divider); border-radius: 4px; } - - > .admin, - > .moderator { - margin-right: 0.5em; - color: var(--badge); - } } } } diff --git a/packages/client/src/components/note-header.vue b/packages/client/src/components/note-header.vue index ca4be1e67..3bbeeece1 100644 --- a/packages/client/src/components/note-header.vue +++ b/packages/client/src/components/note-header.vue @@ -5,8 +5,6 @@
bot
-
-
@@ -79,13 +77,6 @@ export default defineComponent({ border-radius: 3px; } - > .admin, - > .moderator { - flex-shrink: 0; - margin-right: 0.5em; - color: var(--badge); - } - > .username { flex-shrink: 9999999; margin: 0 .5em 0 0; diff --git a/packages/client/src/ui/chat/note-header.vue b/packages/client/src/ui/chat/note-header.vue index 0b318ba8f..32b4573dc 100644 --- a/packages/client/src/ui/chat/note-header.vue +++ b/packages/client/src/ui/chat/note-header.vue @@ -5,8 +5,6 @@ bot - -
@@ -79,12 +77,6 @@ export default defineComponent({ border-radius: 3px; } - > .admin, - > .moderator { - margin-right: 0.5em; - color: var(--badge); - } - > .username { margin: 0 .5em 0 0; overflow: hidden; From 270df5c5b05a1e1d0ab1009fa386e6d74744f000 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 21 Nov 2021 13:43:07 +0900 Subject: [PATCH 05/44] move tools dir into src --- .../{ => src}/tools/accept-migration.ts | 0 packages/backend/{ => src}/tools/add-emoji.ts | 0 .../backend/{ => src}/tools/demote-admin.ts | 0 .../backend/{ => src}/tools/mark-admin.ts | 0 .../{ => src}/tools/refresh-question.ts | 0 .../{ => src}/tools/resync-remote-user.ts | 0 .../{ => src}/tools/show-signin-history.ts | 0 packages/backend/tools/accept-migration.js | 26 ---------- .../backend/tools/accept-migration.js.map | 1 - packages/backend/tools/add-emoji.js | 30 ------------ packages/backend/tools/add-emoji.js.map | 1 - packages/backend/tools/demote-admin.js | 30 ------------ packages/backend/tools/demote-admin.js.map | 1 - packages/backend/tools/mark-admin.js | 30 ------------ packages/backend/tools/mark-admin.js.map | 1 - packages/backend/tools/refresh-question.js | 14 ------ .../backend/tools/refresh-question.js.map | 1 - packages/backend/tools/resync-remote-user.js | 26 ---------- .../backend/tools/resync-remote-user.js.map | 1 - packages/backend/tools/show-signin-history.js | 47 ------------------- .../backend/tools/show-signin-history.js.map | 1 - 21 files changed, 210 deletions(-) rename packages/backend/{ => src}/tools/accept-migration.ts (100%) rename packages/backend/{ => src}/tools/add-emoji.ts (100%) rename packages/backend/{ => src}/tools/demote-admin.ts (100%) rename packages/backend/{ => src}/tools/mark-admin.ts (100%) rename packages/backend/{ => src}/tools/refresh-question.ts (100%) rename packages/backend/{ => src}/tools/resync-remote-user.ts (100%) rename packages/backend/{ => src}/tools/show-signin-history.ts (100%) delete mode 100644 packages/backend/tools/accept-migration.js delete mode 100644 packages/backend/tools/accept-migration.js.map delete mode 100644 packages/backend/tools/add-emoji.js delete mode 100644 packages/backend/tools/add-emoji.js.map delete mode 100644 packages/backend/tools/demote-admin.js delete mode 100644 packages/backend/tools/demote-admin.js.map delete mode 100644 packages/backend/tools/mark-admin.js delete mode 100644 packages/backend/tools/mark-admin.js.map delete mode 100644 packages/backend/tools/refresh-question.js delete mode 100644 packages/backend/tools/refresh-question.js.map delete mode 100644 packages/backend/tools/resync-remote-user.js delete mode 100644 packages/backend/tools/resync-remote-user.js.map delete mode 100644 packages/backend/tools/show-signin-history.js delete mode 100644 packages/backend/tools/show-signin-history.js.map diff --git a/packages/backend/tools/accept-migration.ts b/packages/backend/src/tools/accept-migration.ts similarity index 100% rename from packages/backend/tools/accept-migration.ts rename to packages/backend/src/tools/accept-migration.ts diff --git a/packages/backend/tools/add-emoji.ts b/packages/backend/src/tools/add-emoji.ts similarity index 100% rename from packages/backend/tools/add-emoji.ts rename to packages/backend/src/tools/add-emoji.ts diff --git a/packages/backend/tools/demote-admin.ts b/packages/backend/src/tools/demote-admin.ts similarity index 100% rename from packages/backend/tools/demote-admin.ts rename to packages/backend/src/tools/demote-admin.ts diff --git a/packages/backend/tools/mark-admin.ts b/packages/backend/src/tools/mark-admin.ts similarity index 100% rename from packages/backend/tools/mark-admin.ts rename to packages/backend/src/tools/mark-admin.ts diff --git a/packages/backend/tools/refresh-question.ts b/packages/backend/src/tools/refresh-question.ts similarity index 100% rename from packages/backend/tools/refresh-question.ts rename to packages/backend/src/tools/refresh-question.ts diff --git a/packages/backend/tools/resync-remote-user.ts b/packages/backend/src/tools/resync-remote-user.ts similarity index 100% rename from packages/backend/tools/resync-remote-user.ts rename to packages/backend/src/tools/resync-remote-user.ts diff --git a/packages/backend/tools/show-signin-history.ts b/packages/backend/src/tools/show-signin-history.ts similarity index 100% rename from packages/backend/tools/show-signin-history.ts rename to packages/backend/src/tools/show-signin-history.ts diff --git a/packages/backend/tools/accept-migration.js b/packages/backend/tools/accept-migration.js deleted file mode 100644 index 309a4ab5e..000000000 --- a/packages/backend/tools/accept-migration.js +++ /dev/null @@ -1,26 +0,0 @@ -"use strict"; -// ex) node built/tools/accept-migration Yo 1000000000001 -Object.defineProperty(exports, "__esModule", { value: true }); -const typeorm_1 = require("typeorm"); -const index_1 = require("@/config/index"); -(0, typeorm_1.createConnection)({ - type: 'postgres', - host: index_1.default.db.host, - port: index_1.default.db.port, - username: index_1.default.db.user, - password: index_1.default.db.pass, - database: index_1.default.db.db, - extra: index_1.default.db.extra, - synchronize: false, - dropSchema: false, -}).then(c => { - c.query(`INSERT INTO migrations(timestamp,name) VALUES (${process.argv[3]}, '${process.argv[2]}${process.argv[3]}');`).then(() => { - console.log('done'); - process.exit(0); - }).catch(e => { - console.log('ERROR:'); - console.log(e); - process.exit(1); - }); -}); -//# sourceMappingURL=accept-migration.js.map \ No newline at end of file diff --git a/packages/backend/tools/accept-migration.js.map b/packages/backend/tools/accept-migration.js.map deleted file mode 100644 index c158a4966..000000000 --- a/packages/backend/tools/accept-migration.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"accept-migration.js","sourceRoot":"","sources":["accept-migration.ts"],"names":[],"mappings":";AAAA,yDAAyD;;AAEzD,qCAA2C;AAC3C,0CAAoC;AAEpC,IAAA,0BAAgB,EAAC;IAChB,IAAI,EAAE,UAAU;IAChB,IAAI,EAAE,eAAM,CAAC,EAAE,CAAC,IAAI;IACpB,IAAI,EAAE,eAAM,CAAC,EAAE,CAAC,IAAI;IACpB,QAAQ,EAAE,eAAM,CAAC,EAAE,CAAC,IAAI;IACxB,QAAQ,EAAE,eAAM,CAAC,EAAE,CAAC,IAAI;IACxB,QAAQ,EAAE,eAAM,CAAC,EAAE,CAAC,EAAE;IACtB,KAAK,EAAE,eAAM,CAAC,EAAE,CAAC,KAAK;IACtB,WAAW,EAAE,KAAK;IAClB,UAAU,EAAE,KAAK;CACjB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;IACX,CAAC,CAAC,KAAK,CAAC,kDAAkD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;QAChI,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACpB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACjB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;QACZ,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACtB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACf,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACjB,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC"} \ No newline at end of file diff --git a/packages/backend/tools/add-emoji.js b/packages/backend/tools/add-emoji.js deleted file mode 100644 index df02f554a..000000000 --- a/packages/backend/tools/add-emoji.js +++ /dev/null @@ -1,30 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const index_1 = require("@/models/index"); -const gen_id_1 = require("@/misc/gen-id"); -async function main(name, url, alias) { - const aliases = alias != null ? [alias] : []; - await index_1.Emojis.save({ - id: (0, gen_id_1.genId)(), - host: null, - name, - url, - aliases, - updatedAt: new Date() - }); -} -const args = process.argv.slice(2); -const name = args[0]; -const url = args[1]; -if (!name) - throw new Error('require name'); -if (!url) - throw new Error('require url'); -main(name, url).then(() => { - console.log('success'); - process.exit(0); -}).catch(e => { - console.warn(e); - process.exit(1); -}); -//# sourceMappingURL=add-emoji.js.map \ No newline at end of file diff --git a/packages/backend/tools/add-emoji.js.map b/packages/backend/tools/add-emoji.js.map deleted file mode 100644 index 03bf31b98..000000000 --- a/packages/backend/tools/add-emoji.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"add-emoji.js","sourceRoot":"","sources":["add-emoji.ts"],"names":[],"mappings":";;AAAA,0CAAwC;AACxC,0CAAsC;AAEtC,KAAK,UAAU,IAAI,CAAC,IAAY,EAAE,GAAW,EAAE,KAAc;IAC5D,MAAM,OAAO,GAAG,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,CAAE,KAAK,CAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAE/C,MAAM,cAAM,CAAC,IAAI,CAAC;QACjB,EAAE,EAAE,IAAA,cAAK,GAAE;QACX,IAAI,EAAE,IAAI;QACV,IAAI;QACJ,GAAG;QACH,OAAO;QACP,SAAS,EAAE,IAAI,IAAI,EAAE;KACrB,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AACnC,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;AACrB,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;AAEpB,IAAI,CAAC,IAAI;IAAE,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;AAC3C,IAAI,CAAC,GAAG;IAAE,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC;AAEzC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;IACzB,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IACvB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACjB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;IACZ,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAChB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACjB,CAAC,CAAC,CAAC"} \ No newline at end of file diff --git a/packages/backend/tools/demote-admin.js b/packages/backend/tools/demote-admin.js deleted file mode 100644 index d6a296883..000000000 --- a/packages/backend/tools/demote-admin.js +++ /dev/null @@ -1,30 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const postgre_1 = require("../db/postgre"); -const typeorm_1 = require("typeorm"); -const user_1 = require("@/models/entities/user"); -async function main(username) { - if (!username) - throw `username required`; - username = username.replace(/^@/, ''); - await (0, postgre_1.initDb)(); - const Users = (0, typeorm_1.getRepository)(user_1.User); - const res = await Users.update({ - usernameLower: username.toLowerCase(), - host: null - }, { - isAdmin: false - }); - if (res.affected !== 1) { - throw 'Failed'; - } -} -const args = process.argv.slice(2); -main(args[0]).then(() => { - console.log('Success'); - process.exit(0); -}).catch(e => { - console.error(`Error: ${e.message || e}`); - process.exit(1); -}); -//# sourceMappingURL=demote-admin.js.map \ No newline at end of file diff --git a/packages/backend/tools/demote-admin.js.map b/packages/backend/tools/demote-admin.js.map deleted file mode 100644 index 4403e2bab..000000000 --- a/packages/backend/tools/demote-admin.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"demote-admin.js","sourceRoot":"","sources":["demote-admin.ts"],"names":[],"mappings":";;AAAA,2CAAuC;AACvC,qCAAwC;AACxC,iDAA8C;AAE9C,KAAK,UAAU,IAAI,CAAC,QAAgB;IACnC,IAAI,CAAC,QAAQ;QAAE,MAAM,mBAAmB,CAAC;IACzC,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAEtC,MAAM,IAAA,gBAAM,GAAE,CAAC;IACf,MAAM,KAAK,GAAG,IAAA,uBAAa,EAAC,WAAI,CAAC,CAAC;IAElC,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC;QAC9B,aAAa,EAAE,QAAQ,CAAC,WAAW,EAAE;QACrC,IAAI,EAAE,IAAI;KACV,EAAE;QACF,OAAO,EAAE,KAAK;KACd,CAAC,CAAC;IAEH,IAAI,GAAG,CAAC,QAAQ,KAAK,CAAC,EAAE;QACvB,MAAM,QAAQ,CAAC;KACf;AACF,CAAC;AAED,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AAEnC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;IACvB,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IACvB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACjB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;IACZ,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,OAAO,IAAI,CAAC,EAAE,CAAC,CAAC;IAC1C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACjB,CAAC,CAAC,CAAC"} \ No newline at end of file diff --git a/packages/backend/tools/mark-admin.js b/packages/backend/tools/mark-admin.js deleted file mode 100644 index 4563d9c33..000000000 --- a/packages/backend/tools/mark-admin.js +++ /dev/null @@ -1,30 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const postgre_1 = require("../db/postgre"); -const typeorm_1 = require("typeorm"); -const user_1 = require("@/models/entities/user"); -async function main(username) { - if (!username) - throw `username required`; - username = username.replace(/^@/, ''); - await (0, postgre_1.initDb)(); - const Users = (0, typeorm_1.getRepository)(user_1.User); - const res = await Users.update({ - usernameLower: username.toLowerCase(), - host: null - }, { - isAdmin: true - }); - if (res.affected !== 1) { - throw 'Failed'; - } -} -const args = process.argv.slice(2); -main(args[0]).then(() => { - console.log('Success'); - process.exit(0); -}).catch(e => { - console.error(`Error: ${e.message || e}`); - process.exit(1); -}); -//# sourceMappingURL=mark-admin.js.map \ No newline at end of file diff --git a/packages/backend/tools/mark-admin.js.map b/packages/backend/tools/mark-admin.js.map deleted file mode 100644 index 5633e2f89..000000000 --- a/packages/backend/tools/mark-admin.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"mark-admin.js","sourceRoot":"","sources":["mark-admin.ts"],"names":[],"mappings":";;AAAA,2CAAuC;AACvC,qCAAwC;AACxC,iDAA8C;AAE9C,KAAK,UAAU,IAAI,CAAC,QAAgB;IACnC,IAAI,CAAC,QAAQ;QAAE,MAAM,mBAAmB,CAAC;IACzC,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAEtC,MAAM,IAAA,gBAAM,GAAE,CAAC;IACf,MAAM,KAAK,GAAG,IAAA,uBAAa,EAAC,WAAI,CAAC,CAAC;IAElC,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC;QAC9B,aAAa,EAAE,QAAQ,CAAC,WAAW,EAAE;QACrC,IAAI,EAAE,IAAI;KACV,EAAE;QACF,OAAO,EAAE,IAAI;KACb,CAAC,CAAC;IAEH,IAAI,GAAG,CAAC,QAAQ,KAAK,CAAC,EAAE;QACvB,MAAM,QAAQ,CAAC;KACf;AACF,CAAC;AAED,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AAEnC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;IACvB,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IACvB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACjB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;IACZ,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,OAAO,IAAI,CAAC,EAAE,CAAC,CAAC;IAC1C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACjB,CAAC,CAAC,CAAC"} \ No newline at end of file diff --git a/packages/backend/tools/refresh-question.js b/packages/backend/tools/refresh-question.js deleted file mode 100644 index 0536c3820..000000000 --- a/packages/backend/tools/refresh-question.js +++ /dev/null @@ -1,14 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const question_1 = require("@/remote/activitypub/models/question"); -async function main(uri) { - return await (0, question_1.updateQuestion)(uri); -} -const args = process.argv.slice(2); -const uri = args[0]; -main(uri).then(result => { - console.log(`Done: ${result}`); -}).catch(e => { - console.warn(e); -}); -//# sourceMappingURL=refresh-question.js.map \ No newline at end of file diff --git a/packages/backend/tools/refresh-question.js.map b/packages/backend/tools/refresh-question.js.map deleted file mode 100644 index 3db6d0b8b..000000000 --- a/packages/backend/tools/refresh-question.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"refresh-question.js","sourceRoot":"","sources":["refresh-question.ts"],"names":[],"mappings":";;AAAA,mEAAsE;AAEtE,KAAK,UAAU,IAAI,CAAC,GAAW;IAC9B,OAAO,MAAM,IAAA,yBAAc,EAAC,GAAG,CAAC,CAAC;AAClC,CAAC;AAED,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AACnC,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;AAEpB,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;IACvB,OAAO,CAAC,GAAG,CAAC,SAAS,MAAM,EAAE,CAAC,CAAC;AAChC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;IACZ,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACjB,CAAC,CAAC,CAAC"} \ No newline at end of file diff --git a/packages/backend/tools/resync-remote-user.js b/packages/backend/tools/resync-remote-user.js deleted file mode 100644 index 05d76ecc9..000000000 --- a/packages/backend/tools/resync-remote-user.js +++ /dev/null @@ -1,26 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const postgre_1 = require("@/db/postgre"); -const Acct = require("misskey-js/built/acct"); -async function main(acct) { - await (0, postgre_1.initDb)(); - const { resolveUser } = await Promise.resolve().then(() => require('@/remote/resolve-user')); - const { username, host } = Acct.parse(acct); - await resolveUser(username, host, {}, true); -} -// get args -const args = process.argv.slice(2); -let acct = args[0]; -// normalize args -acct = acct.replace(/^@/, ''); -// check args -if (!acct.match(/^\w+@\w/)) { - throw `Invalid acct format. Valid format are user@host`; -} -console.log(`resync ${acct}`); -main(acct).then(() => { - console.log('Done'); -}).catch(e => { - console.warn(e); -}); -//# sourceMappingURL=resync-remote-user.js.map \ No newline at end of file diff --git a/packages/backend/tools/resync-remote-user.js.map b/packages/backend/tools/resync-remote-user.js.map deleted file mode 100644 index 456d7da1d..000000000 --- a/packages/backend/tools/resync-remote-user.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"resync-remote-user.js","sourceRoot":"","sources":["resync-remote-user.ts"],"names":[],"mappings":";;AAAA,0CAAsC;AACtC,8CAA8C;AAE9C,KAAK,UAAU,IAAI,CAAC,IAAY;IAC/B,MAAM,IAAA,gBAAM,GAAE,CAAC;IACf,MAAM,EAAE,WAAW,EAAE,GAAG,2CAAa,uBAAuB,EAAC,CAAC;IAE9D,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC5C,MAAM,WAAW,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;AAC7C,CAAC;AAED,WAAW;AACX,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AACnC,IAAI,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;AAEnB,iBAAiB;AACjB,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;AAE9B,aAAa;AACb,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE;IAC3B,MAAM,iDAAiD,CAAC;CACxD;AAED,OAAO,CAAC,GAAG,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC;AAE9B,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;IACpB,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AACrB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;IACZ,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACjB,CAAC,CAAC,CAAC"} \ No newline at end of file diff --git a/packages/backend/tools/show-signin-history.js b/packages/backend/tools/show-signin-history.js deleted file mode 100644 index daeea8461..000000000 --- a/packages/backend/tools/show-signin-history.js +++ /dev/null @@ -1,47 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -const index_1 = require("@/models/index"); -// node built/tools/show-signin-history username -// => {Success} {Date} {IPAddrsss} -// node built/tools/show-signin-history username user-agent,x-forwarded-for -// with user-agent and x-forwarded-for -// node built/tools/show-signin-history username all -// with full request headers -async function main(username, headers) { - const user = await index_1.Users.findOne({ - host: null, - usernameLower: username.toLowerCase(), - }); - if (user == null) - throw new Error('User not found'); - const history = await index_1.Signins.find({ - userId: user.id - }); - for (const signin of history) { - console.log(`${signin.success ? 'OK' : 'NG'} ${signin.createdAt ? signin.createdAt.toISOString() : 'Unknown'} ${signin.ip}`); - // headers - if (headers != null) { - for (const key of Object.keys(signin.headers)) { - if (headers.includes('all') || headers.includes(key)) { - console.log(` ${key}: ${signin.headers[key]}`); - } - } - } - } -} -// get args -const args = process.argv.slice(2); -let username = args[0]; -let headers; -if (args[1] != null) { - headers = args[1].split(/,/).map(header => header.toLowerCase()); -} -// normalize args -username = username.replace(/^@/, ''); -main(username, headers).then(() => { - process.exit(0); -}).catch(e => { - console.warn(e); - process.exit(1); -}); -//# sourceMappingURL=show-signin-history.js.map \ No newline at end of file diff --git a/packages/backend/tools/show-signin-history.js.map b/packages/backend/tools/show-signin-history.js.map deleted file mode 100644 index b421825bc..000000000 --- a/packages/backend/tools/show-signin-history.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"show-signin-history.js","sourceRoot":"","sources":["show-signin-history.ts"],"names":[],"mappings":";;AAAA,0CAAgD;AAEhD,gDAAgD;AAChD,mCAAmC;AAEnC,2EAA2E;AAC3E,uCAAuC;AAEvC,oDAAoD;AACpD,6BAA6B;AAE7B,KAAK,UAAU,IAAI,CAAC,QAAgB,EAAE,OAAkB;IACvD,MAAM,IAAI,GAAG,MAAM,aAAK,CAAC,OAAO,CAAC;QAChC,IAAI,EAAE,IAAI;QACV,aAAa,EAAE,QAAQ,CAAC,WAAW,EAAE;KACrC,CAAC,CAAC;IAEH,IAAI,IAAI,IAAI,IAAI;QAAE,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC;IAEpD,MAAM,OAAO,GAAG,MAAM,eAAO,CAAC,IAAI,CAAC;QAClC,MAAM,EAAE,IAAI,CAAC,EAAE;KACf,CAAC,CAAC;IAEH,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC7B,OAAO,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,SAAS,IAAI,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC;QAE7H,UAAU;QACV,IAAI,OAAO,IAAI,IAAI,EAAE;YACpB,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE;gBAC9C,IAAI,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;oBACrD,OAAO,CAAC,GAAG,CAAC,MAAM,GAAG,KAAK,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;iBACjD;aACD;SACD;KACD;AACF,CAAC;AAED,WAAW;AACX,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AAEnC,IAAI,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;AACvB,IAAI,OAA6B,CAAC;AAElC,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE;IACpB,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC;CACjE;AAED,iBAAiB;AACjB,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;AAEtC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;IACjC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACjB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;IACZ,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAChB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AACjB,CAAC,CAAC,CAAC"} \ No newline at end of file From 8e04bd12cf5714bddb1ff1967ab2f77b32b7ad42 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 21 Nov 2021 14:01:53 +0900 Subject: [PATCH 06/44] =?UTF-8?q?fix(client):=20=E3=83=AD=E3=82=B0?= =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=81=AB=E3=81=8A=E3=81=84=E3=81=A6=E3=83=91?= =?UTF-8?q?=E3=82=B9=E3=83=AF=E3=83=BC=E3=83=89=E3=81=8C=E8=AA=A4=E3=81=A3?= =?UTF-8?q?=E3=81=A6=E3=81=84=E3=82=8B=E9=9A=9B=E3=81=AE=E3=82=A8=E3=83=A9?= =?UTF-8?q?=E3=83=BC=E3=83=A1=E3=83=83=E3=82=BB=E3=83=BC=E3=82=B8=E3=81=8C?= =?UTF-8?q?=E6=AD=A3=E3=81=97=E3=81=8F=E8=A1=A8=E7=A4=BA=E3=81=95=E3=82=8C?= =?UTF-8?q?=E3=81=AA=E3=81=84=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + locales/ja-JP.yml | 1 + packages/client/src/components/signin.vue | 8 ++++++++ 3 files changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d315743fe..b4314ee81 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ ### Improvements ### Bugfixes +- クライアント: ログインにおいてパスワードが誤っている際のエラーメッセージが正しく表示されない問題を修正 ### Changes - クライアント: ノートにモデレーターバッジを表示するのを廃止 diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 9877248eb..633cd0e85 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -808,6 +808,7 @@ ffVisibility: "つながりの公開範囲" ffVisibilityDescription: "自分のフォロー/フォロワー情報の公開範囲を設定できます。" continueThread: "さらにスレッドを見る" deleteAccountConfirm: "アカウントが削除されます。よろしいですか？" +incorrectPassword: "パスワードが間違っています。" _emailUnavailable: used: "既に使用されています" diff --git a/packages/client/src/components/signin.vue b/packages/client/src/components/signin.vue index 51913f7a2..f640e948a 100644 --- a/packages/client/src/components/signin.vue +++ b/packages/client/src/components/signin.vue @@ -197,6 +197,14 @@ export default defineComponent({ }); break; } + case '932c904e-9460-45b7-9ce6-7ed33be7eb2c': { + os.alert({ + type: 'error', + title: this.$ts.loginFailed, + text: this.$ts.incorrectPassword, + }); + break; + } case 'e03a5f46-d309-4865-9b69-56282d94e1eb': { showSuspendedDialog(); break; From 9604ad3dc1f9329706115805742857786a6c1b40 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 21 Nov 2021 14:09:41 +0900 Subject: [PATCH 07/44] =?UTF-8?q?fix(client):=20=E3=83=AA=E3=82=A2?= =?UTF-8?q?=E3=82=AF=E3=82=B7=E3=83=A7=E3=83=B3=E3=83=84=E3=83=BC=E3=83=AB?= =?UTF-8?q?=E3=83=81=E3=83=83=E3=83=97=E3=80=81Renote=E3=83=84=E3=83=BC?= =?UTF-8?q?=E3=83=AB=E3=83=81=E3=83=83=E3=83=97=E3=81=AE=E3=83=A6=E3=83=BC?= =?UTF-8?q?=E3=82=B6=E3=83=BC=E3=81=AE=E4=B8=A6=E3=81=B3=E9=A0=86=E3=82=92?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + packages/client/src/components/reactions-viewer.reaction.vue | 4 +--- packages/client/src/components/renote-button.vue | 4 +--- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b4314ee81..8b2934a75 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ ### Bugfixes - クライアント: ログインにおいてパスワードが誤っている際のエラーメッセージが正しく表示されない問題を修正 +- クライアント: リアクションツールチップ、Renoteツールチップのユーザーの並び順を修正 ### Changes - クライアント: ノートにモデレーターバッジを表示するのを廃止 diff --git a/packages/client/src/components/reactions-viewer.reaction.vue b/packages/client/src/components/reactions-viewer.reaction.vue index 65f92c39e..44c6e9809 100644 --- a/packages/client/src/components/reactions-viewer.reaction.vue +++ b/packages/client/src/components/reactions-viewer.reaction.vue @@ -97,9 +97,7 @@ export default defineComponent({ limit: 11 }); - const users = reactions - .sort((a, b) => new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime()) - .map(x => x.user); + const users = reactions.map(x => x.user); os.popup(XDetails, { showing, diff --git a/packages/client/src/components/renote-button.vue b/packages/client/src/components/renote-button.vue index 62780cace..280283ec6 100644 --- a/packages/client/src/components/renote-button.vue +++ b/packages/client/src/components/renote-button.vue @@ -48,9 +48,7 @@ export default defineComponent({ limit: 11 }); - const users = renotes - .sort((a, b) => new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime()) - .map(x => x.user); + const users = renotes.map(x => x.user); if (users.length < 1) return; From aaba43e7544d201791ca2c9a9427d7d645dc6eef Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 21 Nov 2021 18:40:09 +0900 Subject: [PATCH 08/44] Update README.md --- README.md | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index be01643dd..18b3adfba 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,18 @@ [Learn more](https://misskey-hub.net/) +--- + +[✨ Find an instance](https://misskey-hub.net/instances.html) +• +[📦 Create your own instance](https://misskey-hub.net/docs/install/install.html) +• +[🛠️ Contribute](./CONTRIBUTING.md) +• +[🚀 Join the community](https://discord.gg/Wp8gVStHW3) + +--- + Become a Patron!
@@ -16,17 +28,19 @@ -## ✨ Find an instance -Please see the [Instances list](https://misskey-hub.net/instances.html). - -## 📦 Create your own instance -Please see the [Installation Guide](https://misskey-hub.net/docs/install/install.html). - -## 🛠️ Contribute -Please see the [Contribution Guide](./CONTRIBUTING.md). - -## 🚀 Join the community -Misskey's [Discord server is available](https://discord.gg/Wp8gVStHW3). +## ✨ Features +- **ActivityPub support**\ + It is possible to interact with other software. +- **Reactions**\ + You can add "reactions" to each post, making it easy for you to express your feelings. +- **Drive**\ + An interface to manage uploaded files such as images, videos, sounds, etc. + You can also organize your favorite content into folders, making it easy to share again. +- **Rich Web UI**\ + Misskey has a rich WebUI by default. + It is highly customizable by flexibly changing the layout and installing various widgets and themes. + Furthermore, plug-ins can be created using AiScript, a original programming language. +- and more...
From dec7c4f722f2ac766b367fa5f1442a41f5e408b6 Mon Sep 17 00:00:00 2001 From: "Richard \"EpicKitty\" Bowey" Date: Fri, 26 Nov 2021 04:39:57 +0000 Subject: [PATCH 09/44] Implemented a rotate MFM (#8016) Co-authored-by: Richard Bowey --- locales/en-US.yml | 2 ++ packages/client/src/components/mfm.ts | 5 +++++ packages/client/src/pages/mfm-cheat-sheet.vue | 11 +++++++++++ packages/client/src/scripts/mfm-tags.ts | 2 +- 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/locales/en-US.yml b/locales/en-US.yml index 37da6fdc9..c5c8afb50 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -931,6 +931,8 @@ _mfm: rainbowDescription: "Makes the content appear in rainbow colors." sparkle: "Sparkle" sparkleDescription: "Gives content a sparkling particle effect." + rotate: "Rotate" + rotateDescription: "Rotates the content by 90 degrees" _reversi: reversi: "Reversi" gameSettings: "Game settings" diff --git a/packages/client/src/components/mfm.ts b/packages/client/src/components/mfm.ts index d41cf6fc2..d1da365d9 100644 --- a/packages/client/src/components/mfm.ts +++ b/packages/client/src/components/mfm.ts @@ -184,6 +184,11 @@ export default defineComponent({ count, speed, }, genEl(token.children)); } + case 'rotate': { + const degrees = parseInt(token.props.args.deg) || '90'; + style = `transform: rotate(${degrees}deg); transform-origin: center center;`; + break; + } } if (style == null) { return h('span', {}, ['$[', token.props.name, ' ', ...genEl(token.children), ']']); diff --git a/packages/client/src/pages/mfm-cheat-sheet.vue b/packages/client/src/pages/mfm-cheat-sheet.vue index e9a3b6deb..ee9d807e7 100644 --- a/packages/client/src/pages/mfm-cheat-sheet.vue +++ b/packages/client/src/pages/mfm-cheat-sheet.vue @@ -281,6 +281,16 @@
+
+
{{ $ts._mfm.rotate }}
+
+

{{ $ts._mfm.rotateDescription }}

+
+ + MFM +
+
+
@@ -328,6 +338,7 @@ export default defineComponent({ preview_blur: `$[blur ${this.$ts._mfm.dummy}]`, preview_rainbow: `$[rainbow 🍮]`, preview_sparkle: `$[sparkle 🍮]`, + preview_rotate: `$[rotate 🍮]`, } }, }); diff --git a/packages/client/src/scripts/mfm-tags.ts b/packages/client/src/scripts/mfm-tags.ts index 1b18210aa..18e8d7038 100644 --- a/packages/client/src/scripts/mfm-tags.ts +++ b/packages/client/src/scripts/mfm-tags.ts @@ -1 +1 @@ -export const MFM_TAGS = ['tada', 'jelly', 'twitch', 'shake', 'spin', 'jump', 'bounce', 'flip', 'x2', 'x3', 'x4', 'font', 'blur', 'rainbow', 'sparkle']; +export const MFM_TAGS = ['tada', 'jelly', 'twitch', 'shake', 'spin', 'jump', 'bounce', 'flip', 'x2', 'x3', 'x4', 'font', 'blur', 'rainbow', 'sparkle', 'rotate']; From b4ebf254c898bf998170e41d09c20cf6a0ddafd0 Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 26 Nov 2021 13:41:31 +0900 Subject: [PATCH 10/44] Update ja-JP.yml --- locales/ja-JP.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 633cd0e85..77b7a2cf2 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -824,7 +824,7 @@ _ffVisibility: _signup: almostThere: "ほとんど完了です" - emailAddressInfo: "あなたが使っているメールアドレスを入力してください。" + emailAddressInfo: "あなたが使っているメールアドレスを入力してください。メールアドレスが公開されることはありません。" emailSent: "入力されたメールアドレス({email})宛に確認のメールが送信されました。メールに記載されたリンクにアクセスすると、アカウントの作成が完了します。" _accountDelete: @@ -945,6 +945,8 @@ _mfm: rainbowDescription: "内容をレインボーにします。" sparkle: "キラキラ" sparkleDescription: "キラキラしたパーティクルのエフェクトを追加します。" + rotate: "回転" + rotateDescription: "指定した角度で回転させます。" _reversi: reversi: "リバーシ" From d9775c147f9dc5cec208b583a473df06b72305d7 Mon Sep 17 00:00:00 2001 From: MeiMei <30769358+mei23@users.noreply.github.com> Date: Fri, 26 Nov 2021 13:41:49 +0900 Subject: [PATCH 11/44] =?UTF-8?q?fix:=20tools=E3=81=8C=E5=8B=95=E3=81=8B?= =?UTF-8?q?=E3=81=AA=E3=81=84=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3=20(#8008?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Move tools * Fix DB --- packages/backend/src/tools/add-emoji.ts | 5 ++++- packages/backend/src/tools/demote-admin.ts | 4 +--- packages/backend/src/tools/mark-admin.ts | 4 +--- packages/backend/src/tools/refresh-question.ts | 5 ++++- packages/backend/src/tools/show-signin-history.ts | 5 ++++- 5 files changed, 14 insertions(+), 9 deletions(-) diff --git a/packages/backend/src/tools/add-emoji.ts b/packages/backend/src/tools/add-emoji.ts index 9ffe7dfa8..6c750bcab 100644 --- a/packages/backend/src/tools/add-emoji.ts +++ b/packages/backend/src/tools/add-emoji.ts @@ -1,7 +1,10 @@ -import { Emojis } from '@/models/index'; +import { initDb } from '@/db/postgre'; import { genId } from '@/misc/gen-id'; async function main(name: string, url: string, alias?: string): Promise { + await initDb(); + const { Emojis } = await import('@/models/index'); + const aliases = alias != null ? [ alias ] : []; await Emojis.save({ diff --git a/packages/backend/src/tools/demote-admin.ts b/packages/backend/src/tools/demote-admin.ts index d7c6d1cec..b326c946e 100644 --- a/packages/backend/src/tools/demote-admin.ts +++ b/packages/backend/src/tools/demote-admin.ts @@ -1,13 +1,11 @@ import { initDb } from '../db/postgre'; -import { getRepository } from 'typeorm'; -import { User } from '@/models/entities/user'; async function main(username: string) { if (!username) throw `username required`; username = username.replace(/^@/, ''); await initDb(); - const Users = getRepository(User); + const { Users } = await import('@/models/index'); const res = await Users.update({ usernameLower: username.toLowerCase(), diff --git a/packages/backend/src/tools/mark-admin.ts b/packages/backend/src/tools/mark-admin.ts index 62ed0f09e..0833f2226 100644 --- a/packages/backend/src/tools/mark-admin.ts +++ b/packages/backend/src/tools/mark-admin.ts @@ -1,13 +1,11 @@ import { initDb } from '../db/postgre'; -import { getRepository } from 'typeorm'; -import { User } from '@/models/entities/user'; async function main(username: string) { if (!username) throw `username required`; username = username.replace(/^@/, ''); await initDb(); - const Users = getRepository(User); + const { Users } = await import('@/models/index'); const res = await Users.update({ usernameLower: username.toLowerCase(), diff --git a/packages/backend/src/tools/refresh-question.ts b/packages/backend/src/tools/refresh-question.ts index 98a3c2865..3bbb781ae 100644 --- a/packages/backend/src/tools/refresh-question.ts +++ b/packages/backend/src/tools/refresh-question.ts @@ -1,6 +1,9 @@ -import { updateQuestion } from '@/remote/activitypub/models/question'; +import { initDb } from '@/db/postgre'; async function main(uri: string): Promise { + await initDb(); + const { updateQuestion } = await import('@/remote/activitypub/models/question'); + return await updateQuestion(uri); } diff --git a/packages/backend/src/tools/show-signin-history.ts b/packages/backend/src/tools/show-signin-history.ts index ad9231631..1291a1b22 100644 --- a/packages/backend/src/tools/show-signin-history.ts +++ b/packages/backend/src/tools/show-signin-history.ts @@ -1,4 +1,4 @@ -import { Users, Signins } from '@/models/index'; +import { initDb } from '@/db/postgre'; // node built/tools/show-signin-history username // => {Success} {Date} {IPAddrsss} @@ -10,6 +10,9 @@ import { Users, Signins } from '@/models/index'; // with full request headers async function main(username: string, headers?: string[]) { + await initDb(); + const { Users, Signins } = await import('@/models/index'); + const user = await Users.findOne({ host: null, usernameLower: username.toLowerCase(), From 8e0108a0b83c6f1fb9021ed8aeb051d46d34c382 Mon Sep 17 00:00:00 2001 From: tamaina Date: Fri, 26 Nov 2021 13:43:11 +0900 Subject: [PATCH 12/44] =?UTF-8?q?fix:=20notification.vue=E3=81=AEIntersect?= =?UTF-8?q?ionObserver=E3=81=BE=E3=82=8F=E3=82=8A=E3=82=92=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=20(#8010)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix notification.vue * remove a blank line * disconnect intersection observer * disconnect2 * Update packages/client/src/components/notification.vue Co-authored-by: Acid Chicken (硫酸鶏) * disconnect * oops Co-authored-by: Acid Chicken (硫酸鶏) --- .../client/src/components/notification.vue | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/packages/client/src/components/notification.vue b/packages/client/src/components/notification.vue index 89025b72e..5cf44f4c5 100644 --- a/packages/client/src/components/notification.vue +++ b/packages/client/src/components/notification.vue @@ -107,28 +107,25 @@ export default defineComponent({ const reactionRef = ref(null); onMounted(() => { - let readObserver: IntersectionObserver | null = null; - let connection = null; - if (!props.notification.isRead) { - readObserver = new IntersectionObserver((entries, observer) => { + const readObserver = new IntersectionObserver((entries, observer) => { if (!entries.some(entry => entry.isIntersecting)) return; os.stream.send('readNotification', { id: props.notification.id }); - entries.map(({ target }) => observer.unobserve(target)); + observer.disconnect(); }); readObserver.observe(elRef.value); - connection = os.stream.useChannel('main'); - connection.on('readAllNotifications', () => readObserver.unobserve(elRef.value)); - } + const connection = os.stream.useChannel('main'); + connection.on('readAllNotifications', () => readObserver.disconnect()); - onUnmounted(() => { - if (readObserver) readObserver.unobserve(elRef.value); - if (connection) connection.dispose(); - }); + onUnmounted(() => { + readObserver.disconnect(); + connection.dispose(); + }); + } }); const followRequestDone = ref(false); From 698e0d08a121a9a00e5c5f71ee44a276d4995f08 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 27 Nov 2021 18:29:23 +0900 Subject: [PATCH 13/44] =?UTF-8?q?fix(client):=20=E3=83=A2=E3=83=90?= =?UTF-8?q?=E3=82=A4=E3=83=AB=E3=81=A7=E3=82=BF=E3=83=83=E3=83=97=E3=81=97?= =?UTF-8?q?=E3=81=9F=E3=81=A8=E3=81=8D=E3=81=AB=E3=83=84=E3=83=BC=E3=83=AB?= =?UTF-8?q?=E3=83=81=E3=83=83=E3=83=97=E3=81=8C=E8=A1=A8=E7=A4=BA=E3=81=95?= =?UTF-8?q?=E3=82=8C=E3=82=8B=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/client/src/os.ts | 10 ++++++++++ packages/client/src/scripts/use-tooltip.ts | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/packages/client/src/os.ts b/packages/client/src/os.ts index 9eac06a5e..48a558a36 100644 --- a/packages/client/src/os.ts +++ b/packages/client/src/os.ts @@ -12,6 +12,16 @@ import { resolve } from '@/router'; import { $i } from '@/account'; import { defaultStore } from '@/store'; +export let isScreenTouching = false; + +window.addEventListener('touchstart', () => { + isScreenTouching = true; +}, { passive: true }); + +window.addEventListener('touchend', () => { + isScreenTouching = false; +}, { passive: true }); + export const stream = markRaw(new Misskey.Stream(url, $i)); export const pendingApiRequestsCount = ref(0); diff --git a/packages/client/src/scripts/use-tooltip.ts b/packages/client/src/scripts/use-tooltip.ts index 2c0c36400..89e6b1be9 100644 --- a/packages/client/src/scripts/use-tooltip.ts +++ b/packages/client/src/scripts/use-tooltip.ts @@ -1,3 +1,4 @@ +import { isScreenTouching } from '@/os'; import { Ref, ref } from 'vue'; export function useTooltip(onShow: (showing: Ref) => void) { @@ -10,6 +11,10 @@ export function useTooltip(onShow: (showing: Ref) => void) { close(); if (!isHovering) return; + // iOS(Androidも？)では、要素をタップした直後に(おせっかいで)mouseoverイベントを発火させたりするため、その対策 + // これが無いと、画面に触れてないのにツールチップが出たりしてしまう + if (!isScreenTouching) return; + const showing = ref(true); onShow(showing); changeShowingState = () => { From 0d21083c9a119d642bfb7a7f8704fbd29fdbcf3c Mon Sep 17 00:00:00 2001 From: Francis Dinh Date: Sat, 27 Nov 2021 22:43:08 -0500 Subject: [PATCH 14/44] Fix install docs link in readme (#8017) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 18b3adfba..799be299d 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ [✨ Find an instance](https://misskey-hub.net/instances.html) • -[📦 Create your own instance](https://misskey-hub.net/docs/install/install.html) +[📦 Create your own instance](https://misskey-hub.net/docs/install.html) • [🛠️ Contribute](./CONTRIBUTING.md) • From 335e4bd213d23849ecff193e1143a322bf201708 Mon Sep 17 00:00:00 2001 From: xianon Date: Sun, 28 Nov 2021 13:45:17 +0900 Subject: [PATCH 15/44] =?UTF-8?q?/antennas/notes=20API=20=E3=81=A7?= =?UTF-8?q?=E6=97=A5=E4=BB=98=E3=81=AB=E3=82=88=E3=82=8B=E7=B5=9E=E3=82=8A?= =?UTF-8?q?=E8=BE=BC=E3=81=BF=E3=81=8C=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB=E3=81=99=E3=82=8B=20(#8015)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/server/api/endpoints/antennas/notes.ts | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/packages/backend/src/server/api/endpoints/antennas/notes.ts b/packages/backend/src/server/api/endpoints/antennas/notes.ts index 1759e95b4..02fec2778 100644 --- a/packages/backend/src/server/api/endpoints/antennas/notes.ts +++ b/packages/backend/src/server/api/endpoints/antennas/notes.ts @@ -33,6 +33,14 @@ export const meta = { untilId: { validator: $.optional.type(ID), }, + + sinceDate: { + validator: $.optional.num, + }, + + untilDate: { + validator: $.optional.num, + }, }, errors: { @@ -68,7 +76,8 @@ export default define(meta, async (ps, user) => { .select('joining.noteId') .where('joining.antennaId = :antennaId', { antennaId: antenna.id }); - const query = makePaginationQuery(Notes.createQueryBuilder('note'), ps.sinceId, ps.untilId) + const query = makePaginationQuery(Notes.createQueryBuilder('note'), + ps.sinceId, ps.untilId, ps.sinceDate, ps.untilDate) .andWhere(`note.id IN (${ antennaQuery.getQuery() })`) .innerJoinAndSelect('note.user', 'user') .leftJoinAndSelect('note.reply', 'reply') From e8005c8d3a6edf2c8cdce3fe098fb9acff8a57c6 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sun, 28 Nov 2021 20:07:37 +0900 Subject: [PATCH 16/44] client: refine ui --- packages/client/src/components/dialog.vue | 8 +- .../src/components/emoji-picker-dialog.vue | 2 +- packages/client/src/components/form/group.vue | 35 +++ packages/client/src/components/form/input.vue | 22 +- packages/client/src/components/form/link.vue | 112 ++++++++ .../client/src/components/form/pagination.vue | 44 +++ packages/client/src/components/form/radio.vue | 22 +- .../client/src/components/form/radios.vue | 49 +++- packages/client/src/components/form/range.vue | 272 ++++++++++++------ .../client/src/components/form/section.vue | 26 +- .../client/src/components/form/select.vue | 11 +- packages/client/src/components/form/slot.vue | 15 +- .../client/src/components/form/suspense.vue | 98 +++++++ .../client/src/components/form/switch.vue | 12 +- .../client/src/components/form/textarea.vue | 16 +- .../client/src/components/global/spacer.vue | 28 +- packages/client/src/components/key-value.vue | 48 ++++ packages/client/src/components/note.vue | 1 + packages/client/src/components/ui/button.vue | 4 +- packages/client/src/components/ui/menu.vue | 8 +- .../client/src/components/ui/popup-menu.vue | 4 +- packages/client/src/components/ui/popup.vue | 198 +++++++------ .../client/src/components/ui/super-menu.vue | 2 - packages/client/src/components/ui/tooltip.vue | 63 ++-- packages/client/src/directives/index.ts | 2 + packages/client/src/directives/panel.ts | 24 ++ packages/client/src/os.ts | 4 + packages/client/src/pages/about-misskey.vue | 189 ++++++------ packages/client/src/pages/about.vue | 164 ++++++----- packages/client/src/pages/federation.vue | 181 ++++++------ packages/client/src/pages/settings/2fa.vue | 114 ++++---- packages/client/src/pages/settings/drive.vue | 87 +++--- .../src/pages/settings/email-address.vue | 68 ----- .../src/pages/settings/email-notification.vue | 91 ------ packages/client/src/pages/settings/email.vue | 145 +++++++--- .../client/src/pages/settings/general.vue | 104 ++++--- .../src/pages/settings/import-export.vue | 2 +- packages/client/src/pages/settings/index.vue | 34 ++- packages/client/src/pages/settings/menu.vue | 22 +- .../src/pages/settings/notifications.vue | 24 +- .../client/src/pages/settings/privacy.vue | 80 +++--- .../client/src/pages/settings/profile.vue | 97 +++---- .../client/src/pages/settings/reaction.vue | 45 +-- .../client/src/pages/settings/security.vue | 84 ++++-- packages/client/src/pages/settings/sounds.vue | 32 +-- packages/client/src/pages/settings/theme.vue | 122 ++++---- .../client/src/pages/settings/word-mute.vue | 58 ++-- packages/client/src/style.scss | 20 +- 48 files changed, 1744 insertions(+), 1149 deletions(-) create mode 100644 packages/client/src/components/form/group.vue create mode 100644 packages/client/src/components/form/link.vue create mode 100644 packages/client/src/components/form/pagination.vue create mode 100644 packages/client/src/components/form/suspense.vue create mode 100644 packages/client/src/components/key-value.vue create mode 100644 packages/client/src/directives/panel.ts delete mode 100644 packages/client/src/pages/settings/email-address.vue delete mode 100644 packages/client/src/pages/settings/email-notification.vue diff --git a/packages/client/src/components/dialog.vue b/packages/client/src/components/dialog.vue index 1b03e65a3..5d6678531 100644 --- a/packages/client/src/components/dialog.vue +++ b/packages/client/src/components/dialog.vue @@ -14,7 +14,9 @@
- + + + @@ -114,9 +115,9 @@ export default defineComponent({ const changed = ref(false); const invalid = ref(false); const filled = computed(() => v.value !== '' && v.value != null); - const inputEl = ref(null); - const prefixEl = ref(null); - const suffixEl = ref(null); + const inputEl = ref(); + const prefixEl = ref(); + const suffixEl = ref(); const focus = () => inputEl.value.focus(); const onInput = (ev) => { @@ -208,7 +209,7 @@ export default defineComponent({ .matxzzsk { > .label { font-size: 0.85em; - padding: 0 0 8px 12px; + padding: 0 0 8px 0; user-select: none; &:empty { @@ -217,8 +218,8 @@ export default defineComponent({ } > .caption { - font-size: 0.8em; - padding: 8px 0 0 12px; + font-size: 0.85em; + padding: 8px 0 0 0; color: var(--fgTransparentWeak); &:empty { @@ -242,8 +243,7 @@ export default defineComponent({ font-weight: normal; font-size: 1em; color: var(--fg); - background: var(--panel); - border: solid 0.5px var(--inputBorder); + border: solid 0.5px var(--panel); border-radius: 6px; outline: none; box-shadow: none; @@ -311,5 +311,9 @@ export default defineComponent({ } } } + + > .save { + margin: 8px 0 0 0; + } } diff --git a/packages/client/src/components/form/link.vue b/packages/client/src/components/form/link.vue new file mode 100644 index 000000000..3eb74425b --- /dev/null +++ b/packages/client/src/components/form/link.vue @@ -0,0 +1,112 @@ + + + + + diff --git a/packages/client/src/components/form/pagination.vue b/packages/client/src/components/form/pagination.vue new file mode 100644 index 000000000..3d3b40a78 --- /dev/null +++ b/packages/client/src/components/form/pagination.vue @@ -0,0 +1,44 @@ + + + + + diff --git a/packages/client/src/components/form/radio.vue b/packages/client/src/components/form/radio.vue index 0f31d8fa0..f0b8c7137 100644 --- a/packages/client/src/components/form/radio.vue +++ b/packages/client/src/components/form/radio.vue @@ -1,5 +1,6 @@ @@ -118,10 +118,14 @@ export default defineComponent({ transition: inherit; } - > p { - margin: 0; + > .caption { + margin: 8px 0 0 0; color: var(--fgTransparentWeak); - font-size: 90%; + font-size: 0.85em; + + &:empty { + display: none; + } } } diff --git a/packages/client/src/components/form/textarea.vue b/packages/client/src/components/form/textarea.vue index f3a2c394f..98fd0da94 100644 --- a/packages/client/src/components/form/textarea.vue +++ b/packages/client/src/components/form/textarea.vue @@ -4,6 +4,7 @@
Roujo