From 76bae4b28d53b1105713329c9d856a7c0742984b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?=
<root@acid-chicken.com>
Date: Tue, 11 Jun 2019 16:57:52 +0900
Subject: [PATCH 1/6] Update README.md [AUTOGEN] (#5044)
---
README.md | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/README.md b/README.md
index 8d7ca4b54..a2d90a3e1 100644
--- a/README.md
+++ b/README.md
@@ -124,7 +124,6 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
<table><tr>
<td><img src="https://c8.patreon.com/2/200/16869916" alt="見当かなみ" width="100"></td>
<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/18899730/6a22797f68254034a854d69ea2445fc8/1.png?token-time=2145916800&token-hash=b_uj57yxo5VzkSOUS7oXE_762dyOTB_oxzbO6lFNG3k%3D" alt="YuzuRyo61" width="100"></td>
-<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/12021162/963128bb8d14476dbd8407943db8f31a/1.png?token-time=2145916800&token-hash=FMV7cPKBD1TU2WTbl1jg6AcdKSvTb2BSFcDhgc-EO8w%3D" alt="gutfuckllc" width="100"></td>
<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/11357794/923ce94cd8c44ba788ee931907881839/1.png?token-time=2145916800&token-hash=9nEQje_eMvUjq9a7L3uBqW-MQbS-rRMaMgd7UYVoFNM%3D" alt="mydarkstar" width="100"></td>
<td><img src="https://c8.patreon.com/2/200/12718187" alt="Peter G." width="100"></td>
<td><img src="https://c10.patreonusercontent.com/3/eyJ3IjoyMDB9/patreon-media/p/user/13039004/509d0c412eb14ae08d6a812a3054f7d6/1.jpe?token-time=2145916800&token-hash=UQRWf01TwHDV4Cls1K0YAOAjM29ssif7hLVq0ESQ0hs%3D" alt="nemu" width="100"></td>
@@ -135,7 +134,6 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
</tr><tr>
<td><a href="https://www.patreon.com/user?u=16869916">見当かなみ</a></td>
<td><a href="https://www.patreon.com/Yuzulia">YuzuRyo61</a></td>
-<td><a href="https://www.patreon.com/gutfuckllc">gutfuckllc</a></td>
<td><a href="https://www.patreon.com/mydarkstar">mydarkstar</a></td>
<td><a href="https://www.patreon.com/user?u=12718187">Peter G.</a></td>
<td><a href="https://www.patreon.com/user?u=13039004">nemu</a></td>
@@ -179,7 +177,7 @@ Please see the [Contribution Guide](./CONTRIBUTING.md).
<td><a href="https://www.patreon.com/user?u=12531784">Takashi Shibuya</a></td>
</tr></table>
-**Last updated:** Tue, 04 Jun 2019 04:21:06 UTC
+**Last updated:** Tue, 11 Jun 2019 01:46:06 UTC
<!-- PATREON_END -->
:four_leaf_clover: Copyright
From 4501f7478a4be3458bcaa8b87b34131e428d705c Mon Sep 17 00:00:00 2001
From: Satsuki Yanagi <17376330+u1-liquid@users.noreply.github.com>
Date: Tue, 11 Jun 2019 20:49:08 +0900
Subject: [PATCH 2/6] =?UTF-8?q?=E8=A8=AD=E5=AE=9A=E3=81=A7PostgreSQL?=
=?UTF-8?q?=E3=81=AE=E3=82=AF=E3=82=A8=E3=83=AA=E3=83=BC=E7=B5=90=E6=9E=9C?=
=?UTF-8?q?=E3=81=AE=E3=82=AD=E3=83=A3=E3=83=83=E3=82=B7=E3=83=A5=E3=82=92?=
=?UTF-8?q?=E7=84=A1=E5=8A=B9=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86?=
=?UTF-8?q?=E3=81=AB=20(#5046)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.config/example.yml | 3 +++
src/config/types.ts | 1 +
src/db/postgre.ts | 4 ++--
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/.config/example.yml b/.config/example.yml
index 503471d93..8534d3e1e 100644
--- a/.config/example.yml
+++ b/.config/example.yml
@@ -62,6 +62,9 @@ db:
user: example-misskey-user
pass: example-misskey-pass
+ # Whether disable Caching queries
+ #disableCache: true
+
# Extra Connection options
#extra:
# ssl: true
diff --git a/src/config/types.ts b/src/config/types.ts
index c35bc6357..be3575d28 100644
--- a/src/config/types.ts
+++ b/src/config/types.ts
@@ -14,6 +14,7 @@ export type Source = {
db: string;
user: string;
pass: string;
+ disableCache?: boolean;
extra?: { [x: string]: string };
};
redis: {
diff --git a/src/db/postgre.ts b/src/db/postgre.ts
index f0f1e7eec..c91cd8e1d 100644
--- a/src/db/postgre.ts
+++ b/src/db/postgre.ts
@@ -96,7 +96,7 @@ export function initDb(justBorrow = false, sync = false, log = false) {
extra: config.db.extra,
synchronize: process.env.NODE_ENV === 'test' || sync,
dropSchema: process.env.NODE_ENV === 'test' && !justBorrow,
- cache: {
+ cache: !config.db.disableCache ? {
type: 'redis',
options: {
host: config.redis.host,
@@ -107,7 +107,7 @@ export function initDb(justBorrow = false, sync = false, log = false) {
db: config.redis.db || 0
}
}
- },
+ } : false,
logging: log,
logger: log ? new MyCustomLogger() : undefined,
entities: [
From 680c67239893086347797b9906aaaa398880655c Mon Sep 17 00:00:00 2001
From: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Wed, 12 Jun 2019 13:47:58 +0900
Subject: [PATCH 3/6] Fix: #5035 (#5048)
---
src/client/app/store.ts | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/client/app/store.ts b/src/client/app/store.ts
index f229a2b7b..6f545eb09 100644
--- a/src/client/app/store.ts
+++ b/src/client/app/store.ts
@@ -33,6 +33,7 @@ const defaultSettings = {
mutedWords: [],
gamesReversiShowBoardLabels: false,
gamesReversiUseAvatarStones: true,
+ disableAnimatedMfm: false,
};
const defaultDeviceSettings = {
From d9edc41bd7b54b5e9e11bdaf657041a705a8bc6c Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 13 Jun 2019 15:30:51 +0900
Subject: [PATCH 4/6] Add indexes
---
src/models/entities/drive-file.ts | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/models/entities/drive-file.ts b/src/models/entities/drive-file.ts
index 130af39ed..319bdc82c 100644
--- a/src/models/entities/drive-file.ts
+++ b/src/models/entities/drive-file.ts
@@ -72,6 +72,7 @@ export class DriveFile {
})
public properties: Record<string, any>;
+ @Index()
@Column('boolean')
public storedInternal: boolean;
@@ -146,6 +147,7 @@ export class DriveFile {
/**
* 外部の(信頼されていない)URLへの直リンクか否か
*/
+ @Index()
@Column('boolean', {
default: false,
comment: 'Whether the DriveFile is direct link to remote server.'
From 13663d9515c2f1c31cf3c3115a3a0e7f7deaffdb Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 13 Jun 2019 18:15:35 +0900
Subject: [PATCH 5/6] Fix bug
---
src/client/app/common/scripts/paging.ts | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/client/app/common/scripts/paging.ts b/src/client/app/common/scripts/paging.ts
index c13a607e6..cf36a692d 100644
--- a/src/client/app/common/scripts/paging.ts
+++ b/src/client/app/common/scripts/paging.ts
@@ -5,6 +5,7 @@ export default (opts) => ({
return {
items: [],
queue: [],
+ offset: 0,
fetching: true,
moreFetching: false,
inited: false,
@@ -80,6 +81,7 @@ export default (opts) => ({
this.items = x;
this.more = false;
}
+ this.offset = x.length;
this.inited = true;
this.fetching = false;
if (opts.onInited) opts.onInited(this);
@@ -96,7 +98,11 @@ export default (opts) => ({
if (params && params.then) params = await params;
await this.$root.api(this.pagination.endpoint, {
limit: (this.pagination.limit || 10) + 1,
- untilId: this.items[this.items.length - 1].id,
+ ...(this.pagination.endpoint === 'notes/search' ? {
+ offset: this.offset,
+ } : {
+ untilId: this.items[this.items.length - 1].id,
+ }),
...params
}).then(x => {
if (x.length == (this.pagination.limit || 10) + 1) {
@@ -107,6 +113,7 @@ export default (opts) => ({
this.items = this.items.concat(x);
this.more = false;
}
+ this.offset += x.length;
this.moreFetching = false;
}, e => {
this.moreFetching = false;
From 152f14b434f8777ce8681f53de095ad679d65276 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Thu, 13 Jun 2019 18:22:31 +0900
Subject: [PATCH 6/6] 11.20.4
---
CHANGELOG.md | 8 ++++++++
package.json | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e8511132b..7e5f9a793 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,14 @@ npm i -g ts-node
npm run migrate
```
+11.20.4 (2019/06/13)
+--------------------
+### 🐛Fixes
+* 検索結果がループする問題を修正
+* 設定でPostgreSQLのクエリー結果のキャッシュを無効できるように
+* 「投稿内の動きのあるテキストを無効にする」だけ反応しない問題を修正
+* 特定の操作のデータベースのパフォーマンス調整
+
11.20.3 (2019/06/10)
--------------------
### 🐛Fixes
diff --git a/package.json b/package.json
index b779b4ec9..dd54c42fe 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "misskey",
"author": "syuilo <i@syuilo.com>",
- "version": "11.20.3",
+ "version": "11.20.4",
"codename": "daybreak",
"repository": {
"type": "git",