Merge pull request #1550 from syuilo/user-list

User list
This commit is contained in:
syuilo 2018-04-26 16:10:25 +09:00 committed by GitHub
commit 5d4b884528
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
132 changed files with 2237 additions and 1049 deletions

View File

@ -14,6 +14,7 @@
"vue/no-unused-vars": false, "vue/no-unused-vars": false,
"vue/attributes-order": false, "vue/attributes-order": false,
"vue/require-prop-types": false, "vue/require-prop-types": false,
"vue/require-default-prop": false,
"no-console": 0, "no-console": 0,
"no-unused-vars": 0, "no-unused-vars": 0,
"no-empty": 0 "no-empty": 0

View File

@ -370,6 +370,7 @@ desktop/views/components/ui.header.account.vue:
profile: "Your profile" profile: "Your profile"
drive: "Drive" drive: "Drive"
favorites: "Favorites" favorites: "Favorites"
lists: "Lists"
customize: "Customize" customize: "Customize"
settings: "Settings" settings: "Settings"
signout: "Sign out" signout: "Sign out"

View File

@ -370,6 +370,7 @@ desktop/views/components/ui.header.account.vue:
profile: "Votre profil" profile: "Votre profil"
drive: "Drive" drive: "Drive"
favorites: "Favorites" favorites: "Favorites"
lists: "リスト"
customize: "Modifications" customize: "Modifications"
settings: "Réglages" settings: "Réglages"
signout: "Déconnexion" signout: "Déconnexion"

View File

@ -370,6 +370,7 @@ desktop/views/components/ui.header.account.vue:
profile: "プロフィール" profile: "プロフィール"
drive: "ドライブ" drive: "ドライブ"
favorites: "お気に入り" favorites: "お気に入り"
lists: "リスト"
customize: "カスタマイズ" customize: "カスタマイズ"
settings: "設定" settings: "設定"
signout: "サインアウト" signout: "サインアウト"

View File

@ -88,7 +88,7 @@
"autwh": "0.1.0", "autwh": "0.1.0",
"bcryptjs": "2.4.3", "bcryptjs": "2.4.3",
"bootstrap-vue": "2.0.0-rc.6", "bootstrap-vue": "2.0.0-rc.6",
"cafy": "3.2.1", "cafy": "6.0.0",
"chai": "4.1.2", "chai": "4.1.2",
"chai-http": "4.0.0", "chai-http": "4.0.0",
"chalk": "2.4.0", "chalk": "2.4.0",
@ -144,6 +144,7 @@
"koa-multer": "1.0.2", "koa-multer": "1.0.2",
"koa-router": "7.4.0", "koa-router": "7.4.0",
"koa-send": "4.1.3", "koa-send": "4.1.3",
"koa-slow": "^2.1.0",
"kue": "0.11.6", "kue": "0.11.6",
"license-checker": "18.0.0", "license-checker": "18.0.0",
"loader-utils": "1.1.0", "loader-utils": "1.1.0",

29
src/cafy-id.ts Normal file
View File

@ -0,0 +1,29 @@
import * as mongo from 'mongodb';
import { Query } from 'cafy';
export const isAnId = x => mongo.ObjectID.isValid(x);
export const isNotAnId = x => !isAnId(x);
/**
* ID
*/
export default class ID extends Query<mongo.ObjectID> {
constructor(...args) {
super(...args);
this.transform = v => {
if (isAnId(v) && !mongo.ObjectID.prototype.isPrototypeOf(v)) {
return new mongo.ObjectID(v);
} else {
return v;
}
};
this.pushValidator(v => {
if (!mongo.ObjectID.prototype.isPrototypeOf(v) && isNotAnId(v)) {
return new Error('must-be-an-id');
}
return true;
});
}
}

View File

