graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-12-24 02:43:08 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of aya.github:syuilo/misskey

Browse source
This commit is contained in:
Aya Morisawa 2018-07-14 00:05:56 +09:00
commit 35dd6a5ac3
3 changed files with 23 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
locales/ja.yml
View file

@ -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:

24
src/client/app/common/views/components/messaging-room.message.vue
View file

@ -3,6 +3,7 @@
<mk-avatar class="avatar" :user="message.user" target="_blank"/>
<div class="content">
<div class="balloon" :data-no-text="message.text == null">
<p class="read" v-if="isMe && message.isRead">%i18n:@is-read%</p>
<button class="delete-button" v-if="isMe" title="%i18n:common.delete%">
<img src="/assets/desktop/messaging/delete.png" alt="Delete"/>
</button>
@ -22,7 +23,6 @@
<div></div>
<mk-url-preview v-for="url in urls" :url="url" :key="url"/>
<footer>
<span class="read" v-if="isMe && message.isRead">%i18n:@is-read%</span>
<mk-time :time="message.createdAt"/>
<template v-if="message.is_edited">%fa:pencil-alt%</template>
</footer>
@ -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

8
src/server/api/call.ts
View file

@ -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');
}
@ -21,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');