From 4557856104feb6de33da1bc802208a997042ca97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=8B=E3=81=B2=E3=82=8F=E3=81=974=EF=BC=88=E3=83=90?= =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B31=EF=BC=89?= Date: Tue, 16 Apr 2019 13:09:31 +0900 Subject: [PATCH 01/15] Doc: Update setup documents for 10.x (#4676) * Doc: Update setup documents Use GitHub api to checkout latest release instead of "git tag" command which cannot accurately determine prerelease tag. Also, Changed numbered list format because the shell command is too long to fit on one line. Conflicts: docs/docker.en.md docs/docker.fr.md docs/docker.ja.md docs/setup.en.md docs/setup.fr.md docs/setup.ja.md * Doc: Checkout 10.x tag only Update "checkout latest release" command. Checkout latest tag but 10.x tag only. * Doc: Restore MongoDB * Use tab instead of spaces --- docs/docker.en.md | 30 ++++++++++++-- docs/docker.fr.md | 54 ++++++++++++++++++++----- docs/docker.ja.md | 30 ++++++++++++-- docs/setup.en.md | 97 +++++++++++++++++++++++++++++++------------- docs/setup.fr.md | 97 +++++++++++++++++++++++++++++++------------- docs/setup.ja.md | 101 ++++++++++++++++++++++++++++++++-------------- 6 files changed, 304 insertions(+), 105 deletions(-) diff --git a/docs/docker.en.md b/docs/docker.en.md index f0fcdb66d570..3469ec5591f8 100644 --- a/docs/docker.en.md +++ b/docs/docker.en.md @@ -9,9 +9,23 @@ This guide describes how to install and setup Misskey with Docker. *1.* Download Misskey ---------------------------------------------------------------- -1. `git clone -b master git://github.com/syuilo/misskey.git` Clone Misskey repository's master branch. -2. `cd misskey` Move to misskey directory. -3. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)` Checkout to the [latest release](https://github.com/syuilo/misskey/releases/latest) tag. +1. Clone Misskey repository's master branch. + + `git clone -b master git://github.com/syuilo/misskey.git` + +2. Move to misskey directory. + + `cd misskey` + +3. Checkout to the [latest release](https://github.com/syuilo/misskey/releases/latest) tag. + + ```bash + git tag | grep '^10\.' | sort -V --reverse | \ + while read tag_name; do \ + if ! curl -s "https://api.github.com/repos/syuilo/misskey/releases/tags/$tag_name" \ + | grep -qE '"(draft|prerelease)": true'; \ + then git checkout $tag_name; break; fi ; done + ``` *2.* Configure Misskey ---------------------------------------------------------------- @@ -39,7 +53,15 @@ Just `docker-compose up -d`. GLHF! ### How to update your Misskey server to the latest version 1. `git fetch` 2. `git stash` -3. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)` +3. + + ```bash + git tag | grep '^10\.' | sort -V --reverse | \ + while read tag_name; do \ + if ! curl -s "https://api.github.com/repos/syuilo/misskey/releases/tags/$tag_name" \ + | grep -qE '"(draft|prerelease)": true'; \ + then git checkout $tag_name; break; fi ; done + ``` 4. `git stash pop` 5. `docker-compose build` 6. Check [ChangeLog](../CHANGELOG.md) for migration information diff --git a/docs/docker.fr.md b/docs/docker.fr.md index 8f7e9f4294a8..c35030d78747 100644 --- a/docs/docker.fr.md +++ b/docs/docker.fr.md @@ -10,9 +10,23 @@ Ce guide explique comment installer et configurer Misskey avec Docker. *1.* Télécharger Misskey ---------------------------------------------------------------- -1. `git clone -b master git://github.com/syuilo/misskey.git` Clone le dépôt de Misskey sur la branche master. -2. `cd misskey` Naviguez dans le dossier du dépôt. -3. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)` Checkout sur le tag de la [dernière version](https://github.com/syuilo/misskey/releases/latest). +1. Clone le dépôt de Misskey sur la branche master. + + `git clone -b master git://github.com/syuilo/misskey.git` + +2. Naviguez dans le dossier du dépôt. + + `cd misskey` + +3. Checkout sur le tag de la [dernière version](https://github.com/syuilo/misskey/releases/latest). + + ```bash + git tag | grep '^10\.' | sort -V --reverse | \ + while read tag_name; do \ + if ! curl -s "https://api.github.com/repos/syuilo/misskey/releases/tags/$tag_name" \ + | grep -qE '"(draft|prerelease)": true'; \ + then git checkout $tag_name; break; fi ; done + ``` *2.* Configuration de Misskey ---------------------------------------------------------------- @@ -40,7 +54,15 @@ Utilisez la commande `docker-compose up -d`. GLHF! ### How to update your Misskey server to the latest version 1. `git fetch` 2. `git stash` -3. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)` +3. + + ```bash + git tag | grep '^10\.' | sort -V --reverse | \ + while read tag_name; do \ + if ! curl -s "https://api.github.com/repos/syuilo/misskey/releases/tags/$tag_name" \ + | grep -qE '"(draft|prerelease)": true'; \ + then git checkout $tag_name; break; fi ; done + ``` 4. `git stash pop` 5. `docker-compose build` 6. Consultez le [ChangeLog](../CHANGELOG.md) pour avoir les éventuelles informations de migration @@ -52,14 +74,28 @@ Utilisez la commande `docker-compose up -d`. GLHF! ### Configuration d'ElasticSearch (pour la fonction de recherche) *1.* Préparation de l'environnement ---------------------------------------------------------------- -1. `mkdir elasticsearch && chown 1000:1000 elasticsearch` Permet de créer le dossier d'accueil de la base ElasticSearch aves les bons droits -2. `sysctl -w vm.max_map_count=262144` Augmente la valeur max du paramètre map_count du système (valeur minimum pour pouvoir lancer ES) +1. Permet de créer le dossier d'accueil de la base ElasticSearch aves les bons droits + + `mkdir elasticsearch && chown 1000:1000 elasticsearch` + +2. Augmente la valeur max du paramètre map_count du système (valeur minimum pour pouvoir lancer ES) + + `sysctl -w vm.max_map_count=262144` *2.* Après lancement du docker-compose, initialisation de la base ElasticSearch ---------------------------------------------------------------- -1. `docker-compose -it web /bin/sh` Connexion dans le conteneur web -2. `apk add curl` Ajout du paquet curl -3. `curl -X PUT "es:9200/misskey" -H 'Content-Type: application/json' -d'{ "settings" : { "index" : { } }}'` Création de la base ES +1. Connexion dans le conteneur web + + `docker-compose -it web /bin/sh` + +2. Ajout du paquet curl + + `apk add curl` + +3. Création de la base ES + + `curl -X PUT "es:9200/misskey" -H 'Content-Type: application/json' -d'{ "settings" : { "index" : { } }}'` + 4. `exit` ---------------------------------------------------------------- diff --git a/docs/docker.ja.md b/docs/docker.ja.md index 0baf28572847..29a0fdfb14c7 100644 --- a/docs/docker.ja.md +++ b/docs/docker.ja.md @@ -9,9 +9,23 @@ Dockerを使ったMisskey構築方法 *1.* Misskeyのダウンロード ---------------------------------------------------------------- -1. `git clone -b master git://github.com/syuilo/misskey.git` masterブランチからMisskeyレポジトリをクローン -2. `cd misskey` misskeyディレクトリに移動 -3. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)` [最新のリリース](https://github.com/syuilo/misskey/releases/latest)を確認 +1. masterブランチからMisskeyレポジトリをクローン + + `git clone -b master git://github.com/syuilo/misskey.git` + +2. misskeyディレクトリに移動 + + `cd misskey` + +3. [最新のリリース](https://github.com/syuilo/misskey/releases/latest)を確認 + + ```bash + git tag | grep '^10\.' | sort -V --reverse | \ + while read tag_name; do \ + if ! curl -s "https://api.github.com/repos/syuilo/misskey/releases/tags/$tag_name" \ + | grep -qE '"(draft|prerelease)": true'; \ + then git checkout $tag_name; break; fi ; done + ``` *2.* 設定ファイルを作成する ---------------------------------------------------------------- @@ -39,7 +53,15 @@ Dockerを使ったMisskey構築方法 ### Misskeyを最新バージョンにアップデートする方法: 1. `git fetch` 2. `git stash` -3. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)` +3. + + ```bash + git tag | grep '^10\.' | sort -V --reverse | \ + while read tag_name; do \ + if ! curl -s "https://api.github.com/repos/syuilo/misskey/releases/tags/$tag_name" \ + | grep -qE '"(draft|prerelease)": true'; \ + then git checkout $tag_name; break; fi ; done + ``` 4. `git stash pop` 5. `docker-compose build` 6. [ChangeLog](../CHANGELOG.md)でマイグレーション情報を確認する diff --git a/docs/setup.en.md b/docs/setup.en.md index 1125081445df..ea6a34c83a69 100644 --- a/docs/setup.en.md +++ b/docs/setup.en.md @@ -41,15 +41,38 @@ As root: *4.* Install Misskey ---------------------------------------------------------------- -1. `su - misskey` Connect to misskey user. -2. `git clone -b master git://github.com/syuilo/misskey.git` Clone the misskey repo from master branch. -3. `cd misskey` Navigate to misskey directory -4. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)` Checkout to the [latest release](https://github.com/syuilo/misskey/releases/latest) -5. `npm install` Install misskey dependencies. +1. Connect to misskey user. + + `su - misskey` + +2. Clone the misskey repo from master branch. + + `git clone -b master git://github.com/syuilo/misskey.git` + +3. Navigate to misskey directory + + `cd misskey` + +4. Checkout to the [latest release](https://github.com/syuilo/misskey/releases/latest) + + ```bash + git tag | grep '^10\.' | sort -V --reverse | \ + while read tag_name; do \ + if ! curl -s "https://api.github.com/repos/syuilo/misskey/releases/tags/$tag_name" \ + | grep -qE '"(draft|prerelease)": true'; \ + then git checkout $tag_name; break; fi ; done + ``` + +5. Install misskey dependencies. + + `npm install` *5.* Configure Misskey ---------------------------------------------------------------- -1. `cp .config/example.yml .config/default.yml` Copy the `.config/example.yml` and rename it to `default.yml`. +1. Copy the `.config/example.yml` and rename it to `default.yml`. + + `cp .config/example.yml .config/default.yml` + 2. Edit `default.yml` *6.* Build Misskey @@ -77,37 +100,53 @@ Just `NODE_ENV=production npm start`. GLHF! ### Launch with systemd -1. Create a systemd service here: `/etc/systemd/system/misskey.service` +1. Create a systemd service here + + `/etc/systemd/system/misskey.service` + 2. Edit it, and paste this and save: -``` -[Unit] -Description=Misskey daemon - -[Service] -Type=simple -User=misskey -ExecStart=/usr/bin/npm start -WorkingDirectory=/home/misskey/misskey -Environment="NODE_ENV=production" -TimeoutSec=60 -StandardOutput=syslog -StandardError=syslog -SyslogIdentifier=misskey -Restart=always - -[Install] -WantedBy=multi-user.target -``` + ``` + [Unit] + Description=Misskey daemon + + [Service] + Type=simple + User=misskey + ExecStart=/usr/bin/npm start + WorkingDirectory=/home/misskey/misskey + Environment="NODE_ENV=production" + TimeoutSec=60 + StandardOutput=syslog + StandardError=syslog + SyslogIdentifier=misskey + Restart=always + + [Install] + WantedBy=multi-user.target + ``` + +3. Reload systemd and enable the misskey service. + + `systemctl daemon-reload ; systemctl enable misskey` + +4. Start the misskey service. -3. `systemctl daemon-reload ; systemctl enable misskey` Reload systemd and enable the misskey service. -4. `systemctl start misskey` Start the misskey service. + `systemctl start misskey` You can check if the service is running with `systemctl status misskey`. ### How to update your Misskey server to the latest version 1. `git fetch` -2. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)` +2. 　 + + ```bash + git tag | grep '^10\.' | sort -V --reverse | \ + while read tag_name; do \ + if ! curl -s "https://api.github.com/repos/syuilo/misskey/releases/tags/$tag_name" \ + | grep -qE '"(draft|prerelease)": true'; \ + then git checkout $tag_name; break; fi ; done + ``` 3. `npm install` 4. `NODE_ENV=production npm run build` 5. Check [ChangeLog](../CHANGELOG.md) for migration information diff --git a/docs/setup.fr.md b/docs/setup.fr.md index 959ec3392ffb..b9d0e910b708 100644 --- a/docs/setup.fr.md +++ b/docs/setup.fr.md @@ -41,15 +41,38 @@ En root : *4.* Installation de Misskey ---------------------------------------------------------------- -1. `su - misskey` Basculez vers l'utilisateur misskey. -2. `git clone -b master git://github.com/syuilo/misskey.git` Clonez la branche master du dépôt misskey. -3. `cd misskey` Accédez au dossier misskey. -4. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)` Checkout sur le tag de la [version la plus récente](https://github.com/syuilo/misskey/releases/latest) -5. `npm install` Installez les dépendances de misskey. +1. Basculez vers l'utilisateur misskey. + + `su - misskey` + +2. Clonez la branche master du dépôt misskey. + + `git clone -b master git://github.com/syuilo/misskey.git` + +3. Accédez au dossier misskey. + + `cd misskey` + +4. Checkout sur le tag de la [version la plus récente](https://github.com/syuilo/misskey/releases/latest) + + ```bash + git tag | grep '^10\.' | sort -V --reverse | \ + while read tag_name; do \ + if ! curl -s "https://api.github.com/repos/syuilo/misskey/releases/tags/$tag_name" \ + | grep -qE '"(draft|prerelease)": true'; \ + then git checkout $tag_name; break; fi ; done + ``` + +5. Installez les dépendances de misskey. + + `npm install` *5.* Création du fichier de configuration ---------------------------------------------------------------- -1. `cp .config/example.yml .config/default.yml` Copiez le fichier `.config/example.yml` et renommez-le`default.yml`. +1. Copiez le fichier `.config/example.yml` et renommez-le`default.yml`. + + `cp .config/example.yml .config/default.yml` + 2. Editez le fichier `default.yml` *6.* Construction de Misskey @@ -77,37 +100,53 @@ Lancez tout simplement `NODE_ENV=production npm start`. Bonne chance et amusez-v ### Démarrage avec systemd -1. Créez un service systemd sur : `/etc/systemd/system/misskey.service` +1. Créez un service systemd sur + + `/etc/systemd/system/misskey.service` + 2. Editez-le puis copiez et coller ceci dans le fichier : -``` -[Unit] -Description=Misskey daemon - -[Service] -Type=simple -User=misskey -ExecStart=/usr/bin/npm start -WorkingDirectory=/home/misskey/misskey -Environment="NODE_ENV=production" -TimeoutSec=60 -StandardOutput=syslog -StandardError=syslog -SyslogIdentifier=misskey -Restart=always - -[Install] -WantedBy=multi-user.target -``` + ``` + [Unit] + Description=Misskey daemon + + [Service] + Type=simple + User=misskey + ExecStart=/usr/bin/npm start + WorkingDirectory=/home/misskey/misskey + Environment="NODE_ENV=production" + TimeoutSec=60 + StandardOutput=syslog + StandardError=syslog + SyslogIdentifier=misskey + Restart=always + + [Install] + WantedBy=multi-user.target + ``` + +3. Redémarre systemd et active le service misskey. + + `systemctl daemon-reload ; systemctl enable misskey` + +4. Démarre le service misskey. -3. `systemctl daemon-reload ; systemctl enable misskey` Redémarre systemd et active le service misskey. -4. `systemctl start misskey` Démarre le service misskey. + `systemctl start misskey` Vous pouvez vérifier si le service a démarré en utilisant la commande `systemctl status misskey`. ### Méthode de mise à jour vers la plus récente version de Misskey 1. `git fetch` -2. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)` +2. 　 + + ```bash + git tag | grep '^10\.' | sort -V --reverse | \ + while read tag_name; do \ + if ! curl -s "https://api.github.com/repos/syuilo/misskey/releases/tags/$tag_name" \ + | grep -qE '"(draft|prerelease)": true'; \ + then git checkout $tag_name; break; fi ; done + ``` 3. `npm install` 4. `NODE_ENV=production npm run build` 5. Consultez [ChangeLog](../CHANGELOG.md) pour les information de migration. diff --git a/docs/setup.ja.md b/docs/setup.ja.md index 8a21e104d634..252016131a61 100644 --- a/docs/setup.ja.md +++ b/docs/setup.ja.md @@ -48,15 +48,38 @@ adduser --disabled-password --disabled-login misskey *4.* Misskeyのインストール ---------------------------------------------------------------- -1. `su - misskey` misskeyユーザーを使用 -2. `git clone -b master git://github.com/syuilo/misskey.git` masterブランチからMisskeyレポジトリをクローン -3. `cd misskey` misskeyディレクトリに移動 -4. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)` [最新のリリース](https://github.com/syuilo/misskey/releases/latest)を確認 -5. `npm install` Misskeyの依存パッケージをインストール +1. misskeyユーザーを使用 + + `su - misskey` + +2. masterブランチからMisskeyレポジトリをクローン + + `git clone -b master git://github.com/syuilo/misskey.git` + +3. misskeyディレクトリに移動 + + `cd misskey` + +4. [最新のリリース](https://github.com/syuilo/misskey/releases/latest)を確認 + + ```bash + git tag | grep '^10\.' | sort -V --reverse | \ + while read tag_name; do \ + if ! curl -s "https://api.github.com/repos/syuilo/misskey/releases/tags/$tag_name" \ + | grep -qE '"(draft|prerelease)": true'; \ + then git checkout $tag_name; break; fi ; done + ``` + +5. Misskeyの依存パッケージをインストール + + `npm install` *5.* 設定ファイルを作成する ---------------------------------------------------------------- -1. `cp .config/example.yml .config/default.yml` `.config/example.yml`をコピーし名前を`default.yml`にする。 +1. `.config/example.yml`をコピーし名前を`default.yml`にする。 + + `cp .config/example.yml .config/default.yml` + 2. `default.yml` を編集する。 *6.* Misskeyのビルド @@ -82,38 +105,56 @@ Debianをお使いであれば、`build-essential`パッケージをインスト `NODE_ENV=production npm start`するだけです。GLHF! ### systemdを用いた起動 -1. systemdサービスのファイルを作成: `/etc/systemd/system/misskey.service` +1. systemdサービスのファイルを作成 + + `/etc/systemd/system/misskey.service` + 2. エディタで開き、以下のコードを貼り付けて保存: -``` -[Unit] -Description=Misskey daemon - -[Service] -Type=simple -User=misskey -ExecStart=/usr/bin/npm start -WorkingDirectory=/home/misskey/misskey -Environment="NODE_ENV=production" -TimeoutSec=60 -StandardOutput=syslog -StandardError=syslog -SyslogIdentifier=misskey -Restart=always - -[Install] -WantedBy=multi-user.target -``` -CentOSで1024以下のポートを使用してMisskeyを使用する場合は`ExecStart=/usr/bin/sudo /usr/bin/npm start`に変更する必要があります。 + ``` + [Unit] + Description=Misskey daemon + + [Service] + Type=simple + User=misskey + ExecStart=/usr/bin/npm start + WorkingDirectory=/home/misskey/misskey + Environment="NODE_ENV=production" + TimeoutSec=60 + StandardOutput=syslog + StandardError=syslog + SyslogIdentifier=misskey + Restart=always + + [Install] + WantedBy=multi-user.target + ``` + + CentOSで1024以下のポートを使用してMisskeyを使用する場合は`ExecStart=/usr/bin/sudo /usr/bin/npm start`に変更する必要があります。 -3. `systemctl daemon-reload ; systemctl enable misskey` systemdを再読み込みしmisskeyサービスを有効化 -4. `systemctl start misskey` misskeyサービスの起動 +3. systemdを再読み込みしmisskeyサービスを有効化 + + `systemctl daemon-reload ; systemctl enable misskey` + +4. misskeyサービスの起動 + + `systemctl start misskey` `systemctl status misskey`と入力すると、サービスの状態を調べることができます。 ### Misskeyを最新バージョンにアップデートする方法: 1. `git fetch` -2. `git checkout $(git tag -l | grep -v 'rc[0-9]*$' | sort -V | tail -n 1)` +2. 　 + + ```bash + git tag | grep '^10\.' | sort -V --reverse | \ + while read tag_name; do \ + if ! curl -s "https://api.github.com/repos/syuilo/misskey/releases/tags/$tag_name" \ + | grep -qE '"(draft|prerelease)": true'; \ + then git checkout $tag_name; break; fi ; done + ``` + 3. `npm install` 4. `NODE_ENV=production npm run build` 5. [ChangeLog](../CHANGELOG.md)でマイグレーション情報を確認する From d08016ac58530aee5420bd60c50b397332e43ed4 Mon Sep 17 00:00:00 2001 From: mei23 Date: Wed, 17 Apr 2019 20:09:00 +0900 Subject: [PATCH 02/15] =?UTF-8?q?=E3=82=B8=E3=83=A7=E3=83=96=E3=81=AE?= =?UTF-8?q?=E4=B8=A6=E5=88=97=E5=BA=A6=E3=82=92=E8=A8=AD=E5=AE=9A=E3=81=A7?= =?UTF-8?q?=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .config/example.yml | 3 +++ src/config/types.ts | 3 +++ src/queue/index.ts | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.config/example.yml b/.config/example.yml index 70c096baa137..ea85ed399e25 100644 --- a/.config/example.yml +++ b/.config/example.yml @@ -113,3 +113,6 @@ autoAdmin: true # Clustering #clusterLimit: 1 + +# deliverJobConcurrency: 16; +# inboxJobConcurrency: 16; diff --git a/src/config/types.ts b/src/config/types.ts index 901021416eb6..003f194eb347 100644 --- a/src/config/types.ts +++ b/src/config/types.ts @@ -44,6 +44,9 @@ export type Source = { accesslog?: string; clusterLimit?: number; + + deliverJobConcurrency?: number; + inboxJobConcurrency?: number; }; /** diff --git a/src/queue/index.ts b/src/queue/index.ts index ad3bb942ba9b..2dd0887b143a 100644 --- a/src/queue/index.ts +++ b/src/queue/index.ts @@ -168,8 +168,8 @@ export function createImportUserListsJob(user: ILocalUser, fileId: IDriveFile['_ export default function() { if (!program.onlyServer) { - deliverQueue.process(128, processDeliver); - inboxQueue.process(128, processInbox); + deliverQueue.process(config.deliverJobConcurrency || 16, processDeliver); + inboxQueue.process(config.inboxJobConcurrency || 16, processInbox); processDb(dbQueue); } } From 2f55ce35d33c012db32987e0294b4c90e51180c9 Mon Sep 17 00:00:00 2001 From: mei23 Date: Wed, 17 Apr 2019 20:22:23 +0900 Subject: [PATCH 03/15] Remove jammed warn --- src/client/app/admin/views/queue.vue | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/client/app/admin/views/queue.vue b/src/client/app/admin/views/queue.vue index b379ba185058..fe5f1b388bb2 100644 --- a/src/client/app/admin/views/queue.vue +++ b/src/client/app/admin/views/queue.vue @@ -4,7 +4,6 @@
Deliver
- The queue is jammed. Process @@ -31,7 +30,6 @@
Inbox
- The queue is jammed. Process From c1cffd609e118fc474be8ca473cdbe2df983a489 Mon Sep 17 00:00:00 2001 From: mei23 Date: Wed, 17 Apr 2019 20:26:42 +0900 Subject: [PATCH 04/15] Fix JobConcurrency --- .config/example.yml | 4 ++-- src/queue/index.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.config/example.yml b/.config/example.yml index ea85ed399e25..9d9cbee58385 100644 --- a/.config/example.yml +++ b/.config/example.yml @@ -114,5 +114,5 @@ autoAdmin: true # Clustering #clusterLimit: 1 -# deliverJobConcurrency: 16; -# inboxJobConcurrency: 16; +# deliverJobConcurrency: 32 +# inboxJobConcurrency: 32 diff --git a/src/queue/index.ts b/src/queue/index.ts index 2dd0887b143a..e9da5bc172ea 100644 --- a/src/queue/index.ts +++ b/src/queue/index.ts @@ -168,8 +168,8 @@ export function createImportUserListsJob(user: ILocalUser, fileId: IDriveFile['_ export default function() { if (!program.onlyServer) { - deliverQueue.process(config.deliverJobConcurrency || 16, processDeliver); - inboxQueue.process(config.inboxJobConcurrency || 16, processInbox); + deliverQueue.process(config.deliverJobConcurrency || 32, processDeliver); + inboxQueue.process(config.inboxJobConcurrency || 32, processInbox); processDb(dbQueue); } } From c5f65d9eeb98c1fa5ba5cb02f6e3592236440630 Mon Sep 17 00:00:00 2001 From: MeiMei <30769358+mei23@users.noreply.github.com> Date: Thu, 18 Apr 2019 03:15:00 +0900 Subject: [PATCH 05/15] =?UTF-8?q?=E3=82=A2=E3=83=B3=E3=82=B1=E3=83=BC?= =?UTF-8?q?=E3=83=88=E3=82=A6=E3=82=A3=E3=82=B8=E3=83=83=E3=83=88=E3=81=A7?= =?UTF-8?q?=E3=82=82MFM=E3=82=92=E4=BD=BF=E7=94=A8=E3=81=99=E3=82=8B?= =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=20v10=20(#4740)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * MFM in poll * use mfm --- src/client/app/desktop/views/widgets/polls.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/client/app/desktop/views/widgets/polls.vue b/src/client/app/desktop/views/widgets/polls.vue index 3567cae5edb0..c77762ecdfa5 100644 --- a/src/client/app/desktop/views/widgets/polls.vue +++ b/src/client/app/desktop/views/widgets/polls.vue @@ -11,7 +11,9 @@
-

{{ poll.text }}

+

+ +

From e62bb7cdaffc7af1a84be01db5c642c594053ad8 Mon Sep 17 00:00:00 2001 From: MeiMei <30769358+mei23@users.noreply.github.com> Date: Thu, 18 Apr 2019 03:30:01 +0900 Subject: [PATCH 06/15] Update dependencies (#4739) --- package.json | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index a61c76103c35..9589b8fa54ca 100644 --- a/package.json +++ b/package.json @@ -32,14 +32,14 @@ "@prezzemolo/rap": "0.1.2", "@prezzemolo/zip": "0.0.3", "@types/bcryptjs": "2.4.2", - "@types/bull": "3.5.8", + "@types/bull": "3.5.11", "@types/chai-http": "3.0.5", "@types/dateformat": "3.0.0", "@types/deep-equal": "1.0.1", "@types/double-ended-queue": "2.1.0", - "@types/elasticsearch": "5.0.30", - "@types/file-type": "10.6.0", - "@types/gulp": "4.0.5", + "@types/elasticsearch": "5.0.32", + "@types/file-type": "10.9.1", + "@types/gulp": "4.0.6", "@types/gulp-mocha": "0.0.32", "@types/gulp-rename": "0.0.33", "@types/gulp-replace": "0.0.31", @@ -47,19 +47,19 @@ "@types/gulp-util": "3.0.34", "@types/is-root": "1.0.0", "@types/is-url": "1.2.28", - "@types/js-yaml": "3.12.0", + "@types/js-yaml": "3.12.1", "@types/jsdom": "12.2.3", "@types/katex": "0.10.1", "@types/koa": "2.0.48", "@types/koa-bodyparser": "5.0.2", - "@types/koa-compress": "2.0.8", + "@types/koa-compress": "2.0.9", "@types/koa-cors": "0.0.0", "@types/koa-favicon": "2.0.19", "@types/koa-logger": "3.1.1", "@types/koa-mount": "3.0.1", "@types/koa-multer": "1.0.0", "@types/koa-router": "7.0.40", - "@types/koa-send": "4.1.1", + "@types/koa-send": "4.1.2", "@types/koa-views": "2.0.3", "@types/koa__cors": "2.2.3", "@types/minio": "7.0.1", @@ -135,19 +135,19 @@ "gulp-sourcemaps": "2.6.5", "gulp-stylus": "2.7.0", "gulp-tslint": "8.1.4", - "gulp-typescript": "5.0.0", + "gulp-typescript": "5.0.1", "gulp-uglify": "3.0.2", "gulp-util": "3.0.8", "hard-source-webpack-plugin": "0.13.1", - "html-minifier": "3.5.21", + "html-minifier": "4.0.0", "http-signature": "1.2.0", - "insert-text-at-cursor": "0.1.2", + "insert-text-at-cursor": "0.2.0", "is-root": "2.0.0", - "is-svg": "4.0.0", - "js-yaml": "3.13.0", + "is-svg": "4.1.0", + "js-yaml": "3.13.1", "jsdom": "14.0.0", "json5": "2.1.0", - "json5-loader": "1.0.1", + "json5-loader": "2.0.0", "katex": "0.10.1", "koa": "2.7.0", "koa-bodyparser": "4.2.1", @@ -250,8 +250,8 @@ "vuex": "3.1.0", "vuex-persistedstate": "2.5.4", "web-push": "3.3.3", - "webpack": "4.28.4", - "webpack-cli": "3.2.3", + "webpack": "4.30.0", + "webpack-cli": "3.3.0", "websocket": "1.0.28", "ws": "6.2.1", "xev": "2.0.1" From 45b94086eddcdf836cc7c72b453ada3bbd27125d Mon Sep 17 00:00:00 2001 From: MeiMei <30769358+mei23@users.noreply.github.com> Date: Thu, 18 Apr 2019 04:34:47 +0900 Subject: [PATCH 07/15] =?UTF-8?q?=E3=82=B5=E3=82=A4=E3=83=AC=E3=83=B3?= =?UTF-8?q?=E3=82=B9,=20=E3=83=96=E3=83=AD=E3=83=83=E3=82=AF,=20=E3=83=9F?= =?UTF-8?q?=E3=83=A5=E3=83=BC=E3=83=88=E3=81=AE=E7=A2=BA=E8=AA=8D=E8=A1=A8?= =?UTF-8?q?=E7=A4=BA=20for=20v10=20(#4744)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * confirm on user menu * confirm silence * Resolve #4554 --- locales/ja-JP.yml | 10 ++++++ src/client/app/admin/views/users.vue | 4 +++ .../app/common/views/components/dialog.vue | 3 -- .../app/common/views/components/user-menu.vue | 33 ++++++++++++++++--- 4 files changed, 42 insertions(+), 8 deletions(-) diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 067d8fca610a..fb653ed762b6 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -513,8 +513,12 @@ common/views/components/user-menu.vue: mention: "メンション" mute: "ミュート" unmute: "ミュート解除" + mute-confirm: "このユーザーをミュートしますか？" + unmute-confirm: "このユーザーをミュート解除しますか？" block: "ブロック" unblock: "ブロック解除" + block-confirm: "このユーザーをブロックしますか？" + unblock-confirm: "このユーザーをブロック解除しますか？" push-to-list: "リストに追加" select-list: "リストを選択してください" report-abuse: "スパムを報告" @@ -522,8 +526,12 @@ common/views/components/user-menu.vue: report-abuse-reported: "管理者に報告されました。ご協力ありがとうございました。" silence: "サイレンス" unsilence: "サイレンス解除" + silence-confirm: "このユーザーをサイレンスしますか？" + unsilence-confirm: "このユーザーをサイレンス解除しますか？" suspend: "凍結" unsuspend: "凍結解除" + suspend-confirm: "このユーザーを凍結しますか？" + unsuspend-confirm: "このユーザーを凍結解除しますか？" common/views/components/poll.vue: vote-to: "「{}」に投票する" @@ -1330,7 +1338,9 @@ admin/views/users.vue: unsuspend-confirm: "凍結を解除しますか？" unsuspended: "凍結を解除しました" make-silence: "サイレンス" + silence-confirm: "サイレンスしますか？" unmake-silence: "サイレンスの解除" + unsilence-confirm: "サイレンスを解除しますか？" verify: "公式アカウントにする" verify-confirm: "公式アカウントにしますか？" verified: "公式アカウントにしました" diff --git a/src/client/app/admin/views/users.vue b/src/client/app/admin/views/users.vue index ff485cec8681..cef6f796cc83 100644 --- a/src/client/app/admin/views/users.vue +++ b/src/client/app/admin/views/users.vue @@ -232,6 +232,8 @@ export default Vue.extend({ }, async silenceUser() { + if (!await this.getConfirmed(this.$t('silence-confirm'))) return; + const process = async () => { await this.$root.api('admin/silence-user', { userId: this.user._id }); this.$root.dialog({ @@ -251,6 +253,8 @@ export default Vue.extend({ }, async unsilenceUser() { + if (!await this.getConfirmed(this.$t('unsilence-confirm'))) return; + const process = async () => { await this.$root.api('admin/unsilence-user', { userId: this.user._id }); this.$root.dialog({ diff --git a/src/client/app/common/views/components/dialog.vue b/src/client/app/common/views/components/dialog.vue index 6a074769d894..771b1237ee99 100644 --- a/src/client/app/common/views/components/dialog.vue +++ b/src/client/app/common/views/components/dialog.vue @@ -183,9 +183,6 @@ export default Vue.extend({ height 100% &.splash - &, * - pointer-events none !important - > .main min-width 0 width initial diff --git a/src/client/app/common/views/components/user-menu.vue b/src/client/app/common/views/components/user-menu.vue index 93fd759fd956..edb482c18a30 100644 --- a/src/client/app/common/views/components/user-menu.vue +++ b/src/client/app/common/views/components/user-menu.vue @@ -89,8 +89,10 @@ export default Vue.extend({ }); }, - toggleMute() { + async toggleMute() { if (this.user.isMuted) { + if (!await this.getConfirmed(this.$t('unmute-confirm'))) return; + this.$root.api('mute/delete', { userId: this.user.id }).then(() => { @@ -102,6 +104,8 @@ export default Vue.extend({ }); }); } else { + if (!await this.getConfirmed(this.$t('mute-confirm'))) return; + this.$root.api('mute/create', { userId: this.user.id }).then(() => { @@ -115,8 +119,10 @@ export default Vue.extend({ } }, - toggleBlock() { + async toggleBlock() { if (this.user.isBlocking) { + if (!await this.getConfirmed(this.$t('unblock-confirm'))) return; + this.$root.api('blocking/delete', { userId: this.user.id }).then(() => { @@ -128,6 +134,8 @@ export default Vue.extend({ }); }); } else { + if (!await this.getConfirmed(this.$t('block-confirm'))) return; + this.$root.api('blocking/create', { userId: this.user.id }).then(() => { @@ -164,7 +172,9 @@ export default Vue.extend({ }); }, - toggleSilence() { + async toggleSilence() { + if (!await this.getConfirmed(this.$t(this.user.isSilenced ? 'unsilence-confirm' : 'silence-confirm'))) return; + this.$root.api(this.user.isSilenced ? 'admin/unsilence-user' : 'admin/silence-user', { userId: this.user.id }).then(() => { @@ -181,7 +191,9 @@ export default Vue.extend({ }); }, - toggleSuspend() { + async toggleSuspend() { + if (!await this.getConfirmed(this.$t(this.user.isSuspended ? 'unsuspend-confirm' : 'suspend-confirm'))) return; + this.$root.api(this.user.isSuspended ? 'admin/unsuspend-user' : 'admin/suspend-user', { userId: this.user.id }).then(() => { @@ -196,7 +208,18 @@ export default Vue.extend({ text: e }); }); - } + }, + + async getConfirmed(text: string): Promise { + const confirm = await this.$root.dialog({ + type: 'warning', + showCancelButton: true, + title: 'confirm', + text, + }); + + return !confirm.canceled; + }, } }); From 1451d6e7884eadfc13d6db6766d56bc1335795f5 Mon Sep 17 00:00:00 2001 From: mei23 Date: Thu, 18 Apr 2019 20:35:30 +0900 Subject: [PATCH 08/15] Fix locales --- locales/en-US.yml | 3 +-- locales/ja-JP.yml | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/locales/en-US.yml b/locales/en-US.yml index 1317388b7ecb..4bbf8e93d5df 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -276,6 +276,7 @@ common: nav: "Navigation" tips: "Tips" hashtags: "Hashtags" + queue: "Queue" dev: "Failed to create the application. Please try again." ai-chan-kawaii: "Ai-chan kawaii!" you: "You" @@ -988,8 +989,6 @@ desktop/views/components/settings.tags.vue: query: "Query (optional)" add: "Add" save: "Save" -desktop/views/components/taskmanager.vue: - title: "Task Manager" desktop/views/components/timeline.vue: home: "Home" local: "Local" diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 6d59bc2791b9..d8930104b4c1 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -291,6 +291,7 @@ common: nav: "ナビゲーション" tips: "ヒント" hashtags: "ハッシュタグ" + queue: "キュー" dev: "アプリの作成に失敗しました。再度お試しください。" ai-chan-kawaii: "藍ちゃかわいい" @@ -1098,9 +1099,6 @@ desktop/views/components/settings.tags.vue: add: "追加" save: "保存" -desktop/views/components/taskmanager.vue: - title: "タスクマネージャ" - desktop/views/components/timeline.vue: home: "ホーム" local: "ローカル" From 00a0831ea0697e883c37b8f9491323a4d6400367 Mon Sep 17 00:00:00 2001 From: mei23 Date: Thu, 18 Apr 2019 21:00:59 +0900 Subject: [PATCH 09/15] =?UTF-8?q?=E3=83=AF=E3=83=BC=E3=83=89=E3=83=9F?= =?UTF-8?q?=E3=83=A5=E3=83=BC=E3=83=88=E3=81=8CCW=E3=81=AB=E5=8A=B9?= =?UTF-8?q?=E3=81=8F=E3=82=88=E3=81=86=E3=81=AB,=20=E5=A4=A7=E6=96=87?= =?UTF-8?q?=E5=AD=97=E5=B0=8F=E6=96=87=E5=AD=97=E3=82=92=E5=8C=BA=E5=88=A5?= =?UTF-8?q?=E3=81=97=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/client/app/common/scripts/should-mute-note.ts | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/client/app/common/scripts/should-mute-note.ts b/src/client/app/common/scripts/should-mute-note.ts index c5f1898942f0..9bb09150817c 100644 --- a/src/client/app/common/scripts/should-mute-note.ts +++ b/src/client/app/common/scripts/should-mute-note.ts @@ -1,3 +1,5 @@ +import { INote } from '../../../../models/note'; + export default function(me, settings, note) { const isMyNote = me && (note.userId == me.id); const isPureRenote = note.renoteId != null && note.text == null && note.fileIds.length == 0 && note.poll == null; @@ -5,15 +7,18 @@ export default function(me, settings, note) { const includesMutedWords = (text: string) => text ? settings.mutedWords.some(q => q.length > 0 && !q.some(word => - word.startsWith('/') && word.endsWith('/') ? !(new RegExp(word.substr(1, word.length - 2)).test(text)) : !text.includes(word))) + word.startsWith('/') && word.endsWith('/') ? !(new RegExp(word.substr(1, word.length - 2), 'i').test(text)) : !text.toLowerCase().includes(word.toLowerCase()))) : false; + const includesMutedWordsInNote = (note: INote) => + (note.text && includesMutedWords(note.text)) || (note.cw && includesMutedWords(note.cw)); + return ( - (!isMyNote && note.reply && includesMutedWords(note.reply.text)) || - (!isMyNote && note.renote && includesMutedWords(note.renote.text)) || + (!isMyNote && note.reply && includesMutedWordsInNote(note.reply)) || + (!isMyNote && note.renote && includesMutedWordsInNote(note.renote)) || (settings.showMyRenotes === false && isMyNote && isPureRenote) || (settings.showRenotedMyNotes === false && isPureRenote && note.renote.userId == me.id) || (settings.showLocalRenotes === false && isPureRenote && note.renote.user.host == null) || - (!isMyNote && includesMutedWords(note.text)) + (!isMyNote && includesMutedWordsInNote(note)) ); } From d39511a63e1b2956d38a20e99f7e78fb72f48f8f Mon Sep 17 00:00:00 2001 From: mei23 Date: Thu, 18 Apr 2019 21:41:24 +0900 Subject: [PATCH 10/15] =?UTF-8?q?=E3=83=AA=E3=83=97=E3=83=A9=E3=82=A4?= =?UTF-8?q?=E3=81=AE=E5=8C=BA=E5=88=A5=E3=82=92=E3=81=A4=E3=81=8D=E3=82=84?= =?UTF-8?q?=E3=81=99=E3=81=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/client/app/desktop/views/components/note.sub.vue | 2 +- src/client/app/mobile/views/components/note.sub.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/app/desktop/views/components/note.sub.vue b/src/client/app/desktop/views/components/note.sub.vue index eb7e24e233c9..74db439748f3 100644 --- a/src/client/app/desktop/views/components/note.sub.vue +++ b/src/client/app/desktop/views/components/note.sub.vue @@ -52,7 +52,7 @@ export default Vue.extend({ display flex padding 16px 32px font-size 0.9em - background var(--subNoteBg) + background linear-gradient(to bottom, var(--face), var(--subNoteBg) 10%, var(--subNoteBg) 90%, var(--face) 100%) &.mini padding 16px diff --git a/src/client/app/mobile/views/components/note.sub.vue b/src/client/app/mobile/views/components/note.sub.vue index 9868652e4aaf..9a7bfcd637f2 100644 --- a/src/client/app/mobile/views/components/note.sub.vue +++ b/src/client/app/mobile/views/components/note.sub.vue @@ -51,7 +51,7 @@ export default Vue.extend({ display flex padding 16px font-size 10px - background var(--subNoteBg) + background linear-gradient(to bottom, var(--face), var(--subNoteBg) 10%, var(--subNoteBg) 90%, var(--face) 100%) &:not(.mini) From 874231a5a5208bb44f9512849667c35e58a980ea Mon Sep 17 00:00:00 2001 From: mei23 Date: Thu, 18 Apr 2019 22:17:25 +0900 Subject: [PATCH 11/15] 10.100.0-m190418221715 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index aff2bc839355..d90619c258e7 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "misskey", "author": "syuilo ", - "version": "10.100.0-m190417060209", + "version": "10.100.0-m190418221715", "codename": "nighthike", "repository": { "type": "git", From fa0ce408bf0ecc7688a247f18b10b2ddc331a3f0 Mon Sep 17 00:00:00 2001 From: mei23 Date: Thu, 18 Apr 2019 22:18:13 +0900 Subject: [PATCH 12/15] =?UTF-8?q?newver=E3=82=B3=E3=83=9E=E3=83=B3?= =?UTF-8?q?=E3=83=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- newver | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/newver b/newver index 0cc841b62bc5..f0233bc0c088 100755 --- a/newver +++ b/newver @@ -20,7 +20,11 @@ for my $line (@lines) { $newver = "$2-$postfix"; $line = "$1$2-$postfix$4\n"; - print "new : $line"; + print "new: $line\n"; + + print "git add package.json && git commit -m $newver\n"; + print "git tag -a $newver -m $newver\n"; + print "\n"; } } From 977b35df8a30991ded1c1182875d55eeb129aa75 Mon Sep 17 00:00:00 2001 From: tamaina Date: Thu, 18 Apr 2019 21:33:24 +0900 Subject: [PATCH 13/15] Improve user lists index syuilo#4605 --- locales/ja-JP.yml | 7 +- .../common/views/components/user-lists.vue | 95 +++++++++++++++++++ .../views/components/ui.header.account.vue | 10 +- .../desktop/views/components/ui.sidebar.vue | 5 +- .../views/components/user-lists-window.vue | 75 +++------------ .../app/mobile/views/pages/user-lists.vue | 36 ++----- 6 files changed, 123 insertions(+), 105 deletions(-) create mode 100644 src/client/app/common/views/components/user-lists.vue diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index d8930104b4c1..899f42795af6 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -735,6 +735,10 @@ common/views/components/user-list-editor.vue: delete-are-you-sure: "リスト「$1」を削除しますか？" deleted: "削除しました" +common/views/components/user-lists.vue: + create-list: "リストを作成" + list-name: "リスト名" + common/views/widgets/broadcast.vue: fetching: "確認中" no-broadcasts: "お知らせはありません" @@ -1142,8 +1146,6 @@ desktop/views/components/received-follow-requests-window.vue: desktop/views/components/user-lists-window.vue: title: "リスト" - create-list: "リストを作成" - list-name: "リスト名" desktop/views/components/user-preview.vue: notes: "投稿" @@ -1673,7 +1675,6 @@ mobile/views/components/ui.nav.vue: mobile/views/pages/user-lists.vue: title: "リスト" - enter-list-name: "リスト名を入力してください" mobile/views/pages/signup.vue: lets-start: "📦 始めましょう" diff --git a/src/client/app/common/views/components/user-lists.vue b/src/client/app/common/views/components/user-lists.vue new file mode 100644 index 000000000000..00b11970cdf2 --- /dev/null +++ b/src/client/app/common/views/components/user-lists.vue @@ -0,0 +1,95 @@ + + + + + diff --git a/src/client/app/desktop/views/components/ui.header.account.vue b/src/client/app/desktop/views/components/ui.header.account.vue index effd0ef0fdef..7f9decfdcd93 100644 --- a/src/client/app/desktop/views/components/ui.header.account.vue +++ b/src/client/app/desktop/views/components/ui.header.account.vue @@ -90,9 +90,8 @@ import Vue from 'vue'; import i18n from '../../../i18n'; import MkUserListsWindow from './user-lists-window.vue'; -import MkUserListWindow from './user-list-window.vue'; import MkFollowRequestsWindow from './received-follow-requests-window.vue'; -import MkSettingsWindow from './settings-window.vue'; +// import MkSettingsWindow from './settings-window.vue'; import MkDriveWindow from './drive-window.vue'; import contains from '../../../common/scripts/contains'; import { faHome, faColumns } from '@fortawesome/free-solid-svg-icons'; @@ -143,12 +142,7 @@ export default Vue.extend({ }, list() { this.close(); - const w = this.$root.new(MkUserListsWindow); - w.$once('choosen', list => { - this.$root.new(MkUserListWindow, { - list - }); - }); + this.$root.new(MkUserListsWindow); }, followRequests() { this.close(); diff --git a/src/client/app/desktop/views/components/ui.sidebar.vue b/src/client/app/desktop/views/components/ui.sidebar.vue index cb0e059c11ed..1c01f127b9b0 100644 --- a/src/client/app/desktop/views/components/ui.sidebar.vue +++ b/src/client/app/desktop/views/components/ui.sidebar.vue @@ -148,10 +148,7 @@ export default Vue.extend({ }, list() { - const w = this.$root.new(MkUserListsWindow); - w.$once('choosen', list => { - this.$router.push(`i/lists/${ list.id }`); - }); + this.$root.new(MkUserListsWindow); }, followRequests() { diff --git a/src/client/app/desktop/views/components/user-lists-window.vue b/src/client/app/desktop/views/components/user-lists-window.vue index 4f0af4a278bc..afea01d4a150 100644 --- a/src/client/app/desktop/views/components/user-lists-window.vue +++ b/src/client/app/desktop/views/components/user-lists-window.vue @@ -1,85 +1,36 @@ - diff --git a/src/client/app/mobile/views/pages/user-lists.vue b/src/client/app/mobile/views/pages/user-lists.vue index fd129339fd85..a3e9bd78ba73 100644 --- a/src/client/app/mobile/views/pages/user-lists.vue +++ b/src/client/app/mobile/views/pages/user-lists.vue @@ -1,20 +1,15 @@