@ -88,6 +88,7 @@ export default class MiOS extends EventEmitter {
propsData: props propsData: props
}).$mount(); }).$mount();
document.body.appendChild(w.$el); document.body.appendChild(w.$el);
return w;
} }
/** /**

View File

@ -0,0 +1,17 @@
import Stream from './stream';
import MiOS from '../../mios';
export class UserListStream extends Stream {
constructor(os: MiOS, me, listId) {
super(os, 'user-list', {
i: me.token,
listId
});
(this as any).on('_connected_', () => {
this.send({
i: me.token
});
});
}
}

View File

@ -28,6 +28,7 @@ import MkUser from './views/pages/user/user.vue';
import MkFavorites from './views/pages/favorites.vue'; import MkFavorites from './views/pages/favorites.vue';
import MkSelectDrive from './views/pages/selectdrive.vue'; import MkSelectDrive from './views/pages/selectdrive.vue';
import MkDrive from './views/pages/drive.vue'; import MkDrive from './views/pages/drive.vue';
import MkUserList from './views/pages/user-list.vue';
import MkHomeCustomize from './views/pages/home-customize.vue'; import MkHomeCustomize from './views/pages/home-customize.vue';
import MkMessagingRoom from './views/pages/messaging-room.vue'; import MkMessagingRoom from './views/pages/messaging-room.vue';
import MkNote from './views/pages/note.vue'; import MkNote from './views/pages/note.vue';
@ -55,6 +56,7 @@ init(async (launch) => {
{ path: '/i/messaging/:user', component: MkMessagingRoom }, { path: '/i/messaging/:user', component: MkMessagingRoom },
{ path: '/i/drive', component: MkDrive }, { path: '/i/drive', component: MkDrive },
{ path: '/i/drive/folder/:folder', component: MkDrive }, { path: '/i/drive/folder/:folder', component: MkDrive },
{ path: '/i/lists/:list', component: MkUserList },
{ path: '/selectdrive', component: MkSelectDrive }, { path: '/selectdrive', component: MkSelectDrive },
{ path: '/search', component: MkSearch }, { path: '/search', component: MkSearch },
{ path: '/othello', component: MkOthello }, { path: '/othello', component: MkOthello },

View File

@ -19,6 +19,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
export default Vue.extend({ export default Vue.extend({
props: { props: {
user: { user: {
@ -30,6 +31,7 @@ export default Vue.extend({
default: 'compact' default: 'compact'
} }
}, },
data() { data() {
return { return {
wait: false, wait: false,
@ -37,6 +39,7 @@ export default Vue.extend({
connectionId: null connectionId: null
}; };
}, },
mounted() { mounted() {
this.connection = (this as any).os.stream.getConnection(); this.connection = (this as any).os.stream.getConnection();
this.connectionId = (this as any).os.stream.use(); this.connectionId = (this as any).os.stream.use();
@ -44,13 +47,14 @@ export default Vue.extend({
this.connection.on('follow', this.onFollow); this.connection.on('follow', this.onFollow);
this.connection.on('unfollow', this.onUnfollow); this.connection.on('unfollow', this.onUnfollow);
}, },
beforeDestroy() { beforeDestroy() {
this.connection.off('follow', this.onFollow); this.connection.off('follow', this.onFollow);
this.connection.off('unfollow', this.onUnfollow); this.connection.off('unfollow', this.onUnfollow);
(this as any).os.stream.dispose(this.connectionId); (this as any).os.stream.dispose(this.connectionId);
}, },
methods: {
methods: {
onFollow(user) { onFollow(user) {
if (user.id == this.user.id) { if (user.id == this.user.id) {
this.user.isFollowing = user.isFollowing; this.user.isFollowing = user.isFollowing;

View File

@ -28,6 +28,7 @@ import friendsMaker from './friends-maker.vue';
import followers from './followers.vue'; import followers from './followers.vue';
import following from './following.vue'; import following from './following.vue';
import usersList from './users-list.vue'; import usersList from './users-list.vue';
import userListTimeline from './user-list-timeline.vue';
import widgetContainer from './widget-container.vue'; import widgetContainer from './widget-container.vue';
Vue.component('mk-ui', ui); Vue.component('mk-ui', ui);
@ -58,4 +59,5 @@ Vue.component('mk-friends-maker', friendsMaker);
Vue.component('mk-followers', followers); Vue.component('mk-followers', followers);
Vue.component('mk-following', following); Vue.component('mk-following', following);
Vue.component('mk-users-list', usersList); Vue.component('mk-users-list', usersList);
Vue.component('mk-user-list-timeline', userListTimeline);
Vue.component('mk-widget-container', widgetContainer); Vue.component('mk-widget-container', widgetContainer);

View File

@ -1,8 +1,8 @@
<template> <template>
<div class="mk-mentions"> <div class="mk-mentions">
<header> <header>
<span :data-is-active="mode == 'all'" @click="mode = 'all'">すべて</span> <span :data-active="mode == 'all'" @click="mode = 'all'">すべて</span>
<span :data-is-active="mode == 'following'" @click="mode = 'following'">フォロー中</span> <span :data-active="mode == 'following'" @click="mode = 'following'">フォロー中</span>
</header> </header>
<div class="fetching" v-if="fetching"> <div class="fetching" v-if="fetching">
<mk-ellipsis-icon/> <mk-ellipsis-icon/>
@ -98,7 +98,7 @@ export default Vue.extend({
font-size 18px font-size 18px
color #555 color #555
&:not([data-is-active]) &:not([data-active])
color $theme-color color $theme-color
cursor pointer cursor pointer

View File

@ -1,5 +1,14 @@
<template> <template>
<div class="mk-notes"> <div class="mk-notes">
<div class="newer-indicator" :style="{ top: $store.state.uiHeaderHeight + 'px' }" v-show="queue.length > 0"></div>
<slot name="empty" v-if="notes.length == 0 && !fetching && requestInitPromise == null"></slot>
<div v-if="!fetching && requestInitPromise != null">
<p>読み込みに失敗しました</p>
<button @click="resolveInitPromise">リトライ</button>
</div>
<transition-group name="mk-notes" class="transition"> <transition-group name="mk-notes" class="transition">
<template v-for="(note, i) in _notes"> <template v-for="(note, i) in _notes">
<x-note :note="note" :key="note.id" @update:note="onNoteUpdated(i, $event)"/> <x-note :note="note" :key="note.id" @update:note="onNoteUpdated(i, $event)"/>
@ -9,26 +18,48 @@
</p> </p>
</template> </template>
</transition-group> </transition-group>
<footer>
<slot name="footer"></slot> <footer v-if="more">
<button @click="loadMore" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }">
<template v-if="!moreFetching">%i18n:@load-more%</template>
<template v-if="moreFetching">%fa:spinner .pulse .fw%</template>
</button>
</footer> </footer>
</div> </div>
</template> </template>
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import { url } from '../../../config';
import getNoteSummary from '../../../../../renderers/get-note-summary';
import XNote from './notes.note.vue'; import XNote from './notes.note.vue';
const displayLimit = 30;
export default Vue.extend({ export default Vue.extend({
components: { components: {
XNote XNote
}, },
props: { props: {
notes: { more: {
type: Array, type: Function,
default: () => [] required: false
} }
}, },
data() {
return {
requestInitPromise: null as () => Promise<any[]>,
notes: [],
queue: [],
unreadCount: 0,
fetching: true,
moreFetching: false
};
},
computed: { computed: {
_notes(): any[] { _notes(): any[] {
return (this.notes as any).map(note => { return (this.notes as any).map(note => {
@ -40,18 +71,146 @@ export default Vue.extend({
}); });
} }
}, },
mounted() {
document.addEventListener('visibilitychange', this.onVisibilitychange, false);
window.addEventListener('scroll', this.onScroll);
},
beforeDestroy() {
document.removeEventListener('visibilitychange', this.onVisibilitychange);
window.removeEventListener('scroll', this.onScroll);
},
methods: { methods: {
isScrollTop() {
return window.scrollY <= 8;
},
focus() { focus() {
(this.$el as any).children[0].focus(); (this.$el as any).children[0].focus();
}, },
onNoteUpdated(i, note) { onNoteUpdated(i, note) {
Vue.set((this as any).notes, i, note); Vue.set((this as any).notes, i, note);
},
init(promiseGenerator: () => Promise<any[]>) {
this.requestInitPromise = promiseGenerator;
this.resolveInitPromise();
},
resolveInitPromise() {
this.queue = [];
this.notes = [];
this.fetching = true;
const promise = this.requestInitPromise();
promise.then(notes => {
this.notes = notes;
this.requestInitPromise = null;
this.fetching = false;
}, e => {
this.fetching = false;
});
},
prepend(note, silent = false) {
//#region
const isMyNote = note.userId == (this as any).os.i.id;
const isPureRenote = note.renoteId != null && note.text == null && note.mediaIds.length == 0 && note.poll == null;
if ((this as any).os.i.clientSettings.showMyRenotes === false) {
if (isMyNote && isPureRenote) {
return;
}
}
if ((this as any).os.i.clientSettings.showRenotedMyNotes === false) {
if (isPureRenote && (note.renote.userId == (this as any).os.i.id)) {
return;
}
}
//#endregion
// 稿
if ((document.hidden || !this.isScrollTop()) && note.userId !== (this as any).os.i.id) {
this.unreadCount++;
document.title = `(${this.unreadCount}) ${getNoteSummary(note)}`;
}
if (this.isScrollTop()) {
// Prepend the note
this.notes.unshift(note);
//
if ((this as any).os.isEnableSounds && !silent) {
const sound = new Audio(`${url}/assets/post.mp3`);
sound.volume = localStorage.getItem('soundVolume') ? parseInt(localStorage.getItem('soundVolume'), 10) / 100 : 0.5;
sound.play();
}
// 稿
if (this.notes.length >= displayLimit) {
this.notes = this.notes.slice(0, displayLimit);
}
} else {
this.queue.unshift(note);
}
},
append(note) {
this.notes.push(note);
},
tail() {
return this.notes[this.notes.length - 1];
},
releaseQueue() {
this.queue.forEach(n => this.prepend(n, true));
this.queue = [];
},
async loadMore() {
if (this.more == null) return;
if (this.moreFetching) return;
this.moreFetching = true;
await this.more();
this.moreFetching = false;
},
clearNotification() {
this.unreadCount = 0;
document.title = 'Misskey';
},
onVisibilitychange() {
if (!document.hidden) {
this.clearNotification();
}
},
onScroll() {
if (this.isScrollTop()) {
this.releaseQueue();
this.clearNotification();
}
if ((this as any).os.i.clientSettings.fetchOnScroll !== false) {
const current = window.scrollY + window.innerHeight;
if (current > document.body.offsetHeight - 8) this.loadMore();
}
} }
} }
}); });
</script> </script>
<style lang="stylus" scoped> <style lang="stylus" scoped>
@import '~const.styl'
root(isDark) root(isDark)
.transition .transition
.mk-notes-enter .mk-notes-enter
@ -78,24 +237,31 @@ root(isDark)
[data-fa] [data-fa]
margin-right 8px margin-right 8px
> .newer-indicator
position -webkit-sticky
position sticky
z-index 100
height 3px
background $theme-color
> footer > footer
> * > button
display block display block
margin 0 margin 0
padding 16px padding 16px
width 100% width 100%
text-align center text-align center
color #ccc color #ccc
border-top solid 1px #eaeaea background isDark ? #282C37 : #fff
border-bottom-left-radius 4px border-top solid 1px isDark ? #1c2023 : #eaeaea
border-bottom-right-radius 4px border-bottom-left-radius 6px
border-bottom-right-radius 6px
> button
&:hover &:hover
background #f5f5f5 background isDark ? #2e3440 : #f5f5f5
&:active &:active
background #eee background isDark ? #21242b : #eee
.mk-notes[data-darkmode] .mk-notes[data-darkmode]
root(true) root(true)

View File

@ -1,28 +1,23 @@
<template> <template>
<div class="mk-home-timeline"> <div class="mk-timeline-core">
<div class="newer-indicator" :style="{ top: $store.state.uiHeaderHeight + 'px' }" v-show="queue.length > 0"></div>
<mk-friends-maker v-if="src == 'home' && alone"/> <mk-friends-maker v-if="src == 'home' && alone"/>
<div class="fetching" v-if="fetching"> <div class="fetching" v-if="fetching">
<mk-ellipsis-icon/> <mk-ellipsis-icon/>
</div> </div>
<p class="empty" v-if="notes.length == 0 && !fetching">
%fa:R comments%%i18n:@empty% <mk-notes ref="timeline" :more="canFetchMore ? more : null">
</p> <p :class="$style.empty" slot="empty">
<mk-notes :notes="notes" ref="timeline"> %fa:R comments%%i18n:@empty%
<button slot="footer" @click="more" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }"> </p>
<template v-if="!moreFetching">%i18n:@load-more%</template>
<template v-if="moreFetching">%fa:spinner .pulse .fw%</template>
</button>
</mk-notes> </mk-notes>
</div> </div>
</template> </template>
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import { url } from '../../../config'; import getNoteSummary from '../../../../../renderers/get-note-summary';
const fetchLimit = 10; const fetchLimit = 10;
const displayLimit = 30;
export default Vue.extend({ export default Vue.extend({
props: { props: {
@ -37,10 +32,9 @@ export default Vue.extend({
fetching: true, fetching: true,
moreFetching: false, moreFetching: false,
existMore: false, existMore: false,
notes: [],
queue: [],
connection: null, connection: null,
connectionId: null, connectionId: null,
unreadCount: 0,
date: null date: null
}; };
}, },
@ -67,7 +61,7 @@ export default Vue.extend({
}, },
canFetchMore(): boolean { canFetchMore(): boolean {
return !this.moreFetching && !this.fetching && this.notes.length > 0 && this.existMore; return !this.moreFetching && !this.fetching && this.existMore;
} }
}, },
@ -82,7 +76,7 @@ export default Vue.extend({
} }
document.addEventListener('keydown', this.onKeydown); document.addEventListener('keydown', this.onKeydown);
window.addEventListener('scroll', this.onScroll); document.addEventListener('visibilitychange', this.onVisibilitychange, false);
this.fetch(); this.fetch();
}, },
@ -96,33 +90,29 @@ export default Vue.extend({
this.stream.dispose(this.connectionId); this.stream.dispose(this.connectionId);
document.removeEventListener('keydown', this.onKeydown); document.removeEventListener('keydown', this.onKeydown);
window.removeEventListener('scroll', this.onScroll); document.removeEventListener('visibilitychange', this.onVisibilitychange);
}, },
methods: { methods: {
isScrollTop() { fetch() {
return window.scrollY <= 8;
},
fetch(cb?) {
this.queue = [];
this.fetching = true; this.fetching = true;
(this as any).api(this.endpoint, { (this.$refs.timeline as any).init(() => new Promise((res, rej) => {
limit: fetchLimit + 1, (this as any).api(this.endpoint, {
untilDate: this.date ? this.date.getTime() : undefined, limit: fetchLimit + 1,
includeMyRenotes: (this as any).os.i.clientSettings.showMyRenotes, untilDate: this.date ? this.date.getTime() : undefined,
includeRenotedMyNotes: (this as any).os.i.clientSettings.showRenotedMyNotes includeMyRenotes: (this as any).os.i.clientSettings.showMyRenotes,
}).then(notes => { includeRenotedMyNotes: (this as any).os.i.clientSettings.showRenotedMyNotes
if (notes.length == fetchLimit + 1) { }).then(notes => {
notes.pop(); if (notes.length == fetchLimit + 1) {
this.existMore = true; notes.pop();
} this.existMore = true;
this.notes = notes; }
this.fetching = false; res(notes);
this.$emit('loaded'); this.fetching = false;
if (cb) cb(); this.$emit('loaded');
}); }, rej);
}));
}, },
more() { more() {
@ -132,7 +122,7 @@ export default Vue.extend({
(this as any).api(this.endpoint, { (this as any).api(this.endpoint, {
limit: fetchLimit + 1, limit: fetchLimit + 1,
untilId: this.notes[this.notes.length - 1].id, untilId: (this.$refs.timeline as any).tail().id,
includeMyRenotes: (this as any).os.i.clientSettings.showMyRenotes, includeMyRenotes: (this as any).os.i.clientSettings.showMyRenotes,
includeRenotedMyNotes: (this as any).os.i.clientSettings.showRenotedMyNotes includeRenotedMyNotes: (this as any).os.i.clientSettings.showRenotedMyNotes
}).then(notes => { }).then(notes => {
@ -141,56 +131,19 @@ export default Vue.extend({
} else { } else {
this.existMore = false; this.existMore = false;
} }
this.notes = this.notes.concat(notes); notes.forEach(n => (this.$refs.timeline as any).append(n));
this.moreFetching = false; this.moreFetching = false;
}); });
}, },
prependNote(note, silent = false) {
//
if ((this as any).os.isEnableSounds && !silent) {
const sound = new Audio(`${url}/assets/post.mp3`);
sound.volume = localStorage.getItem('soundVolume') ? parseInt(localStorage.getItem('soundVolume'), 10) / 100 : 0.5;
sound.play();
}
// Prepent a note
this.notes.unshift(note);
// 稿
if (this.notes.length >= displayLimit) {
this.notes = this.notes.slice(0, displayLimit);
}
},
releaseQueue() {
this.queue.forEach(n => this.prependNote(n, true));
this.queue = [];
},
onNote(note) { onNote(note) {
//#region if (document.hidden && note.userId !== (this as any).os.i.id) {
const isMyNote = note.userId == (this as any).os.i.id; this.unreadCount++;
const isPureRenote = note.renoteId != null && note.text == null && note.mediaIds.length == 0 && note.poll == null; document.title = `(${this.unreadCount}) ${getNoteSummary(note)}`;
if ((this as any).os.i.clientSettings.showMyRenotes === false) {
if (isMyNote && isPureRenote) {
return;
}
} }
if ((this as any).os.i.clientSettings.showRenotedMyNotes === false) { // Prepend a note
if (isPureRenote && (note.renote.userId == (this as any).os.i.id)) { (this.$refs.timeline as any).prepend(note);
return;
}
}
//#endregion
if (this.isScrollTop()) {
this.prependNote(note);
} else {
this.queue.unshift(note);
}
}, },
onChangeFollowing() { onChangeFollowing() {
@ -206,14 +159,10 @@ export default Vue.extend({
this.fetch(); this.fetch();
}, },
onScroll() { onVisibilitychange() {
if ((this as any).os.i.clientSettings.fetchOnScroll !== false) { if (!document.hidden) {
const current = window.scrollY + window.innerHeight; this.unreadCount = 0;
if (current > document.body.offsetHeight - 8) this.more(); document.title = 'Misskey';
}
if (this.isScrollTop()) {
this.releaseQueue();
} }
}, },
@ -223,7 +172,7 @@ export default Vue.extend({
this.focus(); this.focus();
} }
} }
}, }
} }
}); });
</script> </script>
@ -231,32 +180,28 @@ export default Vue.extend({
<style lang="stylus" scoped> <style lang="stylus" scoped>
@import '~const.styl' @import '~const.styl'
.mk-home-timeline .mk-timeline-core
> .newer-indicator
position -webkit-sticky
position sticky
z-index 100
height 3px
background $theme-color
> .mk-friends-maker > .mk-friends-maker
border-bottom solid 1px #eee border-bottom solid 1px #eee
> .fetching > .fetching
padding 64px 0 padding 64px 0
> .empty </style>
display block
margin 0 auto
padding 32px
max-width 400px
text-align center
color #999
> [data-fa] <style lang="stylus" module>
display block .empty
margin-bottom 16px display block
font-size 3em margin 0 auto
color #ccc padding 32px
max-width 400px
text-align center
color #999
> [data-fa]
display block
margin-bottom 16px
font-size 3em
color #ccc
</style> </style>

View File

@ -1,19 +1,23 @@
<template> <template>
<div class="mk-timeline"> <div class="mk-timeline">
<header> <header>
<span :data-is-active="src == 'home'" @click="src = 'home'">%fa:home% ホーム</span> <span :data-active="src == 'home'" @click="src = 'home'">%fa:home% ホーム</span>
<span :data-is-active="src == 'local'" @click="src = 'local'">%fa:R comments% ローカル</span> <span :data-active="src == 'local'" @click="src = 'local'">%fa:R comments% ローカル</span>
<span :data-is-active="src == 'global'" @click="src = 'global'">%fa:globe% グローバル</span> <span :data-active="src == 'global'" @click="src = 'global'">%fa:globe% グローバル</span>
<span :data-active="src == 'list'" @click="src = 'list'" v-if="list">%fa:list% {{ list.title }}</span>
<button @click="chooseList" title="リスト">%fa:list%</button>
</header> </header>
<x-core v-if="src == 'home'" ref="tl" key="home" src="home"/> <x-core v-if="src == 'home'" ref="tl" key="home" src="home"/>
<x-core v-if="src == 'local'" ref="tl" key="local" src="local"/> <x-core v-if="src == 'local'" ref="tl" key="local" src="local"/>
<x-core v-if="src == 'global'" ref="tl" key="global" src="global"/> <x-core v-if="src == 'global'" ref="tl" key="global" src="global"/>
<mk-user-list-timeline v-if="src == 'list'" ref="tl" key="list" :list="list"/>
</div> </div>
</template> </template>
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import XCore from './timeline.core.vue'; import XCore from './timeline.core.vue';
import MkUserListsWindow from './user-lists-window.vue';
export default Vue.extend({ export default Vue.extend({
components: { components: {
@ -22,7 +26,8 @@ export default Vue.extend({
data() { data() {
return { return {
src: 'home' src: 'home',
list: null
}; };
}, },
@ -35,6 +40,15 @@ export default Vue.extend({
methods: { methods: {
warp(date) { warp(date) {
(this.$refs.tl as any).warp(date); (this.$refs.tl as any).warp(date);
},
chooseList() {
const w = (this as any).os.new(MkUserListsWindow);
w.$once('choosen', list => {
this.list = list;
this.src = 'list';
w.close();
});
} }
} }
}); });
@ -55,6 +69,23 @@ root(isDark)
border-radius 6px 6px 0 0 border-radius 6px 6px 0 0
box-shadow 0 1px rgba(0, 0, 0, 0.08) box-shadow 0 1px rgba(0, 0, 0, 0.08)
> button
position absolute
z-index 2
top 0
right 0
padding 0
width 42px
font-size 0.9em
line-height 42px
color isDark ? #9baec8 : #ccc
&:hover
color isDark ? #b2c1d5 : #aaa
&:active
color isDark ? #b2c1d5 : #999
> span > span
display inline-block display inline-block
padding 0 10px padding 0 10px
@ -62,7 +93,7 @@ root(isDark)
font-size 12px font-size 12px
user-select none user-select none
&[data-is-active] &[data-active]
color $theme-color color $theme-color
cursor default cursor default
font-weight bold font-weight bold
@ -77,7 +108,7 @@ root(isDark)
height 2px height 2px
background $theme-color background $theme-color
&:not([data-is-active]) &:not([data-active])
color isDark ? #9aa2a7 : #6f7477 color isDark ? #9aa2a7 : #6f7477
cursor pointer cursor pointer

View File

@ -16,6 +16,9 @@
<li> <li>
<router-link to="/i/favorites">%fa:star%<span>%i18n:@favorites%</span>%fa:angle-right%</router-link> <router-link to="/i/favorites">%fa:star%<span>%i18n:@favorites%</span>%fa:angle-right%</router-link>
</li> </li>
<li @click="list">
<p>%fa:list%<span>%i18n:@lists%</span>%fa:angle-right%</p>
</li>
</ul> </ul>
<ul> <ul>
<li> <li>
@ -42,6 +45,7 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import MkUserListsWindow from './user-lists-window.vue';
import MkSettingsWindow from './settings-window.vue'; import MkSettingsWindow from './settings-window.vue';
import MkDriveWindow from './drive-window.vue'; import MkDriveWindow from './drive-window.vue';
import contains from '../../../common/scripts/contains'; import contains from '../../../common/scripts/contains';
@ -80,6 +84,13 @@ export default Vue.extend({
this.close(); this.close();
(this as any).os.new(MkDriveWindow); (this as any).os.new(MkDriveWindow);
}, },
list() {
this.close();
const w = (this as any).os.new(MkUserListsWindow);
w.$once('choosen', list => {
this.$router.push(`i/lists/${ list.id }`);
});
},
settings() { settings() {
this.close(); this.close();
(this as any).os.new(MkSettingsWindow); (this as any).os.new(MkSettingsWindow);

View File

@ -0,0 +1,93 @@
<template>
<div>
<mk-notes ref="timeline" :more="existMore ? more : null"/>
</div>
</template>
<script lang="ts">
import Vue from 'vue';
import { UserListStream } from '../../../common/scripts/streaming/user-list';
const fetchLimit = 10;
export default Vue.extend({
props: ['list'],
data() {
return {
fetching: true,
moreFetching: false,
existMore: false,
connection: null
};
},
watch: {
$route: 'init'
},
mounted() {
this.init();
},
beforeDestroy() {
this.connection.close();
},
methods: {
init() {
if (this.connection) this.connection.close();
this.connection = new UserListStream((this as any).os, (this as any).os.i, this.list.id);
this.connection.on('note', this.onNote);
this.connection.on('userAdded', this.onUserAdded);
this.connection.on('userRemoved', this.onUserRemoved);
this.fetch();
},
fetch() {
this.fetching = true;
(this.$refs.timeline as any).init(() => new Promise((res, rej) => {
(this as any).api('notes/user-list-timeline', {
listId: this.list.id,
limit: fetchLimit + 1,
includeMyRenotes: (this as any).os.i.clientSettings.showMyRenotes,
includeRenotedMyNotes: (this as any).os.i.clientSettings.showRenotedMyNotes
}).then(notes => {
if (notes.length == fetchLimit + 1) {
notes.pop();
this.existMore = true;
}
res(notes);
this.fetching = false;
this.$emit('loaded');
}, rej);
}));
},
more() {
this.moreFetching = true;
(this as any).api('notes/list-timeline', {
listId: this.list.id,
limit: fetchLimit + 1,
untilId: (this.$refs.timeline as any).tail().id,
includeMyRenotes: (this as any).os.i.clientSettings.showMyRenotes,
includeRenotedMyNotes: (this as any).os.i.clientSettings.showRenotedMyNotes
}).then(notes => {
if (notes.length == fetchLimit + 1) {
notes.pop();
} else {
this.existMore = false;
}
notes.forEach(n => (this.$refs.timeline as any).append(n));
this.moreFetching = false;
});
},
onNote(note) {
// Prepend a note
(this.$refs.timeline as any).prepend(note);
},
onUserAdded() {
this.fetch();
},
onUserRemoved() {
this.fetch();
}
}
});
</script>

View File

@ -0,0 +1,69 @@
<template>
<mk-window ref="window" is-modal width="450px" height="500px" @closed="$destroy">
<span slot="header">%fa:list% リスト</span>
<div data-id="6e4caea3-d8f9-4ab7-96de-ab67fe8d5c82" :data-darkmode="_darkmode_">
<button class="ui" @click="add">リストを作成</button>
<a v-for="list in lists" :key="list.id" @click="choice(list)">{{ list.title }}</a>
</div>
</mk-window>
</template>
<script lang="ts">
import Vue from 'vue';
export default Vue.extend({
data() {
return {
fetching: true,
lists: []
};
},
mounted() {
(this as any).api('users/lists/list').then(lists => {
this.fetching = false;
this.lists = lists;
});
},
methods: {
add() {
(this as any).apis.input({
title: 'リスト名',
}).then(async title => {
const list = await (this as any).api('users/lists/create', {
title
});
this.$emit('choosen', list);
});
},
choice(list) {
this.$emit('choosen', list);
},
close() {
(this as any).$refs.window.close();
}
}
});
</script>
<style lang="stylus" scoped>
root(isDark)
padding 16px
> button
margin-bottom 16px
> a
display block
padding 16px
border solid 1px isDark ? #1c2023 : #eee
border-radius 4px
[data-id="6e4caea3-d8f9-4ab7-96de-ab67fe8d5c82"][data-darkmode]
root(true)
[data-id="6e4caea3-d8f9-4ab7-96de-ab67fe8d5c82"]:not([data-darkmode])
root(false)
</style>

View File

@ -2,8 +2,8 @@
<div class="mk-users-list"> <div class="mk-users-list">
<nav> <nav>
<div> <div>
<span :data-is-active="mode == 'all'" @click="mode = 'all'">すべて<span>{{ count }}</span></span> <span :data-active="mode == 'all'" @click="mode = 'all'">すべて<span>{{ count }}</span></span>
<span v-if="os.isSignedIn && youKnowCount" :data-is-active="mode == 'iknow'" @click="mode = 'iknow'">知り合い<span>{{ youKnowCount }}</span></span> <span v-if="os.isSignedIn && youKnowCount" :data-active="mode == 'iknow'" @click="mode = 'iknow'">知り合い<span>{{ youKnowCount }}</span></span>
</div> </div>
</nav> </nav>
<div class="users" v-if="!fetching && users.length != 0"> <div class="users" v-if="!fetching && users.length != 0">
@ -98,7 +98,7 @@ export default Vue.extend({
* *
pointer-events none pointer-events none
&[data-is-active] &[data-active]
font-weight bold font-weight bold
color $theme-color color $theme-color
border-color $theme-color border-color $theme-color

View File

@ -58,7 +58,7 @@ root(isDark)
box-shadow 0 1px rgba(0, 0, 0, 0.07) box-shadow 0 1px rgba(0, 0, 0, 0.07)
> [data-fa] > [data-fa]
margin-right 4px margin-right 6px
&:empty &:empty
display none display none

View File

@ -0,0 +1,131 @@
<template>
<div>
<mk-widget-container>
<template slot="header">%fa:users% ユーザー</template>
<button slot="func" title="ユーザーを追加" @click="add">%fa:plus%</button>
<div data-id="d0b63759-a822-4556-a5ce-373ab966e08a">
<p class="fetching" v-if="fetching">%fa:spinner .pulse .fw% %i18n:common.loading%<mk-ellipsis/></p>
<template v-else-if="users.length != 0">
<div class="user" v-for="_user in users">
<router-link class="avatar-anchor" :to="_user | userPage">
<img class="avatar" :src="`${_user.avatarUrl}?thumbnail&size=42`" alt="" v-user-preview="_user.id"/>
</router-link>
<div class="body">
<router-link class="name" :to="_user | userPage" v-user-preview="_user.id">{{ _user | userName }}</router-link>
<p class="username">@{{ _user | acct }}</p>
</div>
</div>
</template>
<p class="empty" v-else>%i18n:@no-one%</p>
</div>
</mk-widget-container>
</div>
</template>
<script lang="ts">
import Vue from 'vue';
export default Vue.extend({
props: {
list: {
type: Object,
required: true
}
},
data() {
return {
fetching: true,
users: []
};
},
mounted() {
(this as any).api('users/show', {
userIds: this.list.userIds
}).then(users => {
this.users = users;
this.fetching = false;
});
},
methods: {
add() {
(this as any).apis.input({
title: 'ユーザー名',
}).then(async username => {
const user = await (this as any).api('users/show', {
username
});
(this as any).api('users/lists/push', {
listId: this.list.id,
userId: user.id
});
});
}
}
});
</script>
<style lang="stylus" scoped>
root(isDark)
> .user
padding 16px
border-bottom solid 1px isDark ? #1c2023 : #eee
&:last-child
border-bottom none
&:after
content ""
display block
clear both
> .avatar-anchor
display block
float left
margin 0 12px 0 0
> .avatar
display block
width 42px
height 42px
margin 0
border-radius 8px
vertical-align bottom
> .body
float left
width calc(100% - 54px)
> .name
margin 0
font-size 16px
line-height 24px
color isDark ? #fff : #555
> .username
display block
margin 0
font-size 15px
line-height 16px
color isDark ? #606984 : #ccc
> .empty
margin 0
padding 16px
text-align center
color #aaa
> .fetching
margin 0
padding 16px
text-align center
color #aaa
[data-id="d0b63759-a822-4556-a5ce-373ab966e08a"][data-darkmode]
root(true)
[data-id="d0b63759-a822-4556-a5ce-373ab966e08a"]:not([data-darkmode])
root(false)
</style>

View File

@ -0,0 +1,71 @@
<template>
<mk-ui>
<div v-if="!fetching" data-id="02010e15-cc48-4245-8636-16078a9b623c">
<div>
<div><h1>{{ list.title }}</h1></div>
<x-users :list="list"/>
</div>
<main>
<mk-user-list-timeline :list="list"/>
</main>
</div>
</mk-ui>
</template>
<script lang="ts">
import Vue from 'vue';
import XUsers from './user-list.users.vue';
export default Vue.extend({
components: {
XUsers
},
data() {
return {
fetching: true,
list: null
};
},
watch: {
$route: 'fetch'
},
mounted() {
this.fetch();
},
methods: {
fetch() {
this.fetching = true;
(this as any).api('users/lists/show', {
listId: this.$route.params.list
}).then(list => {
this.list = list;
this.fetching = false;
});
}
}
});
</script>
<style lang="stylus" scoped>
[data-id="02010e15-cc48-4245-8636-16078a9b623c"]
display flex
justify-content center
margin 0 auto
max-width 1200px
> main
> div > div
> *:not(:last-child)
margin-bottom 16px
> main
padding 16px
width calc(100% - 275px * 2)
> div
width 275px
margin 0
padding 16px 0 16px 16px
</style>

View File

@ -3,15 +3,18 @@
<div class="friend-form" v-if="os.isSignedIn && os.i.id != user.id"> <div class="friend-form" v-if="os.isSignedIn && os.i.id != user.id">
<mk-follow-button :user="user" size="big"/> <mk-follow-button :user="user" size="big"/>
<p class="followed" v-if="user.isFollowed">%i18n:@follows-you%</p> <p class="followed" v-if="user.isFollowed">%i18n:@follows-you%</p>
<p class="stalk"> <p class="stalk" v-if="user.isFollowing">
<span v-if="user.isStalking">%i18n:@stalking% <a @click="unstalk">%i18n:@unstalk%</a></span> <span v-if="user.isStalking">%i18n:@stalking% <a @click="unstalk">%fa:meh% %i18n:@unstalk%</a></span>
<span v-if="!user.isStalking"><a @click="stalk">%i18n:@stalk%</a></span> <span v-if="!user.isStalking"><a @click="stalk">%fa:user-secret% %i18n:@stalk%</a></span>
</p>
<p class="mute">
<span v-if="user.isMuted">%i18n:@muted% <a @click="unmute">%i18n:@unmute%</a></span>
<span v-if="!user.isMuted"><a @click="mute">%i18n:@mute%</a></span>
</p> </p>
</div> </div>
<div class="action-form">
<button class="mute ui" @click="user.isMuted ? unmute() : mute()">
<span v-if="user.isMuted">%fa:eye% %i18n:@unmute%</span>
<span v-if="!user.isMuted">%fa:eye-slash% %i18n:@mute%</span>
</button>
<button class="mute ui" @click="list">%fa:list% リストに追加</button>
</div>
<div class="description" v-if="user.description">{{ user.description }}</div> <div class="description" v-if="user.description">{{ user.description }}</div>
<div class="birthday" v-if="user.host === null && user.profile.birthday"> <div class="birthday" v-if="user.host === null && user.profile.birthday">
<p>%fa:birthday-cake%{{ user.profile.birthday.replace('-', '年').replace('-', '月') + '日' }} ({{ age }})</p> <p>%fa:birthday-cake%{{ user.profile.birthday.replace('-', '年').replace('-', '月') + '日' }} ({{ age }})</p>
@ -32,6 +35,7 @@ import Vue from 'vue';
import * as age from 's-age'; import * as age from 's-age';
import MkFollowingWindow from '../../components/following-window.vue'; import MkFollowingWindow from '../../components/following-window.vue';
import MkFollowersWindow from '../../components/followers-window.vue'; import MkFollowersWindow from '../../components/followers-window.vue';
import MkUserListsWindow from '../../components/user-lists-window.vue';
export default Vue.extend({ export default Vue.extend({
props: ['user'], props: ['user'],
@ -91,6 +95,21 @@ export default Vue.extend({
}, () => { }, () => {
alert('error'); alert('error');
}); });
},
list() {
const w = (this as any).os.new(MkUserListsWindow);
w.$once('choosen', async list => {
w.close();
await (this as any).api('users/lists/push', {
listId: list.id,
userId: this.user.id
});
(this as any).apis.dialog({
title: 'Done!',
text: `${this.user.name}${list.title}に追加しました。`
});
});
} }
} }
}); });
@ -107,11 +126,9 @@ export default Vue.extend({
> .friend-form > .friend-form
padding 16px padding 16px
text-align center
border-top solid 1px #eee border-top solid 1px #eee
> .mk-big-follow-button
width 100%
> .followed > .followed
margin 12px 0 0 0 margin 12px 0 0 0
padding 0 padding 0
@ -122,6 +139,20 @@ export default Vue.extend({
background #eefaff background #eefaff
border-radius 4px border-radius 4px
> .stalk
margin 12px 0 0 0
> .action-form
padding 16px
text-align center
border-top solid 1px #eee
> *
width 100%
&:not(:last-child)
margin-bottom 12px
> .description > .description
padding 16px padding 16px
color #555 color #555

View File

@ -1,42 +1,36 @@
<template> <template>
<div class="timeline"> <div class="timeline">
<header> <header>
<span :data-is-active="mode == 'default'" @click="mode = 'default'">投稿</span> <span :data-active="mode == 'default'" @click="mode = 'default'">投稿</span>
<span :data-is-active="mode == 'with-replies'" @click="mode = 'with-replies'">投稿と返信</span> <span :data-active="mode == 'with-replies'" @click="mode = 'with-replies'">投稿と返信</span>
<span :data-is-active="mode == 'with-media'" @click="mode = 'with-media'">メディア</span> <span :data-active="mode == 'with-media'" @click="mode = 'with-media'">メディア</span>
</header> </header>
<div class="loading" v-if="fetching"> <div class="loading" v-if="fetching">
<mk-ellipsis-icon/> <mk-ellipsis-icon/>
</div> </div>
<p class="empty" v-if="empty">%fa:R comments%このユーザーはまだ何も投稿していないようです</p> <mk-notes ref="timeline" :more="existMore ? more : null">
<mk-notes ref="timeline" :notes="notes"> <p class="empty" slot="empty">%fa:R comments%このユーザーはまだ何も投稿していないようです</p>
<div slot="footer">
<template v-if="!moreFetching">%fa:moon%</template>
<template v-if="moreFetching">%fa:spinner .pulse .fw%</template>
</div>
</mk-notes> </mk-notes>
</div> </div>
</template> </template>
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
const fetchLimit = 10;
export default Vue.extend({ export default Vue.extend({
props: ['user'], props: ['user'],
data() { data() {
return { return {
fetching: true, fetching: true,
moreFetching: false, moreFetching: false,
existMore: false,
mode: 'default', mode: 'default',
unreadCount: 0, unreadCount: 0,
notes: [],
date: null date: null
}; };
}, },
computed: {
empty(): boolean {
return this.notes.length == 0;
}
},
watch: { watch: {
mode() { mode() {
this.fetch(); this.fetch();
@ -44,13 +38,11 @@ export default Vue.extend({
}, },
mounted() { mounted() {
document.addEventListener('keydown', this.onDocumentKeydown); document.addEventListener('keydown', this.onDocumentKeydown);
window.addEventListener('scroll', this.onScroll);
this.fetch(() => this.$emit('loaded')); this.fetch(() => this.$emit('loaded'));
}, },
beforeDestroy() { beforeDestroy() {
document.removeEventListener('keydown', this.onDocumentKeydown); document.removeEventListener('keydown', this.onDocumentKeydown);
window.removeEventListener('scroll', this.onScroll);
}, },
methods: { methods: {
onDocumentKeydown(e) { onDocumentKeydown(e) {
@ -61,36 +53,43 @@ export default Vue.extend({
} }
}, },
fetch(cb?) { fetch(cb?) {
(this as any).api('users/notes', { this.fetching = true;
userId: this.user.id, (this.$refs.timeline as any).init(() => new Promise((res, rej) => {
untilDate: this.date ? this.date.getTime() : undefined, (this as any).api('users/notes', {
includeReplies: this.mode == 'with-replies', userId: this.user.id,
withMedia: this.mode == 'with-media' limit: fetchLimit + 1,
}).then(notes => { untilDate: this.date ? this.date.getTime() : undefined,
this.notes = notes; includeReplies: this.mode == 'with-replies',
this.fetching = false; withMedia: this.mode == 'with-media'
if (cb) cb(); }).then(notes => {
}); if (notes.length == fetchLimit + 1) {
notes.pop();
this.existMore = true;
}
res(notes);
this.fetching = false;
if (cb) cb();
}, rej);
}));
}, },
more() { more() {
if (this.moreFetching || this.fetching || this.notes.length == 0) return;
this.moreFetching = true; this.moreFetching = true;
(this as any).api('users/notes', { (this as any).api('users/notes', {
userId: this.user.id, userId: this.user.id,
limit: fetchLimit + 1,
includeReplies: this.mode == 'with-replies', includeReplies: this.mode == 'with-replies',
withMedia: this.mode == 'with-media', withMedia: this.mode == 'with-media',
untilId: this.notes[this.notes.length - 1].id untilId: (this.$refs.timeline as any).tail().id
}).then(notes => { }).then(notes => {
if (notes.length == fetchLimit + 1) {
notes.pop();
} else {
this.existMore = false;
}
notes.forEach(n => (this.$refs.timeline as any).append(n));
this.moreFetching = false; this.moreFetching = false;
this.notes = this.notes.concat(notes);
}); });
}, },
onScroll() {
const current = window.scrollY + window.innerHeight;
if (current > document.body.offsetHeight - 16/*遊び*/) {
this.more();
}
},
warp(date) { warp(date) {
this.date = date; this.date = date;
this.fetch(); this.fetch();
@ -115,7 +114,7 @@ export default Vue.extend({
font-size 18px font-size 18px
color #555 color #555
&:not([data-is-active]) &:not([data-active])
color $theme-color color $theme-color
cursor pointer cursor pointer

View File

@ -1,7 +1,6 @@
import Vue from 'vue'; import Vue from 'vue';
import ui from './ui.vue'; import ui from './ui.vue';
import timeline from './timeline.vue';
import note from './note.vue'; import note from './note.vue';
import notes from './notes.vue'; import notes from './notes.vue';
import mediaImage from './media-image.vue'; import mediaImage from './media-image.vue';
@ -20,11 +19,11 @@ import notificationPreview from './notification-preview.vue';
import usersList from './users-list.vue'; import usersList from './users-list.vue';
import userPreview from './user-preview.vue'; import userPreview from './user-preview.vue';
import userTimeline from './user-timeline.vue'; import userTimeline from './user-timeline.vue';
import userListTimeline from './user-list-timeline.vue';
import activity from './activity.vue'; import activity from './activity.vue';
import widgetContainer from './widget-container.vue'; import widgetContainer from './widget-container.vue';
Vue.component('mk-ui', ui); Vue.component('mk-ui', ui);
Vue.component('mk-timeline', timeline);
Vue.component('mk-note', note); Vue.component('mk-note', note);
Vue.component('mk-notes', notes); Vue.component('mk-notes', notes);
Vue.component('mk-media-image', mediaImage); Vue.component('mk-media-image', mediaImage);
@ -43,5 +42,6 @@ Vue.component('mk-notification-preview', notificationPreview);
Vue.component('mk-users-list', usersList); Vue.component('mk-users-list', usersList);
Vue.component('mk-user-preview', userPreview); Vue.component('mk-user-preview', userPreview);
Vue.component('mk-user-timeline', userTimeline); Vue.component('mk-user-timeline', userTimeline);
Vue.component('mk-user-list-timeline', userListTimeline);
Vue.component('mk-activity', activity); Vue.component('mk-activity', activity);
Vue.component('mk-widget-container', widgetContainer); Vue.component('mk-widget-container', widgetContainer);

View File

@ -1,7 +1,20 @@
<template> <template>
<div class="mk-notes"> <div class="mk-notes">
<div class="newer-indicator" :style="{ top: $store.state.uiHeaderHeight + 'px' }" v-show="queue.length > 0"></div>
<slot name="head"></slot> <slot name="head"></slot>
<slot></slot>
<slot name="empty" v-if="notes.length == 0 && !fetching && requestInitPromise == null"></slot>
<div class="init" v-if="fetching">
%fa:spinner .pulse%%i18n:common.loading%
</div>
<div v-if="!fetching && requestInitPromise != null">
<p>読み込みに失敗しました</p>
<button @click="resolveInitPromise">リトライ</button>
</div>
<transition-group name="mk-notes" class="transition"> <transition-group name="mk-notes" class="transition">
<template v-for="(note, i) in _notes"> <template v-for="(note, i) in _notes">
<mk-note :note="note" :key="note.id" @update:note="onNoteUpdated(i, $event)"/> <mk-note :note="note" :key="note.id" @update:note="onNoteUpdated(i, $event)"/>
@ -11,22 +24,41 @@
</p> </p>
</template> </template>
</transition-group> </transition-group>
<footer>
<slot name="tail"></slot> <footer v-if="more">
<button @click="loadMore" :disabled="moreFetching" :style="{ cursor: moreFetching ? 'wait' : 'pointer' }">
<template v-if="!moreFetching">%i18n:@load-more%</template>
<template v-if="moreFetching">%fa:spinner .pulse .fw%</template>
</button>
</footer> </footer>
</div> </div>
</template> </template>
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import getNoteSummary from '../../../../../renderers/get-note-summary';
const displayLimit = 30;
export default Vue.extend({ export default Vue.extend({
props: { props: {
notes: { more: {
type: Array, type: Function,
default: () => [] required: false
} }
}, },
data() {
return {
requestInitPromise: null as () => Promise<any[]>,
notes: [],
queue: [],
unreadCount: 0,
fetching: true,
moreFetching: false
};
},
computed: { computed: {
_notes(): any[] { _notes(): any[] {
return (this.notes as any).map(note => { return (this.notes as any).map(note => {
@ -38,9 +70,127 @@ export default Vue.extend({
}); });
} }
}, },
mounted() {
document.addEventListener('visibilitychange', this.onVisibilitychange, false);
window.addEventListener('scroll', this.onScroll);
},
beforeDestroy() {
document.removeEventListener('visibilitychange', this.onVisibilitychange);
window.removeEventListener('scroll', this.onScroll);
},
methods: { methods: {
isScrollTop() {
return window.scrollY <= 8;
},
onNoteUpdated(i, note) { onNoteUpdated(i, note) {
Vue.set((this as any).notes, i, note); Vue.set((this as any).notes, i, note);
},
init(promiseGenerator: () => Promise<any[]>) {
this.requestInitPromise = promiseGenerator;
this.resolveInitPromise();
},
resolveInitPromise() {
this.queue = [];
this.notes = [];
this.fetching = true;
const promise = this.requestInitPromise();
promise.then(notes => {
this.notes = notes;
this.requestInitPromise = null;
this.fetching = false;
}, e => {
this.fetching = false;
});
},
prepend(note, silent = false) {
//#region
const isMyNote = note.userId == (this as any).os.i.id;
const isPureRenote = note.renoteId != null && note.text == null && note.mediaIds.length == 0 && note.poll == null;
if ((this as any).os.i.clientSettings.showMyRenotes === false) {
if (isMyNote && isPureRenote) {
return;
}
}
if ((this as any).os.i.clientSettings.showRenotedMyNotes === false) {
if (isPureRenote && (note.renote.userId == (this as any).os.i.id)) {
return;
}
}
//#endregion
// 稿
if ((document.hidden || !this.isScrollTop()) && note.userId !== (this as any).os.i.id) {
this.unreadCount++;
document.title = `(${this.unreadCount}) ${getNoteSummary(note)}`;
}
if (this.isScrollTop()) {
// Prepend the note
this.notes.unshift(note);
// 稿
if (this.notes.length >= displayLimit) {
this.notes = this.notes.slice(0, displayLimit);
}
} else {
this.queue.unshift(note);
}
},
append(note) {
this.notes.push(note);
},
tail() {
return this.notes[this.notes.length - 1];
},
releaseQueue() {
this.queue.forEach(n => this.prepend(n, true));
this.queue = [];
},
async loadMore() {
if (this.more == null) return;
if (this.moreFetching) return;
this.moreFetching = true;
await this.more();
this.moreFetching = false;
},
clearNotification() {
this.unreadCount = 0;
document.title = 'Misskey';
},
onVisibilitychange() {
if (!document.hidden) {
this.clearNotification();
}
},
onScroll() {
if (this.isScrollTop()) {
this.releaseQueue();
this.clearNotification();
}
if ((this as any).os.i.clientSettings.fetchOnScroll !== false) {
const current = window.scrollY + window.innerHeight;
if (current > document.body.offsetHeight - 8) this.loadMore();
}
} }
} }
}); });
@ -79,6 +229,13 @@ export default Vue.extend({
[data-fa] [data-fa]
margin-right 8px margin-right 8px
> .newer-indicator
position -webkit-sticky
position sticky
z-index 100
height 3px
background $theme-color
> .init > .init
padding 64px 0 padding 64px 0
text-align center text-align center

View File

@ -1,190 +0,0 @@
<template>
<div class="mk-timeline">
<div class="newer-indicator" :style="{ top: $store.state.uiHeaderHeight + 'px' }" v-show="queue.length > 0"></div>
<mk-friends-maker v-if="alone"/>
<mk-notes :notes="notes">
<div class="init" v-if="fetching">
%fa:spinner .pulse%%i18n:common.loading%
</div>
<div class="empty" v-if="!fetching && notes.length == 0">
%fa:R comments%
%i18n:@empty%
</div>
<button v-if="canFetchMore" @click="more" :disabled="moreFetching" slot="tail">
<span v-if="!moreFetching">%i18n:@load-more%</span>
<span v-if="moreFetching">%i18n:common.loading%<mk-ellipsis/></span>
</button>
</mk-notes>
</div>
</template>
<script lang="ts">
import Vue from 'vue';
const fetchLimit = 10;
const displayLimit = 30;
export default Vue.extend({
props: {
date: {
type: Date,
required: false,
default: null
}
},
data() {
return {
fetching: true,
moreFetching: false,
notes: [],
queue: [],
existMore: false,
connection: null,
connectionId: null
};
},
computed: {
alone(): boolean {
return (this as any).os.i.followingCount == 0;
},
canFetchMore(): boolean {
return !this.moreFetching && !this.fetching && this.notes.length > 0 && this.existMore;
}
},
mounted() {
this.connection = (this as any).os.stream.getConnection();
this.connectionId = (this as any).os.stream.use();
this.connection.on('note', this.onNote);
this.connection.on('follow', this.onChangeFollowing);
this.connection.on('unfollow', this.onChangeFollowing);
window.addEventListener('scroll', this.onScroll);
this.fetch();
},
beforeDestroy() {
this.connection.off('note', this.onNote);
this.connection.off('follow', this.onChangeFollowing);
this.connection.off('unfollow', this.onChangeFollowing);
(this as any).os.stream.dispose(this.connectionId);
window.removeEventListener('scroll', this.onScroll);
},
methods: {
isScrollTop() {
return window.scrollY <= 8;
},
fetch(cb?) {
this.queue = [];
this.fetching = true;
(this as any).api('notes/timeline', {
limit: fetchLimit + 1,
untilDate: this.date ? (this.date as any).getTime() : undefined,
includeMyRenotes: (this as any).os.i.clientSettings.showMyRenotes,
includeRenotedMyNotes: (this as any).os.i.clientSettings.showRenotedMyNotes
}).then(notes => {
if (notes.length == fetchLimit + 1) {
notes.pop();
this.existMore = true;
}
this.notes = notes;
this.fetching = false;
this.$emit('loaded');
if (cb) cb();
});
},
more() {
this.moreFetching = true;
(this as any).api('notes/timeline', {
limit: fetchLimit + 1,
untilId: this.notes[this.notes.length - 1].id,
includeMyRenotes: (this as any).os.i.clientSettings.showMyRenotes,
includeRenotedMyNotes: (this as any).os.i.clientSettings.showRenotedMyNotes
}).then(notes => {
if (notes.length == fetchLimit + 1) {
notes.pop();
this.existMore = true;
} else {
this.existMore = false;
}
this.notes = this.notes.concat(notes);
this.moreFetching = false;
});
},
prependNote(note) {
// Prepent a note
this.notes.unshift(note);
// 稿
if (this.notes.length >= displayLimit) {
this.notes = this.notes.slice(0, displayLimit);
}
},
releaseQueue() {
this.queue.forEach(n => this.prependNote(n));
this.queue = [];
},
onNote(note) {
//#region
const isMyNote = note.userId == (this as any).os.i.id;
const isPureRenote = note.renoteId != null && note.text == null && note.mediaIds.length == 0 && note.poll == null;
if ((this as any).os.i.clientSettings.showMyRenotes === false) {
if (isMyNote && isPureRenote) {
return;
}
}
if ((this as any).os.i.clientSettings.showRenotedMyNotes === false) {
if (isPureRenote && (note.renote.userId == (this as any).os.i.id)) {
return;
}
}
//#endregion
if (this.isScrollTop()) {
this.prependNote(note);
} else {
this.queue.unshift(note);
}
},
onChangeFollowing() {
this.fetch();
},
onScroll() {
if (this.isScrollTop()) {
this.releaseQueue();
}
}
}
});
</script>
<style lang="stylus" scoped>
@import '~const.styl'
.mk-timeline
> .newer-indicator
position -webkit-sticky
position sticky
z-index 100
height 3px
background $theme-color
> .mk-friends-maker
margin-bottom 8px
</style>

View File

@ -0,0 +1,93 @@
<template>
<div>
<mk-notes ref="timeline" :more="existMore ? more : null"/>
</div>
</template>
<script lang="ts">
import Vue from 'vue';
import { UserListStream } from '../../../common/scripts/streaming/user-list';
const fetchLimit = 10;
export default Vue.extend({
props: ['list'],
data() {
return {
fetching: true,
moreFetching: false,
existMore: false,
connection: null
};
},
watch: {
$route: 'init'
},
mounted() {
this.init();
},
beforeDestroy() {
this.connection.close();
},
methods: {
init() {
if (this.connection) this.connection.close();
this.connection = new UserListStream((this as any).os, (this as any).os.i, this.list.id);
this.connection.on('note', this.onNote);
this.connection.on('userAdded', this.onUserAdded);
this.connection.on('userRemoved', this.onUserRemoved);
this.fetch();
},
fetch() {
this.fetching = true;
(this.$refs.timeline as any).init(() => new Promise((res, rej) => {
(this as any).api('notes/user-list-timeline', {
listId: this.list.id,
limit: fetchLimit + 1,
includeMyRenotes: (this as any).os.i.clientSettings.showMyRenotes,
includeRenotedMyNotes: (this as any).os.i.clientSettings.showRenotedMyNotes
}).then(notes => {
if (notes.length == fetchLimit + 1) {
notes.pop();
this.existMore = true;
}
res(notes);
this.fetching = false;
this.$emit('loaded');
}, rej);
}));
},
more() {
this.moreFetching = true;
(this as any).api('notes/list-timeline', {
listId: this.list.id,
limit: fetchLimit + 1,
untilId: (this.$refs.timeline as any).tail().id,
includeMyRenotes: (this as any).os.i.clientSettings.showMyRenotes,
includeRenotedMyNotes: (this as any).os.i.clientSettings.showRenotedMyNotes
}).then(notes => {
if (notes.length == fetchLimit + 1) {
notes.pop();
} else {
this.existMore = false;
}
notes.forEach(n => (this.$refs.timeline as any).append(n));
this.moreFetching = false;
});
},
onNote(note) {
// Prepend a note
(this.$refs.timeline as any).prepend(note);
},
onUserAdded() {
this.fetch();
},
onUserRemoved() {
this.fetch();
}
}
});
</script>

View File

@ -1,17 +1,10 @@
<template> <template>
<div class="mk-user-timeline"> <div class="mk-user-timeline">
<mk-notes :notes="notes"> <mk-notes ref="timeline" :more="existMore ? more : null">
<div class="init" v-if="fetching"> <div slot="empty">
%fa:spinner .pulse%%i18n:common.loading%
</div>
<div class="empty" v-if="!fetching && notes.length == 0">
%fa:R comments% %fa:R comments%
{{ withMedia ? '%i18n:!@no-notes-with-media%' : '%i18n:!@no-notes%' }} {{ withMedia ? '%i18n:!@no-notes-with-media%' : '%i18n:!@no-notes%' }}
</div> </div>
<button v-if="!fetching && existMore" @click="more" :disabled="moreFetching" slot="tail">
<span v-if="!moreFetching">%i18n:@load-more%</span>
<span v-if="moreFetching">%i18n:common.loading%<mk-ellipsis/></span>
</button>
</mk-notes> </mk-notes>
</div> </div>
</template> </template>
@ -19,49 +12,53 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
const limit = 10; const fetchLimit = 10;
export default Vue.extend({ export default Vue.extend({
props: ['user', 'withMedia'], props: ['user', 'withMedia'],
data() { data() {
return { return {
fetching: true, fetching: true,
notes: [],
existMore: false, existMore: false,
moreFetching: false moreFetching: false
}; };
}, },
mounted() { mounted() {
(this as any).api('users/notes', { this.fetch();
userId: this.user.id,
withMedia: this.withMedia,
limit: limit + 1
}).then(notes => {
if (notes.length == limit + 1) {
notes.pop();
this.existMore = true;
}
this.notes = notes;
this.fetching = false;
this.$emit('loaded');
});
}, },
methods: { methods: {
fetch() {
this.fetching = true;
(this.$refs.timeline as any).init(() => new Promise((res, rej) => {
(this as any).api('users/notes', {
userId: this.user.id,
withMedia: this.withMedia,
limit: fetchLimit + 1
}).then(notes => {
if (notes.length == fetchLimit + 1) {
notes.pop();
this.existMore = true;
}
res(notes);
this.fetching = false;
this.$emit('loaded');
}, rej);
}));
},
more() { more() {
this.moreFetching = true; this.moreFetching = true;
(this as any).api('users/notes', { (this as any).api('users/notes', {
userId: this.user.id, userId: this.user.id,
withMedia: this.withMedia, withMedia: this.withMedia,
limit: limit + 1, limit: fetchLimit + 1,
untilId: this.notes[this.notes.length - 1].id untilId: (this.$refs.timeline as any).tail().id
}).then(notes => { }).then(notes => {
if (notes.length == limit + 1) { if (notes.length == fetchLimit + 1) {
notes.pop(); notes.pop();
this.existMore = true;
} else { } else {
this.existMore = false; this.existMore = false;
} }
this.notes = this.notes.concat(notes); notes.forEach(n => (this.$refs.timeline as any).append(n));
this.moreFetching = false; this.moreFetching = false;
}); });
} }

View File

@ -1,8 +1,8 @@
<template> <template>
<div class="mk-users-list"> <div class="mk-users-list">
<nav> <nav>
<span :data-is-active="mode == 'all'" @click="mode = 'all'">%i18n:@all%<span>{{ count }}</span></span> <span :data-active="mode == 'all'" @click="mode = 'all'">%i18n:@all%<span>{{ count }}</span></span>
<span v-if="os.isSignedIn && youKnowCount" :data-is-active="mode == 'iknow'" @click="mode = 'iknow'">%i18n:@known%<span>{{ youKnowCount }}</span></span> <span v-if="os.isSignedIn && youKnowCount" :data-active="mode == 'iknow'" @click="mode = 'iknow'">%i18n:@known%<span>{{ youKnowCount }}</span></span>
</nav> </nav>
<div class="users" v-if="!fetching && users.length != 0"> <div class="users" v-if="!fetching && users.length != 0">
<mk-user-preview v-for="u in users" :user="u" :key="u.id"/> <mk-user-preview v-for="u in users" :user="u" :key="u.id"/>
@ -85,7 +85,7 @@ export default Vue.extend({
color #657786 color #657786
border-bottom solid 2px transparent border-bottom solid 2px transparent
&[data-is-active] &[data-active]
font-weight bold font-weight bold
color $theme-color color $theme-color
border-color $theme-color border-color $theme-color

View File

@ -0,0 +1,196 @@
<template>
<mk-ui>
<span slot="header">%fa:home%ダッシュボード</span>
<template slot="func">
<button @click="customizing = !customizing">%fa:cog%</button>
</template>
<main>
<template v-if="customizing">
<header>
<select v-model="widgetAdderSelected">
<option value="profile">プロフィール</option>
<option value="calendar">カレンダー</option>
<option value="activity">アクティビティ</option>
<option value="rss">RSSリーダー</option>
<option value="photo-stream">フォトストリーム</option>
<option value="slideshow">スライドショー</option>
<option value="version">バージョン</option>
<option value="access-log">アクセスログ</option>
<option value="server">サーバー情報</option>
<option value="donation">寄付のお願い</option>
<option value="nav">ナビゲーション</option>
<option value="tips">ヒント</option>
</select>
<button @click="addWidget">追加</button>
<p><a @click="hint">カスタマイズのヒント</a></p>
</header>
<x-draggable
:list="widgets"
:options="{ handle: '.handle', animation: 150 }"
@sort="onWidgetSort"
>
<div v-for="widget in widgets" class="customize-container" :key="widget.id">
<header>
<span class="handle">%fa:bars%</span>{{ widget.name }}<button class="remove" @click="removeWidget(widget)">%fa:times%</button>
</header>
<div @click="widgetFunc(widget.id)">
<component :is="`mkw-${widget.name}`" :widget="widget" :ref="widget.id" :is-customize-mode="true" :is-mobile="true"/>
</div>
</div>
</x-draggable>
</template>
<template v-else>
<component class="widget" v-for="widget in widgets" :is="`mkw-${widget.name}`" :key="widget.id" :ref="widget.id" :widget="widget" :is-mobile="true" @chosen="warp"/>
</template>
</main>
</mk-ui>
</template>
<script lang="ts">
import Vue from 'vue';
import * as XDraggable from 'vuedraggable';
import * as uuid from 'uuid';
export default Vue.extend({
components: {
XDraggable
},
data() {
return {
showNav: false,
widgets: [],
customizing: false,
widgetAdderSelected: null
};
},
created() {
if ((this as any).os.i.clientSettings.mobileHome == null) {
Vue.set((this as any).os.i.clientSettings, 'mobileHome', [{
name: 'calendar',
id: 'a', data: {}
}, {
name: 'activity',
id: 'b', data: {}
}, {
name: 'rss',
id: 'c', data: {}
}, {
name: 'photo-stream',
id: 'd', data: {}
}, {
name: 'donation',
id: 'e', data: {}
}, {
name: 'nav',
id: 'f', data: {}
}, {
name: 'version',
id: 'g', data: {}
}]);
this.widgets = (this as any).os.i.clientSettings.mobileHome;
this.saveHome();
} else {
this.widgets = (this as any).os.i.clientSettings.mobileHome;
}
this.$watch('os.i.clientSettings', i => {
this.widgets = (this as any).os.i.clientSettings.mobileHome;
}, {
deep: true
});
},
mounted() {
document.title = 'Misskey';
document.documentElement.style.background = '#313a42';
},
methods: {
onHomeUpdated(data) {
if (data.home) {
(this as any).os.i.clientSettings.mobileHome = data.home;
this.widgets = data.home;
} else {
const w = (this as any).os.i.clientSettings.mobileHome.find(w => w.id == data.id);
if (w != null) {
w.data = data.data;
this.$refs[w.id][0].preventSave = true;
this.$refs[w.id][0].props = w.data;
this.widgets = (this as any).os.i.clientSettings.mobileHome;
}
}
},
hint() {
alert('ウィジェットを追加/削除したり並べ替えたりできます。ウィジェットを移動するには「三」をドラッグします。ウィジェットを削除するには「x」をタップします。いくつかのウィジェットはタップすることで表示を変更できます。');
},
widgetFunc(id) {
const w = this.$refs[id][0];
if (w.func) w.func();
},
onWidgetSort() {
this.saveHome();
},
addWidget() {
const widget = {
name: this.widgetAdderSelected,
id: uuid(),
data: {}
};
this.widgets.unshift(widget);
this.saveHome();
},
removeWidget(widget) {
this.widgets = this.widgets.filter(w => w.id != widget.id);
this.saveHome();
},
saveHome() {
(this as any).os.i.clientSettings.mobileHome = this.widgets;
(this as any).api('i/update_mobile_home', {
home: this.widgets
});
}
}
});
</script>
<style lang="stylus" scoped>
main
margin 0 auto
max-width 500px
@media (min-width 500px)
padding 8px
> header
padding 8px
background #fff
.widget
margin 8px
.customize-container
margin 8px
background #fff
> header
line-height 32px
background #eee
> .handle
padding 0 8px
> .remove
position absolute
top 0
right 0
padding 0 8px
line-height 32px
> div
padding 8px
> *
pointer-events none
</style>

View File

@ -0,0 +1,149 @@
<template>
<div>
<mk-friends-maker v-if="src == 'home' && alone" style="margin-bottom:8px"/>
<mk-notes ref="timeline" :more="existMore ? more : null">
<div slot="empty">
%fa:R comments%
%i18n:@empty%
</div>
</mk-notes>
</div>
</template>
<script lang="ts">
import Vue from 'vue';
const fetchLimit = 10;
export default Vue.extend({
props: {
src: {
type: String,
required: true
}
},
data() {
return {
fetching: true,
moreFetching: false,
existMore: false,
connection: null,
connectionId: null,
unreadCount: 0,
date: null
};
},
computed: {
alone(): boolean {
return (this as any).os.i.followingCount == 0;
},
stream(): any {
return this.src == 'home'
? (this as any).os.stream
: this.src == 'local'
? (this as any).os.streams.localTimelineStream
: (this as any).os.streams.globalTimelineStream;
},
endpoint(): string {
return this.src == 'home'
? 'notes/timeline'
: this.src == 'local'
? 'notes/local-timeline'
: 'notes/global-timeline';
},
canFetchMore(): boolean {
return !this.moreFetching && !this.fetching && this.existMore;
}
},
mounted() {
this.connection = this.stream.getConnection();
this.connectionId = this.stream.use();
this.connection.on('note', this.onNote);
if (this.src == 'home') {
this.connection.on('follow', this.onChangeFollowing);
this.connection.on('unfollow', this.onChangeFollowing);
}
this.fetch();
},
beforeDestroy() {
this.connection.off('note', this.onNote);
if (this.src == 'home') {
this.connection.off('follow', this.onChangeFollowing);
this.connection.off('unfollow', this.onChangeFollowing);
}
this.stream.dispose(this.connectionId);
},
methods: {
fetch() {
this.fetching = true;
(this.$refs.timeline as any).init(() => new Promise((res, rej) => {
(this as any).api(this.endpoint, {
limit: fetchLimit + 1,
untilDate: this.date ? this.date.getTime() : undefined,
includeMyRenotes: (this as any).os.i.clientSettings.showMyRenotes,
includeRenotedMyNotes: (this as any).os.i.clientSettings.showRenotedMyNotes
}).then(notes => {
if (notes.length == fetchLimit + 1) {
notes.pop();
this.existMore = true;
}
res(notes);
this.fetching = false;
this.$emit('loaded');
}, rej);
}));
},
more() {
if (!this.canFetchMore) return;
this.moreFetching = true;
(this as any).api(this.endpoint, {
limit: fetchLimit + 1,
untilId: (this.$refs.timeline as any).tail().id,
includeMyRenotes: (this as any).os.i.clientSettings.showMyRenotes,
includeRenotedMyNotes: (this as any).os.i.clientSettings.showRenotedMyNotes
}).then(notes => {
if (notes.length == fetchLimit + 1) {
notes.pop();
} else {
this.existMore = false;
}
notes.forEach(n => (this.$refs.timeline as any).append(n));
this.moreFetching = false;
});
},
onNote(note) {
// Prepend a note
(this.$refs.timeline as any).prepend(note);
},
onChangeFollowing() {
this.fetch();
},
focus() {
(this.$refs.timeline as any).focus();
},
warp(date) {
this.date = date;
this.fetch();
}
}
});
</script>

View File

@ -1,59 +1,42 @@
<template> <template>
<mk-ui> <mk-ui>
<span slot="header" @click="showTl = !showTl"> <span slot="header" @click="showNav = true">
<template v-if="showTl">%fa:home%%i18n:@timeline%</template> <span>
<template v-else>%fa:home%ウィジェット</template> <span v-if="src == 'home'">%fa:home%ホーム</span>
<span v-if="src == 'local'">%fa:R comments%ローカル</span>
<span v-if="src == 'global'">%fa:globe%グローバル</span>
<span v-if="src.startsWith('list')">%fa:list%{{ list.title }}</span>
</span>
<span style="margin-left:8px"> <span style="margin-left:8px">
<template v-if="showTl">%fa:angle-down%</template> <template v-if="!showNav">%fa:angle-down%</template>
<template v-else>%fa:angle-up%</template> <template v-else>%fa:angle-up%</template>
</span> </span>
</span> </span>
<template slot="func"> <template slot="func">
<button @click="fn" v-if="showTl">%fa:pencil-alt%</button> <button @click="fn">%fa:pencil-alt%</button>
<button @click="customizing = !customizing" v-else>%fa:cog%</button>
</template> </template>
<main> <main>
<div class="tl"> <div class="nav" v-if="showNav">
<mk-timeline @loaded="onLoaded" v-show="showTl"/> <div class="bg" @click="showNav = false"></div>
<div class="body">
<div>
<span :data-active="src == 'home'" @click="src = 'home'">%fa:home% ホーム</span>
<span :data-active="src == 'local'" @click="src = 'local'">%fa:R comments% ローカル</span>
<span :data-active="src == 'global'" @click="src = 'global'">%fa:globe% グローバル</span>
<template v-if="lists">
<span v-for="l in lists" :data-active="src == 'list:' + l.id" @click="src = 'list:' + l.id; list = l" :key="l.id">%fa:list% {{ l.title }}</span>
</template>
</div>
</div>
</div> </div>
<div class="widgets" v-show="!showTl">
<template v-if="customizing"> <div class="tl">
<header> <x-tl v-if="src == 'home'" ref="tl" key="home" src="home" @loaded="onLoaded"/>
<select v-model="widgetAdderSelected"> <x-tl v-if="src == 'local'" ref="tl" key="local" src="local"/>
<option value="profile">プロフィール</option> <x-tl v-if="src == 'global'" ref="tl" key="global" src="global"/>
<option value="calendar">カレンダー</option> <mk-user-list-timeline v-if="src.startsWith('list:')" ref="tl" key="list" :list="list"/>
<option value="activity">アクティビティ</option>
<option value="rss">RSSリーダー</option>
<option value="photo-stream">フォトストリーム</option>
<option value="slideshow">スライドショー</option>
<option value="version">バージョン</option>
<option value="access-log">アクセスログ</option>
<option value="server">サーバー情報</option>
<option value="donation">寄付のお願い</option>
<option value="nav">ナビゲーション</option>
<option value="tips">ヒント</option>
</select>
<button @click="addWidget">追加</button>
<p><a @click="hint">カスタマイズのヒント</a></p>
</header>
<x-draggable
:list="widgets"
:options="{ handle: '.handle', animation: 150 }"
@sort="onWidgetSort"
>
<div v-for="widget in widgets" class="customize-container" :key="widget.id">
<header>
<span class="handle">%fa:bars%</span>{{ widget.name }}<button class="remove" @click="removeWidget(widget)">%fa:times%</button>
</header>
<div @click="widgetFunc(widget.id)">
<component :is="`mkw-${widget.name}`" :widget="widget" :ref="widget.id" :is-customize-mode="true" :is-mobile="true"/>
</div>
</div>
</x-draggable>
</template>
<template v-else>
<component class="widget" v-for="widget in widgets" :is="`mkw-${widget.name}`" :key="widget.id" :ref="widget.id" :widget="widget" :is-mobile="true" @chosen="warp"/>
</template>
</div> </div>
</main> </main>
</mk-ui> </mk-ui>
@ -61,144 +44,53 @@
<script lang="ts"> <script lang="ts">
import Vue from 'vue'; import Vue from 'vue';
import * as XDraggable from 'vuedraggable';
import * as uuid from 'uuid';
import Progress from '../../../common/scripts/loading'; import Progress from '../../../common/scripts/loading';
import getNoteSummary from '../../../../../renderers/get-note-summary'; import XTl from './home.timeline.vue';
export default Vue.extend({ export default Vue.extend({
components: { components: {
XDraggable XTl
}, },
data() { data() {
return { return {
connection: null, src: 'home',
connectionId: null, list: null,
unreadCount: 0, lists: null,
showTl: true, showNav: false
widgets: [],
customizing: false,
widgetAdderSelected: null
}; };
}, },
created() {
if ((this as any).os.i.clientSettings.mobileHome == null) {
Vue.set((this as any).os.i.clientSettings, 'mobileHome', [{
name: 'calendar',
id: 'a', data: {}
}, {
name: 'activity',
id: 'b', data: {}
}, {
name: 'rss',
id: 'c', data: {}
}, {
name: 'photo-stream',
id: 'd', data: {}
}, {
name: 'donation',
id: 'e', data: {}
}, {
name: 'nav',
id: 'f', data: {}
}, {
name: 'version',
id: 'g', data: {}
}]);
this.widgets = (this as any).os.i.clientSettings.mobileHome;
this.saveHome();
} else {
this.widgets = (this as any).os.i.clientSettings.mobileHome;
}
this.$watch('os.i.clientSettings', i => { watch: {
this.widgets = (this as any).os.i.clientSettings.mobileHome; src() {
}, { this.showNav = false;
deep: true },
});
showNav(v) {
if (v && this.lists === null) {
(this as any).api('users/lists/list').then(lists => {
this.lists = lists;
});
}
}
}, },
mounted() { mounted() {
document.title = 'Misskey'; document.title = 'Misskey';
document.documentElement.style.background = '#313a42'; document.documentElement.style.background = '#313a42';
this.connection = (this as any).os.stream.getConnection();
this.connectionId = (this as any).os.stream.use();
this.connection.on('note', this.onStreamNote);
this.connection.on('mobile_home_updated', this.onHomeUpdated);
document.addEventListener('visibilitychange', this.onVisibilitychange, false);
Progress.start(); Progress.start();
}, },
beforeDestroy() {
this.connection.off('note', this.onStreamNote);
this.connection.off('mobile_home_updated', this.onHomeUpdated);
(this as any).os.stream.dispose(this.connectionId);
document.removeEventListener('visibilitychange', this.onVisibilitychange);
},
methods: { methods: {
fn() { fn() {
(this as any).apis.post(); (this as any).apis.post();
}, },
onLoaded() { onLoaded() {
Progress.done(); Progress.done();
}, },
onStreamNote(note) {
if (document.hidden && note.userId !== (this as any).os.i.id) {
this.unreadCount++;
document.title = `(${this.unreadCount}) ${getNoteSummary(note)}`;
}
},
onVisibilitychange() {
if (!document.hidden) {
this.unreadCount = 0;
document.title = 'Misskey';
}
},
onHomeUpdated(data) {
if (data.home) {
(this as any).os.i.clientSettings.mobileHome = data.home;
this.widgets = data.home;
} else {
const w = (this as any).os.i.clientSettings.mobileHome.find(w => w.id == data.id);
if (w != null) {
w.data = data.data;
this.$refs[w.id][0].preventSave = true;
this.$refs[w.id][0].props = w.data;
this.widgets = (this as any).os.i.clientSettings.mobileHome;
}
}
},
hint() {
alert('ウィジェットを追加/削除したり並べ替えたりできます。ウィジェットを移動するには「三」をドラッグします。ウィジェットを削除するには「x」をタップします。いくつかのウィジェットはタップすることで表示を変更できます。');
},
widgetFunc(id) {
const w = this.$refs[id][0];
if (w.func) w.func();
},
onWidgetSort() {
this.saveHome();
},
addWidget() {
const widget = {
name: this.widgetAdderSelected,
id: uuid(),
data: {}
};
this.widgets.unshift(widget);
this.saveHome();
},
removeWidget(widget) {
this.widgets = this.widgets.filter(w => w.id != widget.id);
this.saveHome();
},
saveHome() {
(this as any).os.i.clientSettings.mobileHome = this.widgets;
(this as any).api('i/update_mobile_home', {
home: this.widgets
});
},
warp() { warp() {
} }
@ -207,53 +99,75 @@ export default Vue.extend({
</script> </script>
<style lang="stylus" scoped> <style lang="stylus" scoped>
@import '~const.styl'
main main
> .nav
> .bg
position fixed
z-index 10000
top 0
left 0
width 100%
height 100%
background rgba(#000, 0.5)
> .tl > .body
> .mk-timeline position fixed
max-width 600px z-index 10001
top 56px
left 0
right 0
width 300px
margin 0 auto margin 0 auto
padding 8px
@media (min-width 500px)
padding 16px
> .widgets
margin 0 auto
max-width 500px
@media (min-width 500px)
padding 8px
> header
padding 8px
background #fff background #fff
border-radius 8px
box-shadow 0 0 16px rgba(0, 0, 0, 0.1)
.widget $balloon-size = 16px
margin 8px
.customize-container &:before
margin 8px content ""
background #fff display block
position absolute
top -($balloon-size * 2)
left s('calc(50% - %s)', $balloon-size)
border-top solid $balloon-size transparent
border-left solid $balloon-size transparent
border-right solid $balloon-size transparent
border-bottom solid $balloon-size $border-color
> header &:after
line-height 32px content ""
background #eee display block
position absolute
> .handle top -($balloon-size * 2) + 1.5px
padding 0 8px left s('calc(50% - %s)', $balloon-size)
border-top solid $balloon-size transparent
> .remove border-left solid $balloon-size transparent
position absolute border-right solid $balloon-size transparent
top 0 border-bottom solid $balloon-size #fff
right 0
padding 0 8px
line-height 32px
> div > div
padding 8px padding 8px 0
> * > *
pointer-events none display block
padding 8px 16px
&[data-active]
color $theme-color-foreground
background $theme-color
&:not([data-active]):hover
background #eee
> .tl
max-width 600px
margin 0 auto
padding 8px
@media (min-width 500px)
padding 16px
</style> </style>

View File

@ -45,9 +45,9 @@
</header> </header>
<nav> <nav>
<div class="nav-container"> <div class="nav-container">
<a :data-is-active="page == 'home'" @click="page = 'home'">%i18n:@overview%</a> <a :data-active="page == 'home'" @click="page = 'home'">%i18n:@overview%</a>
<a :data-is-active="page == 'notes'" @click="page = 'notes'">%i18n:@timeline%</a> <a :data-active="page == 'notes'" @click="page = 'notes'">%i18n:@timeline%</a>
<a :data-is-active="page == 'media'" @click="page = 'media'">%i18n:@media%</a> <a :data-active="page == 'media'" @click="page = 'media'">%i18n:@media%</a>
</div> </div>
</nav> </nav>
<div class="body"> <div class="body">
@ -256,7 +256,7 @@ main
color #657786 color #657786
border-bottom solid 2px transparent border-bottom solid 2px transparent
&[data-is-active] &[data-active]
font-weight bold font-weight bold
color $theme-color color $theme-color
border-color $theme-color border-color $theme-color

View File

@ -1,5 +1,5 @@
import * as mongo from 'mongodb'; import * as mongo from 'mongodb';
import $ from 'cafy'; import $ from 'cafy'; import ID from '../../../../cafy-id';
import deepcopy = require('deepcopy'); import deepcopy = require('deepcopy');
import db from '../db/mongodb'; import db from '../db/mongodb';
import Reaction from './note-reaction'; import Reaction from './note-reaction';

View File

@ -38,4 +38,3 @@ export async function deleteSwSubscription(swSubscription: string | mongo.Object
_id: s._id _id: s._id
}); });
} }

67
src/models/user-list.ts Normal file
View File

@ -0,0 +1,67 @@
import * as mongo from 'mongodb';
import deepcopy = require('deepcopy');
import db from '../db/mongodb';
const UserList = db.get<IUserList>('userList');
export default UserList;
export interface IUserList {
_id: mongo.ObjectID;
createdAt: Date;
title: string;
userId: mongo.ObjectID;
userIds: mongo.ObjectID[];
}
/**
* UserListを物理削除します
*/
export async function deleteUserList(userList: string | mongo.ObjectID | IUserList) {
let u: IUserList;
// Populate
if (mongo.ObjectID.prototype.isPrototypeOf(userList)) {
u = await UserList.findOne({
_id: userList
});
} else if (typeof userList === 'string') {
u = await UserList.findOne({
_id: new mongo.ObjectID(userList)
});
} else {
u = userList as IUserList;
}
if (u == null) return;
// このUserListを削除
await UserList.remove({
_id: u._id
});
}
export const pack = (
userList: string | mongo.ObjectID | IUserList
) => new Promise<any>(async (resolve, reject) => {
let _userList: any;
if (mongo.ObjectID.prototype.isPrototypeOf(userList)) {
_userList = await UserList.findOne({
_id: userList
});
} else if (typeof userList === 'string') {
_userList = await UserList.findOne({
_id: new mongo.ObjectID(userList)
});
} else {
_userList = deepcopy(userList);
}
if (!_userList) throw `invalid userList arg ${userList}`;
// Rename _id to id
_userList.id = _userList._id;
delete _userList._id;
resolve(_userList);
});

View File

@ -1,5 +1,6 @@
import * as mongo from 'mongodb'; import * as mongo from 'mongodb';
import deepcopy = require('deepcopy'); import deepcopy = require('deepcopy');
import sequential = require('promise-sequential');
import rap from '@prezzemolo/rap'; import rap from '@prezzemolo/rap';
import db from '../db/mongodb'; import db from '../db/mongodb';
import Note, { pack as packNote, deleteNote } from './note'; import Note, { pack as packNote, deleteNote } from './note';
@ -20,6 +21,7 @@ import FollowingLog, { deleteFollowingLog } from './following-log';
import FollowedLog, { deleteFollowedLog } from './followed-log'; import FollowedLog, { deleteFollowedLog } from './followed-log';
import SwSubscription, { deleteSwSubscription } from './sw-subscription'; import SwSubscription, { deleteSwSubscription } from './sw-subscription';
import Notification, { deleteNotification } from './notification'; import Notification, { deleteNotification } from './notification';
import UserList, { deleteUserList } from './user-list';
const User = db.get<IUser>('users'); const User = db.get<IUser>('users');
@ -166,9 +168,9 @@ export async function deleteUser(user: string | mongo.ObjectID | IUser) {
).map(x => deleteAccessToken(x))); ).map(x => deleteAccessToken(x)));
// このユーザーのNoteをすべて削除 // このユーザーのNoteをすべて削除
await Promise.all(( //await sequential((
await Note.find({ userId: u._id }) // await Note.find({ userId: u._id })
).map(x => deleteNote(x))); //).map(x => () => deleteNote(x)));
// このユーザーのNoteReactionをすべて削除 // このユーザーのNoteReactionをすべて削除
await Promise.all(( await Promise.all((
@ -260,6 +262,20 @@ export async function deleteUser(user: string | mongo.ObjectID | IUser) {
await Notification.find({ notifierId: u._id }) await Notification.find({ notifierId: u._id })
).map(x => deleteNotification(x))); ).map(x => deleteNotification(x)));
// このユーザーのUserListをすべて削除
await Promise.all((
await UserList.find({ userId: u._id })
).map(x => deleteUserList(x)));
// このユーザーが入っているすべてのUserListからこのユーザーを削除
await Promise.all((
await UserList.find({ userIds: u._id })
).map(x =>
UserList.update({ _id: x._id }, {
$pull: { userIds: u._id }
})
));
// このユーザーを削除 // このユーザーを削除
await User.remove({ await User.remove({
_id: u._id _id: u._id

View File

@ -25,6 +25,10 @@ class MisskeyEvent {
this.publish(`note-stream:${noteId}`, type, typeof value === 'undefined' ? null : value); this.publish(`note-stream:${noteId}`, type, typeof value === 'undefined' ? null : value);
} }
public publishUserListStream(listId: ID, type: string, value?: any): void {
this.publish(`user-list-stream:${listId}`, type, typeof value === 'undefined' ? null : value);
}
public publishMessagingStream(userId: ID, otherpartyId: ID, type: string, value?: any): void { public publishMessagingStream(userId: ID, otherpartyId: ID, type: string, value?: any): void {
this.publish(`messaging-stream:${userId}-${otherpartyId}`, type, typeof value === 'undefined' ? null : value); this.publish(`messaging-stream:${userId}-${otherpartyId}`, type, typeof value === 'undefined' ? null : value);
} }
@ -69,6 +73,7 @@ export default ev.publishUserStream.bind(ev);
export const publishLocalTimelineStream = ev.publishLocalTimelineStream.bind(ev); export const publishLocalTimelineStream = ev.publishLocalTimelineStream.bind(ev);
export const publishGlobalTimelineStream = ev.publishGlobalTimelineStream.bind(ev); export const publishGlobalTimelineStream = ev.publishGlobalTimelineStream.bind(ev);
export const publishDriveStream = ev.publishDriveStream.bind(ev); export const publishDriveStream = ev.publishDriveStream.bind(ev);
export const publishUserListStream = ev.publishUserListStream.bind(ev);
export const publishNoteStream = ev.publishNoteStream.bind(ev); export const publishNoteStream = ev.publishNoteStream.bind(ev);
export const publishMessagingStream = ev.publishMessagingStream.bind(ev); export const publishMessagingStream = ev.publishMessagingStream.bind(ev);
export const publishMessagingIndexStream = ev.publishMessagingIndexStream.bind(ev); export const publishMessagingIndexStream = ev.publishMessagingIndexStream.bind(ev);

View File

@ -414,6 +414,27 @@ const endpoints: Endpoint[] = [
name: 'users/get_frequently_replied_users' name: 'users/get_frequently_replied_users'
}, },
{
name: 'users/lists/show',
withCredential: true,
kind: 'account-read'
},
{
name: 'users/lists/create',
withCredential: true,
kind: 'account-write'
},
{
name: 'users/lists/push',
withCredential: true,
kind: 'account-write'
},
{
name: 'users/lists/list',
withCredential: true,
kind: 'account-read'
},
{ {
name: 'following/create', name: 'following/create',
withCredential: true, withCredential: true,
@ -503,6 +524,14 @@ const endpoints: Endpoint[] = [
max: 100 max: 100
} }
}, },
{
name: 'notes/user-list-timeline',
withCredential: true,
limit: {
duration: ms('10minutes'),
max: 100
}
},
{ {
name: 'notes/mentions', name: 'notes/mentions',
withCredential: true, withCredential: true,

View File

@ -6,9 +6,6 @@ import Note from '../../../../models/note';
/** /**
* Aggregate notes * Aggregate notes
*
* @param {any} params
* @return {Promise<any>}
*/ */
module.exports = params => new Promise(async (res, rej) => { module.exports = params => new Promise(async (res, rej) => {
// Get 'limit' parameter // Get 'limit' parameter

View File

@ -6,9 +6,6 @@ import User from '../../../../models/user';
/** /**
* Aggregate users * Aggregate users
*
* @param {any} params
* @return {Promise<any>}
*/ */
module.exports = params => new Promise(async (res, rej) => { module.exports = params => new Promise(async (res, rej) => {
// Get 'limit' parameter // Get 'limit' parameter

View File

@ -1,7 +1,7 @@
/** /**
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy'; import ID from '../../../../../cafy-id';
import User from '../../../../../models/user'; import User from '../../../../../models/user';
import Note from '../../../../../models/note'; import Note from '../../../../../models/note';
@ -9,9 +9,6 @@ import Note from '../../../../../models/note';
/** /**
* Aggregate activity of a user * Aggregate activity of a user
*
* @param {any} params
* @return {Promise<any>}
*/ */
module.exports = (params) => new Promise(async (res, rej) => { module.exports = (params) => new Promise(async (res, rej) => {
// Get 'limit' parameter // Get 'limit' parameter
@ -19,7 +16,7 @@ module.exports = (params) => new Promise(async (res, rej) => {
if (limitErr) return rej('invalid limit param'); if (limitErr) return rej('invalid limit param');
// Get 'userId' parameter // Get 'userId' parameter
const [userId, userIdErr] = $(params.userId).id().$; const [userId, userIdErr] = $(params.userId).type(ID).$;
if (userIdErr) return rej('invalid userId param'); if (userIdErr) return rej('invalid userId param');
// Lookup user // Lookup user

View File

@ -1,19 +1,16 @@
/** /**
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy'; import ID from '../../../../../cafy-id';
import User from '../../../../../models/user'; import User from '../../../../../models/user';
import FollowedLog from '../../../../../models/followed-log'; import FollowedLog from '../../../../../models/followed-log';
/** /**
* Aggregate followers of a user * Aggregate followers of a user
*
* @param {any} params
* @return {Promise<any>}
*/ */
module.exports = (params) => new Promise(async (res, rej) => { module.exports = (params) => new Promise(async (res, rej) => {
// Get 'userId' parameter // Get 'userId' parameter
const [userId, userIdErr] = $(params.userId).id().$; const [userId, userIdErr] = $(params.userId).type(ID).$;
if (userIdErr) return rej('invalid userId param'); if (userIdErr) return rej('invalid userId param');
// Lookup user // Lookup user

View File

@ -1,19 +1,16 @@
/** /**
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy'; import ID from '../../../../../cafy-id';
import User from '../../../../../models/user'; import User from '../../../../../models/user';
import FollowingLog from '../../../../../models/following-log'; import FollowingLog from '../../../../../models/following-log';
/** /**
* Aggregate following of a user * Aggregate following of a user
*
* @param {any} params
* @return {Promise<any>}
*/ */
module.exports = (params) => new Promise(async (res, rej) => { module.exports = (params) => new Promise(async (res, rej) => {
// Get 'userId' parameter // Get 'userId' parameter
const [userId, userIdErr] = $(params.userId).id().$; const [userId, userIdErr] = $(params.userId).type(ID).$;
if (userIdErr) return rej('invalid userId param'); if (userIdErr) return rej('invalid userId param');
// Lookup user // Lookup user

View File

@ -1,19 +1,16 @@
/** /**
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy'; import ID from '../../../../../cafy-id';
import User from '../../../../../models/user'; import User from '../../../../../models/user';
import Note from '../../../../../models/note'; import Note from '../../../../../models/note';
/** /**
* Aggregate note of a user * Aggregate note of a user
*
* @param {any} params
* @return {Promise<any>}
*/ */
module.exports = (params) => new Promise(async (res, rej) => { module.exports = (params) => new Promise(async (res, rej) => {
// Get 'userId' parameter // Get 'userId' parameter
const [userId, userIdErr] = $(params.userId).id().$; const [userId, userIdErr] = $(params.userId).type(ID).$;
if (userIdErr) return rej('invalid userId param'); if (userIdErr) return rej('invalid userId param');
// Lookup user // Lookup user

View File

@ -1,7 +1,7 @@
/** /**
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy'; import ID from '../../../../../cafy-id';
import User from '../../../../../models/user'; import User from '../../../../../models/user';
import Reaction from '../../../../../models/note-reaction'; import Reaction from '../../../../../models/note-reaction';
@ -13,7 +13,7 @@ import Reaction from '../../../../../models/note-reaction';
*/ */
module.exports = (params) => new Promise(async (res, rej) => { module.exports = (params) => new Promise(async (res, rej) => {
// Get 'userId' parameter // Get 'userId' parameter
const [userId, userIdErr] = $(params.userId).id().$; const [userId, userIdErr] = $(params.userId).type(ID).$;
if (userIdErr) return rej('invalid userId param'); if (userIdErr) return rej('invalid userId param');
// Lookup user // Lookup user

View File

@ -79,7 +79,7 @@ module.exports = async (params, user) => new Promise(async (res, rej) => {
if (descriptionErr) return rej('invalid description param'); if (descriptionErr) return rej('invalid description param');
// Get 'permission' parameter // Get 'permission' parameter
const [permission, permissionErr] = $(params.permission).array('string').unique().$; const [permission, permissionErr] = $(params.permission).array($().string()).unique().$;
if (permissionErr) return rej('invalid permission param'); if (permissionErr) return rej('invalid permission param');
// Get 'callbackUrl' parameter // Get 'callbackUrl' parameter

View File

@ -1,7 +1,7 @@
/** /**
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy'; import ID from '../../../../cafy-id';
import App, { pack } from '../../../../models/app'; import App, { pack } from '../../../../models/app';
/** /**
@ -41,7 +41,7 @@ module.exports = (params, user, app) => new Promise(async (res, rej) => {
const isSecure = user != null && app == null; const isSecure = user != null && app == null;
// Get 'appId' parameter // Get 'appId' parameter
const [appId, appIdErr] = $(params.appId).optional.id().$; const [appId, appIdErr] = $(params.appId).optional.type(ID).$;
if (appIdErr) return rej('invalid appId param'); if (appIdErr) return rej('invalid appId param');
// Get 'nameId' parameter // Get 'nameId' parameter

View File

@ -1,7 +1,7 @@
/** /**
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy'; import ID from '../../../cafy-id';
import Channel, { pack } from '../../../models/channel'; import Channel, { pack } from '../../../models/channel';
/** /**
@ -17,11 +17,11 @@ module.exports = (params, me) => new Promise(async (res, rej) => {
if (limitErr) return rej('invalid limit param'); if (limitErr) return rej('invalid limit param');
// Get 'sinceId' parameter // Get 'sinceId' parameter
const [sinceId, sinceIdErr] = $(params.sinceId).optional.id().$; const [sinceId, sinceIdErr] = $(params.sinceId).optional.type(ID).$;
if (sinceIdErr) return rej('invalid sinceId param'); if (sinceIdErr) return rej('invalid sinceId param');
// Get 'untilId' parameter // Get 'untilId' parameter
const [untilId, untilIdErr] = $(params.untilId).optional.id().$; const [untilId, untilIdErr] = $(params.untilId).optional.type(ID).$;
if (untilIdErr) return rej('invalid untilId param'); if (untilIdErr) return rej('invalid untilId param');
// Check if both of sinceId and untilId is specified // Check if both of sinceId and untilId is specified

View File

@ -8,10 +8,6 @@ import { pack } from '../../../../models/channel';
/** /**
* Create a channel * Create a channel
*
* @param {any} params
* @param {any} user
* @return {Promise<any>}
*/ */
module.exports = async (params, user) => new Promise(async (res, rej) => { module.exports = async (params, user) => new Promise(async (res, rej) => {
// Get 'title' parameter // Get 'title' parameter

View File

@ -1,16 +1,12 @@
/** /**
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy'; import ID from '../../../../cafy-id';
import { default as Channel, IChannel } from '../../../../models/channel'; import { default as Channel, IChannel } from '../../../../models/channel';
import Note, { pack } from '../../../../models/note'; import Note, { pack } from '../../../../models/note';
/** /**
* Show a notes of a channel * Show a notes of a channel
*
* @param {any} params
* @param {any} user
* @return {Promise<any>}
*/ */
module.exports = (params, user) => new Promise(async (res, rej) => { module.exports = (params, user) => new Promise(async (res, rej) => {
// Get 'limit' parameter // Get 'limit' parameter
@ -18,11 +14,11 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
if (limitErr) return rej('invalid limit param'); if (limitErr) return rej('invalid limit param');
// Get 'sinceId' parameter // Get 'sinceId' parameter
const [sinceId, sinceIdErr] = $(params.sinceId).optional.id().$; const [sinceId, sinceIdErr] = $(params.sinceId).optional.type(ID).$;
if (sinceIdErr) return rej('invalid sinceId param'); if (sinceIdErr) return rej('invalid sinceId param');
// Get 'untilId' parameter // Get 'untilId' parameter
const [untilId, untilIdErr] = $(params.untilId).optional.id().$; const [untilId, untilIdErr] = $(params.untilId).optional.type(ID).$;
if (untilIdErr) return rej('invalid untilId param'); if (untilIdErr) return rej('invalid untilId param');
// Check if both of sinceId and untilId is specified // Check if both of sinceId and untilId is specified
@ -31,7 +27,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
} }
// Get 'channelId' parameter // Get 'channelId' parameter
const [channelId, channelIdErr] = $(params.channelId).id().$; const [channelId, channelIdErr] = $(params.channelId).type(ID).$;
if (channelIdErr) return rej('invalid channelId param'); if (channelIdErr) return rej('invalid channelId param');
// Fetch channel // Fetch channel

View File

@ -1,19 +1,15 @@
/** /**
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy'; import ID from '../../../../cafy-id';
import Channel, { IChannel, pack } from '../../../../models/channel'; import Channel, { IChannel, pack } from '../../../../models/channel';
/** /**
* Show a channel * Show a channel
*
* @param {any} params
* @param {any} user
* @return {Promise<any>}
*/ */
module.exports = (params, user) => new Promise(async (res, rej) => { module.exports = (params, user) => new Promise(async (res, rej) => {
// Get 'channelId' parameter // Get 'channelId' parameter
const [channelId, channelIdErr] = $(params.channelId).id().$; const [channelId, channelIdErr] = $(params.channelId).type(ID).$;
if (channelIdErr) return rej('invalid channelId param'); if (channelIdErr) return rej('invalid channelId param');
// Fetch channel // Fetch channel

View File

@ -1,20 +1,16 @@
/** /**
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy'; import ID from '../../../../cafy-id';
import Channel from '../../../../models/channel'; import Channel from '../../../../models/channel';
import Watching from '../../../../models/channel-watching'; import Watching from '../../../../models/channel-watching';
/** /**
* Unwatch a channel * Unwatch a channel
*
* @param {any} params
* @param {any} user
* @return {Promise<any>}
*/ */
module.exports = (params, user) => new Promise(async (res, rej) => { module.exports = (params, user) => new Promise(async (res, rej) => {
// Get 'channelId' parameter // Get 'channelId' parameter
const [channelId, channelIdErr] = $(params.channelId).id().$; const [channelId, channelIdErr] = $(params.channelId).type(ID).$;
if (channelIdErr) return rej('invalid channelId param'); if (channelIdErr) return rej('invalid channelId param');
//#region Fetch channel //#region Fetch channel

View File

@ -1,20 +1,16 @@
/** /**
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy'; import ID from '../../../../cafy-id';
import Channel from '../../../../models/channel'; import Channel from '../../../../models/channel';
import Watching from '../../../../models/channel-watching'; import Watching from '../../../../models/channel-watching';
/** /**
* Watch a channel * Watch a channel
*
* @param {any} params
* @param {any} user
* @return {Promise<any>}
*/ */
module.exports = (params, user) => new Promise(async (res, rej) => { module.exports = (params, user) => new Promise(async (res, rej) => {
// Get 'channelId' parameter // Get 'channelId' parameter
const [channelId, channelIdErr] = $(params.channelId).id().$; const [channelId, channelIdErr] = $(params.channelId).type(ID).$;
if (channelIdErr) return rej('invalid channelId param'); if (channelIdErr) return rej('invalid channelId param');
//#region Fetch channel //#region Fetch channel

View File

@ -1,16 +1,11 @@
/** /**
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy'; import ID from '../../../../cafy-id';
import DriveFile, { pack } from '../../../../models/drive-file'; import DriveFile, { pack } from '../../../../models/drive-file';
/** /**
* Get drive files * Get drive files
*
* @param {any} params
* @param {any} user
* @param {any} app
* @return {Promise<any>}
*/ */
module.exports = async (params, user, app) => { module.exports = async (params, user, app) => {
// Get 'limit' parameter // Get 'limit' parameter
@ -18,11 +13,11 @@ module.exports = async (params, user, app) => {
if (limitErr) throw 'invalid limit param'; if (limitErr) throw 'invalid limit param';
// Get 'sinceId' parameter // Get 'sinceId' parameter
const [sinceId, sinceIdErr] = $(params.sinceId).optional.id().$; const [sinceId, sinceIdErr] = $(params.sinceId).optional.type(ID).$;
if (sinceIdErr) throw 'invalid sinceId param'; if (sinceIdErr) throw 'invalid sinceId param';
// Get 'untilId' parameter // Get 'untilId' parameter
const [untilId, untilIdErr] = $(params.untilId).optional.id().$; const [untilId, untilIdErr] = $(params.untilId).optional.type(ID).$;
if (untilIdErr) throw 'invalid untilId param'; if (untilIdErr) throw 'invalid untilId param';
// Check if both of sinceId and untilId is specified // Check if both of sinceId and untilId is specified
@ -31,7 +26,7 @@ module.exports = async (params, user, app) => {
} }
// Get 'folderId' parameter // Get 'folderId' parameter
const [folderId = null, folderIdErr] = $(params.folderId).optional.nullable.id().$; const [folderId = null, folderIdErr] = $(params.folderId).optional.nullable.type(ID).$;
if (folderIdErr) throw 'invalid folderId param'; if (folderIdErr) throw 'invalid folderId param';
// Get 'type' parameter // Get 'type' parameter

View File

@ -1,17 +1,12 @@
/** /**
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy'; import ID from '../../../../../cafy-id';
import { validateFileName, pack } from '../../../../../models/drive-file'; import { validateFileName, pack } from '../../../../../models/drive-file';
import create from '../../../../../services/drive/add-file'; import create from '../../../../../services/drive/add-file';
/** /**
* Create a file * Create a file
*
* @param {any} file
* @param {any} params
* @param {any} user
* @return {Promise<any>}
*/ */
module.exports = async (file, params, user): Promise<any> => { module.exports = async (file, params, user): Promise<any> => {
if (file == null) { if (file == null) {
@ -34,7 +29,7 @@ module.exports = async (file, params, user): Promise<any> => {
} }
// Get 'folderId' parameter // Get 'folderId' parameter
const [folderId = null, folderIdErr] = $(params.folderId).optional.nullable.id().$; const [folderId = null, folderIdErr] = $(params.folderId).optional.nullable.type(ID).$;
if (folderIdErr) throw 'invalid folderId param'; if (folderIdErr) throw 'invalid folderId param';
try { try {

View File

@ -1,15 +1,11 @@
/** /**
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy'; import ID from '../../../../../cafy-id';
import DriveFile, { pack } from '../../../../../models/drive-file'; import DriveFile, { pack } from '../../../../../models/drive-file';
/** /**
* Find a file(s) * Find a file(s)
*
* @param {any} params
* @param {any} user
* @return {Promise<any>}
*/ */
module.exports = (params, user) => new Promise(async (res, rej) => { module.exports = (params, user) => new Promise(async (res, rej) => {
// Get 'name' parameter // Get 'name' parameter
@ -17,7 +13,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
if (nameErr) return rej('invalid name param'); if (nameErr) return rej('invalid name param');
// Get 'folderId' parameter // Get 'folderId' parameter
const [folderId = null, folderIdErr] = $(params.folderId).optional.nullable.id().$; const [folderId = null, folderIdErr] = $(params.folderId).optional.nullable.type(ID).$;
if (folderIdErr) return rej('invalid folderId param'); if (folderIdErr) return rej('invalid folderId param');
// Issue query // Issue query

View File

@ -1,19 +1,15 @@
/** /**
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy'; import ID from '../../../../../cafy-id';
import DriveFile, { pack } from '../../../../../models/drive-file'; import DriveFile, { pack } from '../../../../../models/drive-file';
/** /**
* Show a file * Show a file
*
* @param {any} params
* @param {any} user
* @return {Promise<any>}
*/ */
module.exports = async (params, user) => { module.exports = async (params, user) => {
// Get 'fileId' parameter // Get 'fileId' parameter
const [fileId, fileIdErr] = $(params.fileId).id().$; const [fileId, fileIdErr] = $(params.fileId).type(ID).$;
if (fileIdErr) throw 'invalid fileId param'; if (fileIdErr) throw 'invalid fileId param';
// Fetch file // Fetch file

View File

@ -1,21 +1,17 @@
/** /**
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy'; import ID from '../../../../../cafy-id';
import DriveFolder from '../../../../../models/drive-folder'; import DriveFolder from '../../../../../models/drive-folder';
import DriveFile, { validateFileName, pack } from '../../../../../models/drive-file'; import DriveFile, { validateFileName, pack } from '../../../../../models/drive-file';
import { publishDriveStream } from '../../../../../publishers/stream'; import { publishDriveStream } from '../../../../../publishers/stream';
/** /**
* Update a file * Update a file
*
* @param {any} params
* @param {any} user
* @return {Promise<any>}
*/ */
module.exports = (params, user) => new Promise(async (res, rej) => { module.exports = (params, user) => new Promise(async (res, rej) => {
// Get 'fileId' parameter // Get 'fileId' parameter
const [fileId, fileIdErr] = $(params.fileId).id().$; const [fileId, fileIdErr] = $(params.fileId).type(ID).$;
if (fileIdErr) return rej('invalid fileId param'); if (fileIdErr) return rej('invalid fileId param');
// Fetch file // Fetch file
@ -35,7 +31,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
if (name) file.filename = name; if (name) file.filename = name;
// Get 'folderId' parameter // Get 'folderId' parameter
const [folderId, folderIdErr] = $(params.folderId).optional.nullable.id().$; const [folderId, folderIdErr] = $(params.folderId).optional.nullable.type(ID).$;
if (folderIdErr) return rej('invalid folderId param'); if (folderIdErr) return rej('invalid folderId param');
if (folderId !== undefined) { if (folderId !== undefined) {

View File

@ -1,7 +1,7 @@
/** /**
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy'; import ID from '../../../../../cafy-id';
import { pack } from '../../../../../models/drive-file'; import { pack } from '../../../../../models/drive-file';
import uploadFromUrl from '../../../../../services/drive/upload-from-url'; import uploadFromUrl from '../../../../../services/drive/upload-from-url';
@ -15,7 +15,7 @@ module.exports = async (params, user): Promise<any> => {
if (urlErr) throw 'invalid url param'; if (urlErr) throw 'invalid url param';
// Get 'folderId' parameter // Get 'folderId' parameter
const [folderId = null, folderIdErr] = $(params.folderId).optional.nullable.id().$; const [folderId = null, folderIdErr] = $(params.folderId).optional.nullable.type(ID).$;
if (folderIdErr) throw 'invalid folderId param'; if (folderIdErr) throw 'invalid folderId param';
return pack(await uploadFromUrl(url, user, folderId)); return pack(await uploadFromUrl(url, user, folderId));

View File

@ -1,16 +1,11 @@
/** /**
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy'; import ID from '../../../../cafy-id';
import DriveFolder, { pack } from '../../../../models/drive-folder'; import DriveFolder, { pack } from '../../../../models/drive-folder';
/** /**
* Get drive folders * Get drive folders
*
* @param {any} params
* @param {any} user
* @param {any} app
* @return {Promise<any>}
*/ */
module.exports = (params, user, app) => new Promise(async (res, rej) => { module.exports = (params, user, app) => new Promise(async (res, rej) => {
// Get 'limit' parameter // Get 'limit' parameter
@ -18,11 +13,11 @@ module.exports = (params, user, app) => new Promise(async (res, rej) => {
if (limitErr) return rej('invalid limit param'); if (limitErr) return rej('invalid limit param');
// Get 'sinceId' parameter // Get 'sinceId' parameter
const [sinceId, sinceIdErr] = $(params.sinceId).optional.id().$; const [sinceId, sinceIdErr] = $(params.sinceId).optional.type(ID).$;
if (sinceIdErr) return rej('invalid sinceId param'); if (sinceIdErr) return rej('invalid sinceId param');
// Get 'untilId' parameter // Get 'untilId' parameter
const [untilId, untilIdErr] = $(params.untilId).optional.id().$; const [untilId, untilIdErr] = $(params.untilId).optional.type(ID).$;
if (untilIdErr) return rej('invalid untilId param'); if (untilIdErr) return rej('invalid untilId param');
// Check if both of sinceId and untilId is specified // Check if both of sinceId and untilId is specified
@ -31,7 +26,7 @@ module.exports = (params, user, app) => new Promise(async (res, rej) => {
} }
// Get 'folderId' parameter // Get 'folderId' parameter
const [folderId = null, folderIdErr] = $(params.folderId).optional.nullable.id().$; const [folderId = null, folderIdErr] = $(params.folderId).optional.nullable.type(ID).$;
if (folderIdErr) return rej('invalid folderId param'); if (folderIdErr) return rej('invalid folderId param');
// Construct query // Construct query

View File

@ -1,16 +1,12 @@
/** /**
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy'; import ID from '../../../../../cafy-id';
import DriveFolder, { isValidFolderName, pack } from '../../../../../models/drive-folder'; import DriveFolder, { isValidFolderName, pack } from '../../../../../models/drive-folder';
import { publishDriveStream } from '../../../../../publishers/stream'; import { publishDriveStream } from '../../../../../publishers/stream';
/** /**
* Create drive folder * Create drive folder
*
* @param {any} params
* @param {any} user
* @return {Promise<any>}
*/ */
module.exports = (params, user) => new Promise(async (res, rej) => { module.exports = (params, user) => new Promise(async (res, rej) => {
// Get 'name' parameter // Get 'name' parameter
@ -18,7 +14,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
if (nameErr) return rej('invalid name param'); if (nameErr) return rej('invalid name param');
// Get 'parentId' parameter // Get 'parentId' parameter
const [parentId = null, parentIdErr] = $(params.parentId).optional.nullable.id().$; const [parentId = null, parentIdErr] = $(params.parentId).optional.nullable.type(ID).$;
if (parentIdErr) return rej('invalid parentId param'); if (parentIdErr) return rej('invalid parentId param');
// If the parent folder is specified // If the parent folder is specified

View File

@ -1,15 +1,11 @@
/** /**
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy'; import ID from '../../../../../cafy-id';
import DriveFolder, { pack } from '../../../../../models/drive-folder'; import DriveFolder, { pack } from '../../../../../models/drive-folder';
/** /**
* Find a folder(s) * Find a folder(s)
*
* @param {any} params
* @param {any} user
* @return {Promise<any>}
*/ */
module.exports = (params, user) => new Promise(async (res, rej) => { module.exports = (params, user) => new Promise(async (res, rej) => {
// Get 'name' parameter // Get 'name' parameter
@ -17,7 +13,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
if (nameErr) return rej('invalid name param'); if (nameErr) return rej('invalid name param');
// Get 'parentId' parameter // Get 'parentId' parameter
const [parentId = null, parentIdErr] = $(params.parentId).optional.nullable.id().$; const [parentId = null, parentIdErr] = $(params.parentId).optional.nullable.type(ID).$;
if (parentIdErr) return rej('invalid parentId param'); if (parentIdErr) return rej('invalid parentId param');
// Issue query // Issue query

View File

@ -1,19 +1,15 @@
/** /**
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy'; import ID from '../../../../../cafy-id';
import DriveFolder, { pack } from '../../../../../models/drive-folder'; import DriveFolder, { pack } from '../../../../../models/drive-folder';
/** /**
* Show a folder * Show a folder
*
* @param {any} params
* @param {any} user
* @return {Promise<any>}
*/ */
module.exports = (params, user) => new Promise(async (res, rej) => { module.exports = (params, user) => new Promise(async (res, rej) => {
// Get 'folderId' parameter // Get 'folderId' parameter
const [folderId, folderIdErr] = $(params.folderId).id().$; const [folderId, folderIdErr] = $(params.folderId).type(ID).$;
if (folderIdErr) return rej('invalid folderId param'); if (folderIdErr) return rej('invalid folderId param');
// Get folder // Get folder

View File

@ -1,20 +1,16 @@
/** /**
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy'; import ID from '../../../../../cafy-id';
import DriveFolder, { isValidFolderName, pack } from '../../../../../models/drive-folder'; import DriveFolder, { isValidFolderName, pack } from '../../../../../models/drive-folder';
import { publishDriveStream } from '../../../../../publishers/stream'; import { publishDriveStream } from '../../../../../publishers/stream';
/** /**
* Update a folder * Update a folder
*
* @param {any} params
* @param {any} user
* @return {Promise<any>}
*/ */
module.exports = (params, user) => new Promise(async (res, rej) => { module.exports = (params, user) => new Promise(async (res, rej) => {
// Get 'folderId' parameter // Get 'folderId' parameter
const [folderId, folderIdErr] = $(params.folderId).id().$; const [folderId, folderIdErr] = $(params.folderId).type(ID).$;
if (folderIdErr) return rej('invalid folderId param'); if (folderIdErr) return rej('invalid folderId param');
// Fetch folder // Fetch folder
@ -34,7 +30,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
if (name) folder.name = name; if (name) folder.name = name;
// Get 'parentId' parameter // Get 'parentId' parameter
const [parentId, parentIdErr] = $(params.parentId).optional.nullable.id().$; const [parentId, parentIdErr] = $(params.parentId).optional.nullable.type(ID).$;
if (parentIdErr) return rej('invalid parentId param'); if (parentIdErr) return rej('invalid parentId param');
if (parentId !== undefined) { if (parentId !== undefined) {
if (parentId === null) { if (parentId === null) {

View File

@ -1,15 +1,11 @@
/** /**
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy'; import ID from '../../../../cafy-id';
import DriveFile, { pack } from '../../../../models/drive-file'; import DriveFile, { pack } from '../../../../models/drive-file';
/** /**
* Get drive stream * Get drive stream
*
* @param {any} params
* @param {any} user
* @return {Promise<any>}
*/ */
module.exports = (params, user) => new Promise(async (res, rej) => { module.exports = (params, user) => new Promise(async (res, rej) => {
// Get 'limit' parameter // Get 'limit' parameter
@ -17,11 +13,11 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
if (limitErr) return rej('invalid limit param'); if (limitErr) return rej('invalid limit param');
// Get 'sinceId' parameter // Get 'sinceId' parameter
const [sinceId, sinceIdErr] = $(params.sinceId).optional.id().$; const [sinceId, sinceIdErr] = $(params.sinceId).optional.type(ID).$;
if (sinceIdErr) return rej('invalid sinceId param'); if (sinceIdErr) return rej('invalid sinceId param');
// Get 'untilId' parameter // Get 'untilId' parameter
const [untilId, untilIdErr] = $(params.untilId).optional.id().$; const [untilId, untilIdErr] = $(params.untilId).optional.type(ID).$;
if (untilIdErr) return rej('invalid untilId param'); if (untilIdErr) return rej('invalid untilId param');
// Check if both of sinceId and untilId is specified // Check if both of sinceId and untilId is specified

View File

@ -1,7 +1,7 @@
/** /**
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy'; import ID from '../../../../cafy-id';
import User from '../../../../models/user'; import User from '../../../../models/user';
import Following from '../../../../models/following'; import Following from '../../../../models/following';
import create from '../../../../services/following/create'; import create from '../../../../services/following/create';
@ -13,7 +13,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
const follower = user; const follower = user;
// Get 'userId' parameter // Get 'userId' parameter
const [userId, userIdErr] = $(params.userId).id().$; const [userId, userIdErr] = $(params.userId).type(ID).$;
if (userIdErr) return rej('invalid userId param'); if (userIdErr) return rej('invalid userId param');
// 自分自身 // 自分自身

View File

@ -1,7 +1,7 @@
/** /**
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy'; import ID from '../../../../cafy-id';
import User from '../../../../models/user'; import User from '../../../../models/user';
import Following from '../../../../models/following'; import Following from '../../../../models/following';
import deleteFollowing from '../../../../services/following/delete'; import deleteFollowing from '../../../../services/following/delete';
@ -13,7 +13,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
const follower = user; const follower = user;
// Get 'userId' parameter // Get 'userId' parameter
const [userId, userIdErr] = $(params.userId).id().$; const [userId, userIdErr] = $(params.userId).type(ID).$;
if (userIdErr) return rej('invalid userId param'); if (userIdErr) return rej('invalid userId param');
// Check if the followee is yourself // Check if the followee is yourself

View File

@ -1,6 +1,5 @@
import $ from 'cafy'; import $ from 'cafy'; import ID from '../../../../cafy-id';
import Following from '../../../../models/following'; import Following from '../../../../models/following';
import { isLocalUser } from '../../../../models/user';
/** /**
* Stalk a user * Stalk a user
@ -9,7 +8,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
const follower = user; const follower = user;
// Get 'userId' parameter // Get 'userId' parameter
const [userId, userIdErr] = $(params.userId).id().$; const [userId, userIdErr] = $(params.userId).type(ID).$;
if (userIdErr) return rej('invalid userId param'); if (userIdErr) return rej('invalid userId param');
// Fetch following // Fetch following

View File

@ -1,4 +1,4 @@
import $ from 'cafy'; import $ from 'cafy'; import ID from '../../../../cafy-id';
import Following from '../../../../models/following'; import Following from '../../../../models/following';
/** /**
@ -8,7 +8,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
const follower = user; const follower = user;
// Get 'userId' parameter // Get 'userId' parameter
const [userId, userIdErr] = $(params.userId).id().$; const [userId, userIdErr] = $(params.userId).type(ID).$;
if (userIdErr) return rej('invalid userId param'); if (userIdErr) return rej('invalid userId param');
// Fetch following // Fetch following

View File

@ -7,10 +7,6 @@ import { pack } from '../../../../models/app';
/** /**
* Get authorized apps of my account * Get authorized apps of my account
*
* @param {any} params
* @param {any} user
* @return {Promise<any>}
*/ */
module.exports = (params, user) => new Promise(async (res, rej) => { module.exports = (params, user) => new Promise(async (res, rej) => {
// Get 'limit' parameter // Get 'limit' parameter

View File

@ -7,10 +7,6 @@ import User from '../../../../models/user';
/** /**
* Change password * Change password
*
* @param {any} params
* @param {any} user
* @return {Promise<any>}
*/ */
module.exports = async (params, user) => new Promise(async (res, rej) => { module.exports = async (params, user) => new Promise(async (res, rej) => {
// Get 'currentPasword' parameter // Get 'currentPasword' parameter

View File

@ -1,7 +1,7 @@
/** /**
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy'; import ID from '../../../../cafy-id';
import Favorite, { pack } from '../../../../models/favorite'; import Favorite, { pack } from '../../../../models/favorite';
/** /**
@ -13,11 +13,11 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
if (limitErr) return rej('invalid limit param'); if (limitErr) return rej('invalid limit param');
// Get 'sinceId' parameter // Get 'sinceId' parameter
const [sinceId, sinceIdErr] = $(params.sinceId).optional.id().$; const [sinceId, sinceIdErr] = $(params.sinceId).optional.type(ID).$;
if (sinceIdErr) return rej('invalid sinceId param'); if (sinceIdErr) return rej('invalid sinceId param');
// Get 'untilId' parameter // Get 'untilId' parameter
const [untilId, untilIdErr] = $(params.untilId).optional.id().$; const [untilId, untilIdErr] = $(params.untilId).optional.type(ID).$;
if (untilIdErr) return rej('invalid untilId param'); if (untilIdErr) return rej('invalid untilId param');
// Check if both of sinceId and untilId is specified // Check if both of sinceId and untilId is specified

View File

@ -1,7 +1,7 @@
/** /**
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy'; import ID from '../../../../cafy-id';
import Notification from '../../../../models/notification'; import Notification from '../../../../models/notification';
import Mute from '../../../../models/mute'; import Mute from '../../../../models/mute';
import { pack } from '../../../../models/notification'; import { pack } from '../../../../models/notification';
@ -22,7 +22,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
if (markAsReadErr) return rej('invalid markAsRead param'); if (markAsReadErr) return rej('invalid markAsRead param');
// Get 'type' parameter // Get 'type' parameter
const [type, typeErr] = $(params.type).optional.array('string').unique().$; const [type, typeErr] = $(params.type).optional.array($().string()).unique().$;
if (typeErr) return rej('invalid type param'); if (typeErr) return rej('invalid type param');
// Get 'limit' parameter // Get 'limit' parameter
@ -30,11 +30,11 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
if (limitErr) return rej('invalid limit param'); if (limitErr) return rej('invalid limit param');
// Get 'sinceId' parameter // Get 'sinceId' parameter
const [sinceId, sinceIdErr] = $(params.sinceId).optional.id().$; const [sinceId, sinceIdErr] = $(params.sinceId).optional.type(ID).$;
if (sinceIdErr) return rej('invalid sinceId param'); if (sinceIdErr) return rej('invalid sinceId param');
// Get 'untilId' parameter // Get 'untilId' parameter
const [untilId, untilIdErr] = $(params.untilId).optional.id().$; const [untilId, untilIdErr] = $(params.untilId).optional.type(ID).$;
if (untilIdErr) return rej('invalid untilId param'); if (untilIdErr) return rej('invalid untilId param');
// Check if both of sinceId and untilId is specified // Check if both of sinceId and untilId is specified

View File

@ -1,21 +1,17 @@
/** /**
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy'; import ID from '../../../../cafy-id';
import User from '../../../../models/user'; import User from '../../../../models/user';
import Note from '../../../../models/note'; import Note from '../../../../models/note';
import { pack } from '../../../../models/user'; import { pack } from '../../../../models/user';
/** /**
* Pin note * Pin note
*
* @param {any} params
* @param {any} user
* @return {Promise<any>}
*/ */
module.exports = async (params, user) => new Promise(async (res, rej) => { module.exports = async (params, user) => new Promise(async (res, rej) => {
// Get 'noteId' parameter // Get 'noteId' parameter
const [noteId, noteIdErr] = $(params.noteId).id().$; const [noteId, noteIdErr] = $(params.noteId).type(ID).$;
if (noteIdErr) return rej('invalid noteId param'); if (noteIdErr) return rej('invalid noteId param');
// Fetch pinee // Fetch pinee

View File

@ -9,10 +9,6 @@ import generateUserToken from '../../common/generate-native-user-token';
/** /**
* Regenerate native token * Regenerate native token
*
* @param {any} params
* @param {any} user
* @return {Promise<any>}
*/ */
module.exports = async (params, user) => new Promise(async (res, rej) => { module.exports = async (params, user) => new Promise(async (res, rej) => {
// Get 'password' parameter // Get 'password' parameter

View File

@ -1,15 +1,11 @@
/** /**
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy'; import ID from '../../../../cafy-id';
import Signin, { pack } from '../../../../models/signin'; import Signin, { pack } from '../../../../models/signin';
/** /**
* Get signin history of my account * Get signin history of my account
*
* @param {any} params
* @param {any} user
* @return {Promise<any>}
*/ */
module.exports = (params, user) => new Promise(async (res, rej) => { module.exports = (params, user) => new Promise(async (res, rej) => {
// Get 'limit' parameter // Get 'limit' parameter
@ -17,11 +13,11 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
if (limitErr) return rej('invalid limit param'); if (limitErr) return rej('invalid limit param');
// Get 'sinceId' parameter // Get 'sinceId' parameter
const [sinceId, sinceIdErr] = $(params.sinceId).optional.id().$; const [sinceId, sinceIdErr] = $(params.sinceId).optional.type(ID).$;
if (sinceIdErr) return rej('invalid sinceId param'); if (sinceIdErr) return rej('invalid sinceId param');
// Get 'untilId' parameter // Get 'untilId' parameter
const [untilId, untilIdErr] = $(params.untilId).optional.id().$; const [untilId, untilIdErr] = $(params.untilId).optional.type(ID).$;
if (untilIdErr) return rej('invalid untilId param'); if (untilIdErr) return rej('invalid untilId param');
// Check if both of sinceId and untilId is specified // Check if both of sinceId and untilId is specified

View File

@ -1,7 +1,7 @@
/** /**
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy'; import ID from '../../../../cafy-id';
import User, { isValidName, isValidDescription, isValidLocation, isValidBirthday, pack } from '../../../../models/user'; import User, { isValidName, isValidDescription, isValidLocation, isValidBirthday, pack } from '../../../../models/user';
import event from '../../../../publishers/stream'; import event from '../../../../publishers/stream';
@ -32,12 +32,12 @@ module.exports = async (params, user, app) => new Promise(async (res, rej) => {
if (birthday !== undefined) user.profile.birthday = birthday; if (birthday !== undefined) user.profile.birthday = birthday;
// Get 'avatarId' parameter // Get 'avatarId' parameter
const [avatarId, avatarIdErr] = $(params.avatarId).optional.id().$; const [avatarId, avatarIdErr] = $(params.avatarId).optional.type(ID).$;
if (avatarIdErr) return rej('invalid avatarId param'); if (avatarIdErr) return rej('invalid avatarId param');
if (avatarId) user.avatarId = avatarId; if (avatarId) user.avatarId = avatarId;
// Get 'bannerId' parameter // Get 'bannerId' parameter
const [bannerId, bannerIdErr] = $(params.bannerId).optional.id().$; const [bannerId, bannerIdErr] = $(params.bannerId).optional.type(ID).$;
if (bannerIdErr) return rej('invalid bannerId param'); if (bannerIdErr) return rej('invalid bannerId param');
if (bannerId) user.bannerId = bannerId; if (bannerId) user.bannerId = bannerId;

View File

@ -7,10 +7,6 @@ import event from '../../../../publishers/stream';
/** /**
* Update myself * Update myself
*
* @param {any} params
* @param {any} user
* @return {Promise<any>}
*/ */
module.exports = async (params, user) => new Promise(async (res, rej) => { module.exports = async (params, user) => new Promise(async (res, rej) => {
// Get 'name' parameter // Get 'name' parameter

View File

@ -8,7 +8,7 @@ import event from '../../../../publishers/stream';
module.exports = async (params, user) => new Promise(async (res, rej) => { module.exports = async (params, user) => new Promise(async (res, rej) => {
// Get 'home' parameter // Get 'home' parameter
const [home, homeErr] = $(params.home).optional.array().each( const [home, homeErr] = $(params.home).optional.array().each(
$().strict.object() $().object(true)
.have('name', $().string()) .have('name', $().string())
.have('id', $().string()) .have('id', $().string())
.have('place', $().string()) .have('place', $().string())

View File

@ -8,7 +8,7 @@ import event from '../../../../publishers/stream';
module.exports = async (params, user) => new Promise(async (res, rej) => { module.exports = async (params, user) => new Promise(async (res, rej) => {
// Get 'home' parameter // Get 'home' parameter
const [home, homeErr] = $(params.home).optional.array().each( const [home, homeErr] = $(params.home).optional.array().each(
$().strict.object() $().object(true)
.have('name', $().string()) .have('name', $().string())
.have('id', $().string()) .have('id', $().string())
.have('data', $().object())).$; .have('data', $().object())).$;

View File

@ -8,10 +8,6 @@ import { pack } from '../../../../models/messaging-message';
/** /**
* Show messaging history * Show messaging history
*
* @param {any} params
* @param {any} user
* @return {Promise<any>}
*/ */
module.exports = (params, user) => new Promise(async (res, rej) => { module.exports = (params, user) => new Promise(async (res, rej) => {
// Get 'limit' parameter // Get 'limit' parameter

View File

@ -1,7 +1,7 @@
/** /**
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy'; import ID from '../../../../cafy-id';
import Message from '../../../../models/messaging-message'; import Message from '../../../../models/messaging-message';
import User from '../../../../models/user'; import User from '../../../../models/user';
import { pack } from '../../../../models/messaging-message'; import { pack } from '../../../../models/messaging-message';
@ -16,7 +16,7 @@ import read from '../../common/read-messaging-message';
*/ */
module.exports = (params, user) => new Promise(async (res, rej) => { module.exports = (params, user) => new Promise(async (res, rej) => {
// Get 'userId' parameter // Get 'userId' parameter
const [recipientId, recipientIdErr] = $(params.userId).id().$; const [recipientId, recipientIdErr] = $(params.userId).type(ID).$;
if (recipientIdErr) return rej('invalid userId param'); if (recipientIdErr) return rej('invalid userId param');
// Fetch recipient // Fetch recipient
@ -41,11 +41,11 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
if (limitErr) return rej('invalid limit param'); if (limitErr) return rej('invalid limit param');
// Get 'sinceId' parameter // Get 'sinceId' parameter
const [sinceId, sinceIdErr] = $(params.sinceId).optional.id().$; const [sinceId, sinceIdErr] = $(params.sinceId).optional.type(ID).$;
if (sinceIdErr) return rej('invalid sinceId param'); if (sinceIdErr) return rej('invalid sinceId param');
// Get 'untilId' parameter // Get 'untilId' parameter
const [untilId, untilIdErr] = $(params.untilId).optional.id().$; const [untilId, untilIdErr] = $(params.untilId).optional.type(ID).$;
if (untilIdErr) return rej('invalid untilId param'); if (untilIdErr) return rej('invalid untilId param');
// Check if both of sinceId and untilId is specified // Check if both of sinceId and untilId is specified

View File

@ -1,7 +1,7 @@
/** /**
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy'; import ID from '../../../../../cafy-id';
import Message from '../../../../../models/messaging-message'; import Message from '../../../../../models/messaging-message';
import { isValidText } from '../../../../../models/messaging-message'; import { isValidText } from '../../../../../models/messaging-message';
import History from '../../../../../models/messaging-history'; import History from '../../../../../models/messaging-history';
@ -16,14 +16,10 @@ import config from '../../../../../config';
/** /**
* Create a message * Create a message
*
* @param {any} params
* @param {any} user
* @return {Promise<any>}
*/ */
module.exports = (params, user) => new Promise(async (res, rej) => { module.exports = (params, user) => new Promise(async (res, rej) => {
// Get 'userId' parameter // Get 'userId' parameter
const [recipientId, recipientIdErr] = $(params.userId).id().$; const [recipientId, recipientIdErr] = $(params.userId).type(ID).$;
if (recipientIdErr) return rej('invalid userId param'); if (recipientIdErr) return rej('invalid userId param');
// Myself // Myself
@ -49,7 +45,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
if (textErr) return rej('invalid text'); if (textErr) return rej('invalid text');
// Get 'fileId' parameter // Get 'fileId' parameter
const [fileId, fileIdErr] = $(params.fileId).optional.id().$; const [fileId, fileIdErr] = $(params.fileId).optional.type(ID).$;
if (fileIdErr) return rej('invalid fileId param'); if (fileIdErr) return rej('invalid fileId param');
let file = null; let file = null;

View File

@ -6,10 +6,6 @@ import Mute from '../../../../models/mute';
/** /**
* Get count of unread messages * Get count of unread messages
*
* @param {any} params
* @param {any} user
* @return {Promise<any>}
*/ */
module.exports = (params, user) => new Promise(async (res, rej) => { module.exports = (params, user) => new Promise(async (res, rej) => {
const mute = await Mute.find({ const mute = await Mute.find({

View File

@ -1,22 +1,18 @@
/** /**
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy'; import ID from '../../../../cafy-id';
import User from '../../../../models/user'; import User from '../../../../models/user';
import Mute from '../../../../models/mute'; import Mute from '../../../../models/mute';
/** /**
* Mute a user * Mute a user
*
* @param {any} params
* @param {any} user
* @return {Promise<any>}
*/ */
module.exports = (params, user) => new Promise(async (res, rej) => { module.exports = (params, user) => new Promise(async (res, rej) => {
const muter = user; const muter = user;
// Get 'userId' parameter // Get 'userId' parameter
const [userId, userIdErr] = $(params.userId).id().$; const [userId, userIdErr] = $(params.userId).type(ID).$;
if (userIdErr) return rej('invalid userId param'); if (userIdErr) return rej('invalid userId param');
// 自分自身 // 自分自身

View File

@ -1,7 +1,7 @@
/** /**
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy'; import ID from '../../../../cafy-id';
import User from '../../../../models/user'; import User from '../../../../models/user';
import Mute from '../../../../models/mute'; import Mute from '../../../../models/mute';
@ -12,7 +12,7 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
const muter = user; const muter = user;
// Get 'userId' parameter // Get 'userId' parameter
const [userId, userIdErr] = $(params.userId).id().$; const [userId, userIdErr] = $(params.userId).type(ID).$;
if (userIdErr) return rej('invalid userId param'); if (userIdErr) return rej('invalid userId param');
// Check if the mutee is yourself // Check if the mutee is yourself

View File

@ -1,17 +1,13 @@
/** /**
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy'; import ID from '../../../../cafy-id';
import Mute from '../../../../models/mute'; import Mute from '../../../../models/mute';
import { pack } from '../../../../models/user'; import { pack } from '../../../../models/user';
import { getFriendIds } from '../../common/get-friends'; import { getFriendIds } from '../../common/get-friends';
/** /**
* Get muted users of a user * Get muted users of a user
*
* @param {any} params
* @param {any} me
* @return {Promise<any>}
*/ */
module.exports = (params, me) => new Promise(async (res, rej) => { module.exports = (params, me) => new Promise(async (res, rej) => {
// Get 'iknow' parameter // Get 'iknow' parameter
@ -23,7 +19,7 @@ module.exports = (params, me) => new Promise(async (res, rej) => {
if (limitErr) return rej('invalid limit param'); if (limitErr) return rej('invalid limit param');
// Get 'cursor' parameter // Get 'cursor' parameter
const [cursor = null, cursorErr] = $(params.cursor).optional.id().$; const [cursor = null, cursorErr] = $(params.cursor).optional.type(ID).$;
if (cursorErr) return rej('invalid cursor param'); if (cursorErr) return rej('invalid cursor param');
// Construct query // Construct query

View File

@ -6,10 +6,6 @@ import App, { pack } from '../../../../models/app';
/** /**
* Get my apps * Get my apps
*
* @param {any} params
* @param {any} user
* @return {Promise<any>}
*/ */
module.exports = (params, user) => new Promise(async (res, rej) => { module.exports = (params, user) => new Promise(async (res, rej) => {
// Get 'limit' parameter // Get 'limit' parameter

View File

@ -1,7 +1,7 @@
/** /**
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy'; import ID from '../../../cafy-id';
import Note, { pack } from '../../../models/note'; import Note, { pack } from '../../../models/note';
/** /**
@ -33,11 +33,11 @@ module.exports = (params) => new Promise(async (res, rej) => {
if (limitErr) return rej('invalid limit param'); if (limitErr) return rej('invalid limit param');
// Get 'sinceId' parameter // Get 'sinceId' parameter
const [sinceId, sinceIdErr] = $(params.sinceId).optional.id().$; const [sinceId, sinceIdErr] = $(params.sinceId).optional.type(ID).$;
if (sinceIdErr) return rej('invalid sinceId param'); if (sinceIdErr) return rej('invalid sinceId param');
// Get 'untilId' parameter // Get 'untilId' parameter
const [untilId, untilIdErr] = $(params.untilId).optional.id().$; const [untilId, untilIdErr] = $(params.untilId).optional.type(ID).$;
if (untilIdErr) return rej('invalid untilId param'); if (untilIdErr) return rej('invalid untilId param');
// Check if both of sinceId and untilId is specified // Check if both of sinceId and untilId is specified

View File

@ -1,7 +1,7 @@
/** /**
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy'; import ID from '../../../../cafy-id';
import Note, { pack } from '../../../../models/note'; import Note, { pack } from '../../../../models/note';
/** /**
@ -13,7 +13,7 @@ import Note, { pack } from '../../../../models/note';
*/ */
module.exports = (params, user) => new Promise(async (res, rej) => { module.exports = (params, user) => new Promise(async (res, rej) => {
// Get 'noteId' parameter // Get 'noteId' parameter
const [noteId, noteIdErr] = $(params.noteId).id().$; const [noteId, noteIdErr] = $(params.noteId).type(ID).$;
if (noteIdErr) return rej('invalid noteId param'); if (noteIdErr) return rej('invalid noteId param');
// Get 'limit' parameter // Get 'limit' parameter

View File

@ -1,7 +1,7 @@
/** /**
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy'; import ID from '../../../../cafy-id';
import Note, { INote, isValidText, isValidCw, pack } from '../../../../models/note'; import Note, { INote, isValidText, isValidCw, pack } from '../../../../models/note';
import { ILocalUser } from '../../../../models/user'; import { ILocalUser } from '../../../../models/user';
import Channel, { IChannel } from '../../../../models/channel'; import Channel, { IChannel } from '../../../../models/channel';
@ -11,11 +11,6 @@ import { IApp } from '../../../../models/app';
/** /**
* Create a note * Create a note
*
* @param {any} params
* @param {any} user
* @param {any} app
* @return {Promise<any>}
*/ */
module.exports = (params, user: ILocalUser, app: IApp) => new Promise(async (res, rej) => { module.exports = (params, user: ILocalUser, app: IApp) => new Promise(async (res, rej) => {
// Get 'visibility' parameter // Get 'visibility' parameter
@ -35,11 +30,11 @@ module.exports = (params, user: ILocalUser, app: IApp) => new Promise(async (res
if (viaMobileErr) return rej('invalid viaMobile'); if (viaMobileErr) return rej('invalid viaMobile');
// Get 'tags' parameter // Get 'tags' parameter
const [tags = [], tagsErr] = $(params.tags).optional.array('string').unique().eachQ(t => t.range(1, 32)).$; const [tags = [], tagsErr] = $(params.tags).optional.array($().string().range(1, 32)).unique().$;
if (tagsErr) return rej('invalid tags'); if (tagsErr) return rej('invalid tags');
// Get 'geo' parameter // Get 'geo' parameter
const [geo, geoErr] = $(params.geo).optional.nullable.strict.object() const [geo, geoErr] = $(params.geo).optional.nullable.object(true)
.have('coordinates', $().array().length(2) .have('coordinates', $().array().length(2)
.item(0, $().number().range(-180, 180)) .item(0, $().number().range(-180, 180))
.item(1, $().number().range(-90, 90))) .item(1, $().number().range(-90, 90)))
@ -52,7 +47,7 @@ module.exports = (params, user: ILocalUser, app: IApp) => new Promise(async (res
if (geoErr) return rej('invalid geo'); if (geoErr) return rej('invalid geo');
// Get 'mediaIds' parameter // Get 'mediaIds' parameter
const [mediaIds, mediaIdsErr] = $(params.mediaIds).optional.array('id').unique().range(1, 4).$; const [mediaIds, mediaIdsErr] = $(params.mediaIds).optional.array($().type(ID)).unique().range(1, 4).$;
if (mediaIdsErr) return rej('invalid mediaIds'); if (mediaIdsErr) return rej('invalid mediaIds');
let files = []; let files = [];
@ -79,7 +74,7 @@ module.exports = (params, user: ILocalUser, app: IApp) => new Promise(async (res
} }
// Get 'renoteId' parameter // Get 'renoteId' parameter
const [renoteId, renoteIdErr] = $(params.renoteId).optional.id().$; const [renoteId, renoteIdErr] = $(params.renoteId).optional.type(ID).$;
if (renoteIdErr) return rej('invalid renoteId'); if (renoteIdErr) return rej('invalid renoteId');
let renote: INote = null; let renote: INote = null;
@ -100,7 +95,7 @@ module.exports = (params, user: ILocalUser, app: IApp) => new Promise(async (res
} }
// Get 'replyId' parameter // Get 'replyId' parameter
const [replyId, replyIdErr] = $(params.replyId).optional.id().$; const [replyId, replyIdErr] = $(params.replyId).optional.type(ID).$;
if (replyIdErr) return rej('invalid replyId'); if (replyIdErr) return rej('invalid replyId');
let reply: INote = null; let reply: INote = null;
@ -121,7 +116,7 @@ module.exports = (params, user: ILocalUser, app: IApp) => new Promise(async (res
} }
// Get 'channelId' parameter // Get 'channelId' parameter
const [channelId, channelIdErr] = $(params.channelId).optional.id().$; const [channelId, channelIdErr] = $(params.channelId).optional.type(ID).$;
if (channelIdErr) return rej('invalid channelId'); if (channelIdErr) return rej('invalid channelId');
let channel: IChannel = null; let channel: IChannel = null;
@ -162,8 +157,8 @@ module.exports = (params, user: ILocalUser, app: IApp) => new Promise(async (res
} }
// Get 'poll' parameter // Get 'poll' parameter
const [poll, pollErr] = $(params.poll).optional.strict.object() const [poll, pollErr] = $(params.poll).optional.object(true)
.have('choices', $().array('string') .have('choices', $().array($().string())
.unique() .unique()
.range(2, 10) .range(2, 10)
.each(c => c.length > 0 && c.length < 50)) .each(c => c.length > 0 && c.length < 50))

View File

@ -1,20 +1,16 @@
/** /**
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy'; import ID from '../../../../../cafy-id';
import Favorite from '../../../../../models/favorite'; import Favorite from '../../../../../models/favorite';
import Note from '../../../../../models/note'; import Note from '../../../../../models/note';
/** /**
* Favorite a note * Favorite a note
*
* @param {any} params
* @param {any} user
* @return {Promise<any>}
*/ */
module.exports = (params, user) => new Promise(async (res, rej) => { module.exports = (params, user) => new Promise(async (res, rej) => {
// Get 'noteId' parameter // Get 'noteId' parameter
const [noteId, noteIdErr] = $(params.noteId).id().$; const [noteId, noteIdErr] = $(params.noteId).type(ID).$;
if (noteIdErr) return rej('invalid noteId param'); if (noteIdErr) return rej('invalid noteId param');
// Get favoritee // Get favoritee

View File

@ -1,20 +1,16 @@
/** /**
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy'; import ID from '../../../../../cafy-id';
import Favorite from '../../../../../models/favorite'; import Favorite from '../../../../../models/favorite';
import Note from '../../../../../models/note'; import Note from '../../../../../models/note';
/** /**
* Unfavorite a note * Unfavorite a note
*
* @param {any} params
* @param {any} user
* @return {Promise<any>}
*/ */
module.exports = (params, user) => new Promise(async (res, rej) => { module.exports = (params, user) => new Promise(async (res, rej) => {
// Get 'noteId' parameter // Get 'noteId' parameter
const [noteId, noteIdErr] = $(params.noteId).id().$; const [noteId, noteIdErr] = $(params.noteId).type(ID).$;
if (noteIdErr) return rej('invalid noteId param'); if (noteIdErr) return rej('invalid noteId param');
// Get favoritee // Get favoritee

View File

@ -1,7 +1,7 @@
/** /**
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy'; import ID from '../../../../cafy-id';
import Note from '../../../../models/note'; import Note from '../../../../models/note';
import Mute from '../../../../models/mute'; import Mute from '../../../../models/mute';
import { pack } from '../../../../models/note'; import { pack } from '../../../../models/note';
@ -15,11 +15,11 @@ module.exports = async (params, user, app) => {
if (limitErr) throw 'invalid limit param'; if (limitErr) throw 'invalid limit param';
// Get 'sinceId' parameter // Get 'sinceId' parameter
const [sinceId, sinceIdErr] = $(params.sinceId).optional.id().$; const [sinceId, sinceIdErr] = $(params.sinceId).optional.type(ID).$;
if (sinceIdErr) throw 'invalid sinceId param'; if (sinceIdErr) throw 'invalid sinceId param';
// Get 'untilId' parameter // Get 'untilId' parameter
const [untilId, untilIdErr] = $(params.untilId).optional.id().$; const [untilId, untilIdErr] = $(params.untilId).optional.type(ID).$;
if (untilIdErr) throw 'invalid untilId param'; if (untilIdErr) throw 'invalid untilId param';
// Get 'sinceDate' parameter // Get 'sinceDate' parameter

View File

@ -1,7 +1,7 @@
/** /**
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy'; import ID from '../../../../cafy-id';
import Note from '../../../../models/note'; import Note from '../../../../models/note';
import Mute from '../../../../models/mute'; import Mute from '../../../../models/mute';
import { pack } from '../../../../models/note'; import { pack } from '../../../../models/note';
@ -15,11 +15,11 @@ module.exports = async (params, user, app) => {
if (limitErr) throw 'invalid limit param'; if (limitErr) throw 'invalid limit param';
// Get 'sinceId' parameter // Get 'sinceId' parameter
const [sinceId, sinceIdErr] = $(params.sinceId).optional.id().$; const [sinceId, sinceIdErr] = $(params.sinceId).optional.type(ID).$;
if (sinceIdErr) throw 'invalid sinceId param'; if (sinceIdErr) throw 'invalid sinceId param';
// Get 'untilId' parameter // Get 'untilId' parameter
const [untilId, untilIdErr] = $(params.untilId).optional.id().$; const [untilId, untilIdErr] = $(params.untilId).optional.type(ID).$;
if (untilIdErr) throw 'invalid untilId param'; if (untilIdErr) throw 'invalid untilId param';
// Get 'sinceDate' parameter // Get 'sinceDate' parameter

View File

@ -1,7 +1,7 @@
/** /**
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy'; import ID from '../../../../cafy-id';
import Note from '../../../../models/note'; import Note from '../../../../models/note';
import { getFriendIds } from '../../common/get-friends'; import { getFriendIds } from '../../common/get-friends';
import { pack } from '../../../../models/note'; import { pack } from '../../../../models/note';
@ -24,11 +24,11 @@ module.exports = (params, user) => new Promise(async (res, rej) => {
if (limitErr) return rej('invalid limit param'); if (limitErr) return rej('invalid limit param');
// Get 'sinceId' parameter // Get 'sinceId' parameter
const [sinceId, sinceIdErr] = $(params.sinceId).optional.id().$; const [sinceId, sinceIdErr] = $(params.sinceId).optional.type(ID).$;
if (sinceIdErr) return rej('invalid sinceId param'); if (sinceIdErr) return rej('invalid sinceId param');
// Get 'untilId' parameter // Get 'untilId' parameter
const [untilId, untilIdErr] = $(params.untilId).optional.id().$; const [untilId, untilIdErr] = $(params.untilId).optional.type(ID).$;
if (untilIdErr) return rej('invalid untilId param'); if (untilIdErr) return rej('invalid untilId param');
// Check if both of sinceId and untilId is specified // Check if both of sinceId and untilId is specified

View File

@ -7,10 +7,6 @@ import Note, { pack } from '../../../../../models/note';
/** /**
* Get recommended polls * Get recommended polls
*
* @param {any} params
* @param {any} user
* @return {Promise<any>}
*/ */
module.exports = (params, user) => new Promise(async (res, rej) => { module.exports = (params, user) => new Promise(async (res, rej) => {
// Get 'limit' parameter // Get 'limit' parameter

View File

@ -1,7 +1,7 @@
/** /**
* Module dependencies * Module dependencies
*/ */
import $ from 'cafy'; import $ from 'cafy'; import ID from '../../../../../cafy-id';
import Vote from '../../../../../models/poll-vote'; import Vote from '../../../../../models/poll-vote';
import Note from '../../../../../models/note'; import Note from '../../../../../models/note';
import Watching from '../../../../../models/note-watching'; import Watching from '../../../../../models/note-watching';
@ -11,14 +11,10 @@ import notify from '../../../../../publishers/notify';
/** /**
* Vote poll of a note * Vote poll of a note
*
* @param {any} params
* @param {any} user
* @return {Promise<any>}
*/ */
module.exports = (params, user) => new Promise(async (res, rej) => { module.exports = (params, user) => new Promise(async (res, rej) => {
// Get 'noteId' parameter // Get 'noteId' parameter
const [noteId, noteIdErr] = $(params.noteId).id().$; const [noteId, noteIdErr] = $(params.noteId).type(ID).$;
if (noteIdErr) return rej('invalid noteId param'); if (noteIdErr) return rej('invalid noteId param');
// Get votee // Get votee

Some files were not shown because too many files have changed in this diff Show More