mirror/cherrypick
1
1
Fork 0
mirror of https://github.com/kokonect-link/cherrypick synced 2024-11-01 07:35:57 +09:00
Code

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

Browse Source
This commit is contained in:
Aya Morisawa 2018-07-14 00:39:50 +09:00
commit 97f75cea52
13 changed files with 44 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
locales/ca.yml
View File

@ -85,6 +85,7 @@ common:
widgets: "ウィジェット"
home: "ホーム"
local: "ローカル"
hybrid: "コミュニティ"
global: "グローバル"
notifications: "通知"
list: "リスト"
@ -556,6 +557,7 @@ desktop/views/components/taskmanager.vue:
desktop/views/components/timeline.vue:
home: "ホーム"
local: "ローカル"
hybrid: "コミュニティ"
global: "グローバル"
list: "リスト"
desktop/views/components/ui.header.vue:
@ -818,6 +820,7 @@ mobile/views/pages/following.vue:
mobile/views/pages/home.vue:
home: "ホーム"
local: "ローカル"
hybrid: "コミュニティ"
global: "グローバル"
mobile/views/pages/messaging.vue:
messaging: "メッセージ"

3
locales/de.yml
View File

@ -85,6 +85,7 @@ common:
widgets: "Widget hinzufügen:"
home: "Startseite"
local: "Lokal"
hybrid: "コミュニティ"
global: "Global"
notifications: "Mitteilungen"
list: "Listen"
@ -556,6 +557,7 @@ desktop/views/components/taskmanager.vue:
desktop/views/components/timeline.vue:
home: "Home"
local: "Lokal"
hybrid: "コミュニティ"
global: "Global"
list: "Listen"
desktop/views/components/ui.header.vue:
@ -818,6 +820,7 @@ mobile/views/pages/following.vue:
mobile/views/pages/home.vue:
home: "ホーム"
local: "ローカル"
hybrid: "コミュニティ"
global: "グローバル"
mobile/views/pages/messaging.vue:
messaging: "メッセージ"

5
locales/en.yml
View File

@ -85,6 +85,7 @@ common:
widgets: "Widgets"
home: "Home"
local: "Local"
hybrid: "Community"
global: "Global"
notifications: "Notifications"
list: "Lists"
@ -556,6 +557,7 @@ desktop/views/components/taskmanager.vue:
desktop/views/components/timeline.vue:
home: "Home"
local: "Local"
hybrid: "Community"
global: "Global"
list: "Lists"
desktop/views/components/ui.header.vue:
@ -566,7 +568,7 @@ desktop/views/components/ui.header.account.vue:
favorites: "Favorites"
lists: "Lists"
follow-requests: "Follow requests"
customize: "Customization of the home layout"
customize: "Customize home layout"
settings: "Settings"
signout: "Sign out"
dark: "Submerge in dark"
@ -818,6 +820,7 @@ mobile/views/pages/following.vue:
mobile/views/pages/home.vue:
home: "Home"
local: "Local"
hybrid: "Community"
global: "Global"
mobile/views/pages/messaging.vue:
messaging: "Messaging"

3
locales/es.yml
View File

@ -85,6 +85,7 @@ common:
widgets: "Accesorios"
home: "Inicio"
local: "Local"
hybrid: "コミュニティ"
global: "Global"
notifications: "Notificaciones"
list: "Listado"
@ -556,6 +557,7 @@ desktop/views/components/taskmanager.vue:
desktop/views/components/timeline.vue:
home: "ホーム"
local: "ローカル"
hybrid: "コミュニティ"
global: "グローバル"
list: "リスト"
desktop/views/components/ui.header.vue:
@ -818,6 +820,7 @@ mobile/views/pages/following.vue:
mobile/views/pages/home.vue:
home: "ホーム"
local: "ローカル"
hybrid: "コミュニティ"
global: "グローバル"
mobile/views/pages/messaging.vue:
messaging: "メッセージ"

3
locales/fr.yml
View File

@ -85,6 +85,7 @@ common:
widgets: "Widgets"
home: "Accueil"
local: "Local"
hybrid: "コミュニティ"
global: "Global"
notifications: "Notifications"
list: "Liste"
@ -556,6 +557,7 @@ desktop/views/components/taskmanager.vue:
desktop/views/components/timeline.vue:
home: "Accueil"
local: "Local"
hybrid: "コミュニティ"
global: "Global"
list: "Listes"
desktop/views/components/ui.header.vue:
@ -818,6 +820,7 @@ mobile/views/pages/following.vue:
mobile/views/pages/home.vue:
home: "Accueil"
local: "Local"
hybrid: "コミュニティ"
global: "Global"
mobile/views/pages/messaging.vue:
messaging: "Messagerie"

3
locales/it.yml
View File

@ -85,6 +85,7 @@ common:
widgets: "ウィジェット"
home: "ホーム"
local: "ローカル"
hybrid: "コミュニティ"
global: "グローバル"
notifications: "通知"
list: "リスト"
@ -556,6 +557,7 @@ desktop/views/components/taskmanager.vue:
desktop/views/components/timeline.vue:
home: "ホーム"
local: "ローカル"
hybrid: "コミュニティ"
global: "グローバル"
list: "リスト"
desktop/views/components/ui.header.vue:
@ -818,6 +820,7 @@ mobile/views/pages/following.vue:
mobile/views/pages/home.vue:
home: "ホーム"
local: "ローカル"
hybrid: "コミュニティ"
global: "グローバル"
mobile/views/pages/messaging.vue:
messaging: "メッセージ"

3
locales/ko.yml
View File

