From 2db01f3d5caacfb8d3c558fb6aaaa2ebed843ea7 Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 13 Jul 2018 23:39:20 +0900 Subject: [PATCH 1/4] Clean up --- src/server/api/call.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/server/api/call.ts b/src/server/api/call.ts index 255ae61ad6..73931ac7da 100644 --- a/src/server/api/call.ts +++ b/src/server/api/call.ts @@ -9,10 +9,6 @@ export default (endpoint: string | Endpoint, user: IUser, app: IApp, data: any, const epName = typeof endpoint === 'string' ? endpoint : endpoint.name; const ep = endpoints.find(e => e.name === epName); - if (ep.name.includes('.')) { - return rej('INVALID_ENDPOINT'); - } - if (ep.secure && !isSecure) { return rej('ACCESS_DENIED'); } From 2bc572b4cc270aa80cca3484e91a4bcc6d4e7738 Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 13 Jul 2018 23:44:45 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=E3=82=A2=E3=82=AB=E3=82=A6=E3=83=B3?= =?UTF-8?q?=E3=83=88=E3=82=92=E5=87=8D=E7=B5=90=E3=81=95=E3=82=8C=E3=81=A6?= =?UTF-8?q?=E3=81=84=E3=81=9F=E3=82=89API=E3=81=AB=E3=82=A2=E3=82=AF?= =?UTF-8?q?=E3=82=BB=E3=82=B9=E3=81=A7=E3=81=8D=E3=81=AA=E3=81=84=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/api/call.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/server/api/call.ts b/src/server/api/call.ts index 73931ac7da..96c218b371 100644 --- a/src/server/api/call.ts +++ b/src/server/api/call.ts @@ -17,6 +17,10 @@ export default (endpoint: string | Endpoint, user: IUser, app: IApp, data: any, return rej('SIGNIN_REQUIRED'); } + if (ep.withCredential && user.isSuspended) { + return rej('YOUR_ACCOUNT_HAS_BEEN_SUSPENDED'); + } + if (app && ep.kind) { if (!app.permission.some(p => p === ep.kind)) { return rej('PERMISSION_DENIED'); From e427c12ac2e3934e133544779e3e0edf5f3dde65 Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 13 Jul 2018 23:56:24 +0900 Subject: [PATCH 3/4] Hybrid --> Community --- locales/ja.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/locales/ja.yml b/locales/ja.yml index 03a2cceee7..c35c874769 100644 --- a/locales/ja.yml +++ b/locales/ja.yml @@ -93,7 +93,7 @@ common: widgets: "ウィジェット" home: "ホーム" local: "ローカル" - hybrid: "ハイブリッド" + hybrid: "コミュニティ" global: "グローバル" notifications: "通知" list: "リスト" @@ -643,7 +643,7 @@ desktop/views/components/taskmanager.vue: desktop/views/components/timeline.vue: home: "ホーム" local: "ローカル" - hybrid: "ハイブリッド" + hybrid: "コミュニティ" global: "グローバル" list: "リスト" @@ -967,7 +967,7 @@ mobile/views/pages/following.vue: mobile/views/pages/home.vue: home: "ホーム" local: "ローカル" - hybrid: "ハイブリッド" + hybrid: "コミュニティ" global: "グローバル" mobile/views/pages/messaging.vue: From f2959ada8585f73de55aa02581aa91aea91a16c1 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 14 Jul 2018 00:00:30 +0900 Subject: [PATCH 4/4] Revert "Update messaging-room.message.vue" This reverts commit 7b3f52505e2566fbf0b1bd824d6ea71c15cacaff. --- .../components/messaging-room.message.vue | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/src/client/app/common/views/components/messaging-room.message.vue b/src/client/app/common/views/components/messaging-room.message.vue index e39becaca4..f33173da6f 100644 --- a/src/client/app/common/views/components/messaging-room.message.vue +++ b/src/client/app/common/views/components/messaging-room.message.vue @@ -3,6 +3,7 @@
+

%i18n:@is-read%

@@ -22,7 +23,6 @@
@@ -120,6 +120,17 @@ root(isDark) height 16px cursor pointer + > .read + user-select none + display block + position absolute + z-index 1 + bottom -4px + left -12px + margin 0 + color isDark ? rgba(#fff, 0.5) : rgba(#000, 0.5) + font-size 11px + > .content > .is-deleted @@ -175,14 +186,11 @@ root(isDark) margin 8px 0 > footer - display flex + display block margin 2px 0 0 0 - font-size 11px + font-size 10px color isDark ? rgba(#fff, 0.4) : rgba(#000, 0.4) - > .read - margin 0 8px 0 0 - > [data-fa] margin-left 4px @@ -214,7 +222,7 @@ root(isDark) color #fff > footer - justify-content left + text-align left &[data-is-me] > .avatar @@ -248,7 +256,7 @@ root(isDark) color #fff !important > footer - justify-content right + text-align right &[data-is-deleted] > .baloon