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

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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