@ -85,6 +85,7 @@ common:
widgets: "ウィジェット"
home: "ホーム"
local: "ローカル"
hybrid: "コミュニティ"
global: "グローバル"
notifications: "通知"
list: "リスト"
@ -556,6 +557,7 @@ desktop/views/components/taskmanager.vue:
desktop/views/components/timeline.vue:
home: "ホーム"
local: "ローカル"
hybrid: "コミュニティ"
global: "グローバル"
list: "リスト"
desktop/views/components/ui.header.vue:
@ -818,6 +820,7 @@ mobile/views/pages/following.vue:
mobile/views/pages/home.vue:
home: "ホーム"
local: "ローカル"
hybrid: "コミュニティ"
global: "グローバル"
mobile/views/pages/messaging.vue:
messaging: "メッセージ"

3
locales/pl.yml
View File

@ -85,6 +85,7 @@ common:
widgets: "Widżety"
home: "Strona główna"
local: "Lokalne"
hybrid: "コミュニティ"
global: "Globalne"
notifications: "Powiadomienia"
list: "Listy"
@ -556,6 +557,7 @@ desktop/views/components/taskmanager.vue:
desktop/views/components/timeline.vue:
home: "Strona główna"
local: "Lokalne"
hybrid: "コミュニティ"
global: "Globalne"
list: "Listy"
desktop/views/components/ui.header.vue:
@ -818,6 +820,7 @@ mobile/views/pages/following.vue:
mobile/views/pages/home.vue:
home: "Strona główna"
local: "Lokalne"
hybrid: "コミュニティ"
global: "Globalne"
mobile/views/pages/messaging.vue:
messaging: "Wiadomości"

3
locales/pt.yml
View File

@ -85,6 +85,7 @@ common:
widgets: "ウィジェット"
home: "ホーム"
local: "ローカル"
hybrid: "コミュニティ"
global: "グローバル"
notifications: "通知"
list: "リスト"
@ -556,6 +557,7 @@ desktop/views/components/taskmanager.vue:
desktop/views/components/timeline.vue:
home: "ホーム"
local: "ローカル"
hybrid: "コミュニティ"
global: "グローバル"
list: "リスト"
desktop/views/components/ui.header.vue:
@ -818,6 +820,7 @@ mobile/views/pages/following.vue:
mobile/views/pages/home.vue:
home: "ホーム"
local: "ローカル"
hybrid: "コミュニティ"
global: "グローバル"
mobile/views/pages/messaging.vue:
messaging: "メッセージ"

3
locales/ru.yml
View File

@ -85,6 +85,7 @@ common:
widgets: "ウィジェット"
home: "ホーム"
local: "ローカル"
hybrid: "コミュニティ"
global: "グローバル"
notifications: "通知"
list: "リスト"
@ -556,6 +557,7 @@ desktop/views/components/taskmanager.vue:
desktop/views/components/timeline.vue:
home: "ホーム"
local: "ローカル"
hybrid: "コミュニティ"
global: "グローバル"
list: "リスト"
desktop/views/components/ui.header.vue:
@ -818,6 +820,7 @@ mobile/views/pages/following.vue:
mobile/views/pages/home.vue:
home: "ホーム"
local: "ローカル"
hybrid: "コミュニティ"
global: "グローバル"
mobile/views/pages/messaging.vue:
messaging: "メッセージ"

3
locales/zh.yml
View File

@ -85,6 +85,7 @@ common:
widgets: "ウィジェット"
home: "ホーム"
local: "ローカル"
hybrid: "コミュニティ"
global: "グローバル"
notifications: "通知"
list: "リスト"
@ -556,6 +557,7 @@ desktop/views/components/taskmanager.vue:
desktop/views/components/timeline.vue:
home: "ホーム"
local: "ローカル"
hybrid: "コミュニティ"
global: "グローバル"
list: "リスト"
desktop/views/components/ui.header.vue:
@ -818,6 +820,7 @@ mobile/views/pages/following.vue:
mobile/views/pages/home.vue:
home: "ホーム"
local: "ローカル"
hybrid: "コミュニティ"
global: "グローバル"
mobile/views/pages/messaging.vue:
messaging: "メッセージ"

3
src/server/api/endpoints/notes/hybrid-timeline.ts
View File

@ -124,6 +124,9 @@ export default async (params: any, user: ILocalUser) => {
// フォローしている人の投稿
$or: followQuery
}, {
// public only
visibility: 'public',
// local
'_user.host': null
}],

13
src/services/note/create.ts
View File

@ -269,6 +269,8 @@ export default async (user: IUser, data: {
// Publish note to local and hybrid timeline stream
if (note.visibility != 'home') {
publishLocalTimelineStream(noteObj);
}
if (note.visibility == 'public') {
publishHybridTimelineStream(null, noteObj);
}
}
@ -281,9 +283,11 @@ export default async (user: IUser, data: {
if (note.visibility == 'specified') {
data.visibleUsers.forEach(async u => {
stream(u._id, 'note', await pack(note, u, {
const n = await pack(note, u, {
detail: true
}));
});
stream(u._id, 'note', n);
publishHybridTimelineStream(u._id, n);
});
}
@ -304,10 +308,7 @@ export default async (user: IUser, data: {
// Publish event to followers stream
stream(following.followerId, 'note', noteObj);
if (isRemoteUser(user)) {
publishHybridTimelineStream(following.followerId, noteObj);
}
publishHybridTimelineStream(following.followerId, noteObj);
} else {
//#region AP配送
// フォロワーがリモートユーザーかつ投稿者がローカルユーザーなら投稿を配信