kaslo/pawkey-sk
1
0
Fork 0
Code Packages Activity

wip

Browse Source
This commit is contained in:
syuilo
2018-03-28 16:39:14 +09:00
parent 7d4d9dbaa6
commit 3d5cdb8d2d
237 changed files with 1661 additions and 1354 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/web/app/mobile/views/components/activity.vue
+1 -1
View File
@@ -29,7 +29,7 @@ export default Vue.extend({
},
mounted() {
(this as any).api('aggregation/users/activity', {
user_id: this.user.id,
userId: this.user.id,
limit: 30
}).then(data => {
data.forEach(d => d.total = d.posts + d.replies + d.reposts);
src/web/app/mobile/views/components/drive.file-detail.vue
+7 -7
View File
@@ -29,7 +29,7 @@
<span class="separator"></span>
<span class="data-size">{{ file.datasize | bytes }}</span>
<span class="separator"></span>
<span class="created-at" @click="showCreatedAt">%fa:R clock%<mk-time :time="file.created_at"/></span>
<span class="created-at" @click="showCreatedAt">%fa:R clock%<mk-time :time="file.createdAt"/></span>
</div>
</div>
<div class="menu">
@@ -86,8 +86,8 @@ export default Vue.extend({
return this.file.type.split('/')[0];
},
style(): any {
return this.file.properties.average_color ? {
'background-color': `rgb(${ this.file.properties.average_color.join(',') })`
return this.file.properties.avgColor ? {
'background-color': `rgb(${ this.file.properties.avgColor.join(',') })`
} : {};
}
},
@@ -96,7 +96,7 @@ export default Vue.extend({
const name = window.prompt('名前を変更', this.file.name);
if (name == null || name == '' || name == this.file.name) return;
(this as any).api('drive/files/update', {
file_id: this.file.id,
fileId: this.file.id,
name: name
}).then(() => {
this.browser.cf(this.file, true);
@@ -105,15 +105,15 @@ export default Vue.extend({
move() {
(this as any).apis.chooseDriveFolder().then(folder => {
(this as any).api('drive/files/update', {
file_id: this.file.id,
folder_id: folder == null ? null : folder.id
fileId: this.file.id,
folderId: folder == null ? null : folder.id
}).then(() => {
this.browser.cf(this.file, true);
});
});
},
showCreatedAt() {
alert(new Date(this.file.created_at).toLocaleString());
alert(new Date(this.file.createdAt).toLocaleString());
},
onImageLoaded() {
const self = this;
src/web/app/mobile/views/components/drive.file.vue
+2 -2
View File
@@ -19,7 +19,7 @@
<p class="data-size">{{ file.datasize | bytes }}</p>
<p class="separator"></p>
<p class="created-at">
%fa:R clock%<mk-time :time="file.created_at"/>
%fa:R clock%<mk-time :time="file.createdAt"/>
</p>
</footer>
</div>
@@ -42,7 +42,7 @@ export default Vue.extend({
},
thumbnail(): any {
return {
'background-color': this.file.properties.average_color ? `rgb(${this.file.properties.average_color.join(',')})` : 'transparent',
'background-color': this.file.properties.avgColor ? `rgb(${this.file.properties.avgColor.join(',')})` : 'transparent',
'background-image': `url(${this.file.url}?thumbnail&size=128)`
};
}
src/web/app/mobile/views/components/drive.vue
+14 -14
View File
@@ -129,7 +129,7 @@ export default Vue.extend({
onStreamDriveFileUpdated(file) {
const current = this.folder ? this.folder.id : null;
if (current != file.folder_id) {
if (current != file.folderId) {
this.removeFile(file);
} else {
this.addFile(file, true);
@@ -142,7 +142,7 @@ export default Vue.extend({
onStreamDriveFolderUpdated(folder) {
const current = this.folder ? this.folder.id : null;
if (current != folder.parent_id) {
if (current != folder.parentId) {
this.removeFolder(folder);
} else {
this.addFolder(folder, true);
@@ -167,7 +167,7 @@ export default Vue.extend({
this.fetching = true;
(this as any).api('drive/folders/show', {
folder_id: target
folderId: target
}).then(folder => {
this.folder = folder;
this.hierarchyFolders = [];
@@ -182,7 +182,7 @@ export default Vue.extend({
addFolder(folder, unshift = false) {
const current = this.folder ? this.folder.id : null;
// 追加しようとしているフォルダが、今居る階層とは違う階層のものだったら中断
if (current != folder.parent_id) return;
if (current != folder.parentId) return;
// 追加しようとしているフォルダを既に所有してたら中断
if (this.folders.some(f => f.id == folder.id)) return;
@@ -197,7 +197,7 @@ export default Vue.extend({
addFile(file, unshift = false) {
const current = this.folder ? this.folder.id : null;
// 追加しようとしているファイルが、今居る階層とは違う階層のものだったら中断
if (current != file.folder_id) return;
if (current != file.folderId) return;
if (this.files.some(f => f.id == file.id)) {
const exist = this.files.map(f => f.id).indexOf(file.id);
@@ -262,7 +262,7 @@ export default Vue.extend({
// フォルダ一覧取得
(this as any).api('drive/folders', {
folder_id: this.folder ? this.folder.id : null,
folderId: this.folder ? this.folder.id : null,
limit: foldersMax + 1
}).then(folders => {
if (folders.length == foldersMax + 1) {
@@ -275,7 +275,7 @@ export default Vue.extend({
// ファイル一覧取得
(this as any).api('drive/files', {
folder_id: this.folder ? this.folder.id : null,
folderId: this.folder ? this.folder.id : null,
limit: filesMax + 1
}).then(files => {
if (files.length == filesMax + 1) {
@@ -318,7 +318,7 @@ export default Vue.extend({
// ファイル一覧取得
(this as any).api('drive/files', {
folder_id: this.folder ? this.folder.id : null,
folderId: this.folder ? this.folder.id : null,
limit: max + 1,
until_id: this.files[this.files.length - 1].id
}).then(files => {
@@ -357,7 +357,7 @@ export default Vue.extend({
this.fetching = true;
(this as any).api('drive/files/show', {
file_id: file
fileId: file
}).then(file => {
this.file = file;
this.folder = null;
@@ -405,7 +405,7 @@ export default Vue.extend({
if (name == null || name == '') return;
(this as any).api('drive/folders/create', {
name: name,
parent_id: this.folder ? this.folder.id : undefined
parentId: this.folder ? this.folder.id : undefined
}).then(folder => {
this.addFolder(folder, true);
});
@@ -420,7 +420,7 @@ export default Vue.extend({
if (name == null || name == '') return;
(this as any).api('drive/folders/update', {
name: name,
folder_id: this.folder.id
folderId: this.folder.id
}).then(folder => {
this.cd(folder);
});
@@ -433,8 +433,8 @@ export default Vue.extend({
}
(this as any).apis.chooseDriveFolder().then(folder => {
(this as any).api('drive/folders/update', {
parent_id: folder ? folder.id : null,
folder_id: this.folder.id
parentId: folder ? folder.id : null,
folderId: this.folder.id
}).then(folder => {
this.cd(folder);
});
@@ -446,7 +446,7 @@ export default Vue.extend({
if (url == null || url == '') return;
(this as any).api('drive/files/upload_from_url', {
url: url,
folder_id: this.folder ? this.folder.id : undefined
folderId: this.folder ? this.folder.id : undefined
});
alert('アップロードをリクエストしました。アップロードが完了するまで時間がかかる場合があります。');
},
src/web/app/mobile/views/components/follow-button.vue
+2 -2
View File
@@ -57,7 +57,7 @@ export default Vue.extend({
this.wait = true;
if (this.user.is_following) {
(this as any).api('following/delete', {
user_id: this.user.id
userId: this.user.id
}).then(() => {
this.user.is_following = false;
}).catch(err => {
@@ -67,7 +67,7 @@ export default Vue.extend({
});
} else {
(this as any).api('following/create', {
user_id: this.user.id
userId: this.user.id
}).then(() => {
this.user.is_following = true;
}).catch(err => {
src/web/app/mobile/views/components/media-image.vue
+1 -1
View File
@@ -10,7 +10,7 @@ export default Vue.extend({
computed: {
style(): any {
return {
'background-color': this.image.properties.average_color ? `rgb(${this.image.properties.average_color.join(',')})` : 'transparent',
'background-color': this.image.properties.avgColor ? `rgb(${this.image.properties.avgColor.join(',')})` : 'transparent',
'background-image': `url(${this.image.url}?thumbnail&size=512)`
};
}
src/web/app/mobile/views/components/notification.vue
+4 -4
View File
@@ -1,7 +1,7 @@
<template>
<div class="mk-notification">
<div class="notification reaction" v-if="notification.type == 'reaction'">
<mk-time :time="notification.created_at"/>
<mk-time :time="notification.createdAt"/>
<router-link class="avatar-anchor" :to="`/@${acct}`">
<img class="avatar" :src="`${notification.user.avatar_url}?thumbnail&size=64`" alt="avatar"/>
</router-link>
@@ -18,7 +18,7 @@
</div>
<div class="notification repost" v-if="notification.type == 'repost'">
<mk-time :time="notification.created_at"/>
<mk-time :time="notification.createdAt"/>
<router-link class="avatar-anchor" :to="`/@${acct}`">
<img class="avatar" :src="`${notification.post.user.avatar_url}?thumbnail&size=64`" alt="avatar"/>
</router-link>
@@ -38,7 +38,7 @@
</template>
<div class="notification follow" v-if="notification.type == 'follow'">
<mk-time :time="notification.created_at"/>
<mk-time :time="notification.createdAt"/>
<router-link class="avatar-anchor" :to="`/@${acct}`">
<img class="avatar" :src="`${notification.user.avatar_url}?thumbnail&size=64`" alt="avatar"/>
</router-link>
@@ -59,7 +59,7 @@
</template>
<div class="notification poll_vote" v-if="notification.type == 'poll_vote'">
<mk-time :time="notification.created_at"/>
<mk-time :time="notification.createdAt"/>
<router-link class="avatar-anchor" :to="`/@${acct}`">
<img class="avatar" :src="`${notification.user.avatar_url}?thumbnail&size=64`" alt="avatar"/>
</router-link>
src/web/app/mobile/views/components/notifications.vue
+2 -2
View File
@@ -34,8 +34,8 @@ export default Vue.extend({
computed: {
_notifications(): any[] {
return (this.notifications as any).map(notification => {
const date = new Date(notification.created_at).getDate();
const month = new Date(notification.created_at).getMonth() + 1;
const date = new Date(notification.createdAt).getDate();
const month = new Date(notification.createdAt).getMonth() + 1;
notification._date = date;
notification._datetext = `${month}月 ${date}日`;
return notification;
src/web/app/mobile/views/components/post-card.vue
+1 -1
View File
@@ -7,7 +7,7 @@
<div>
{{ text }}
</div>
<mk-time :time="post.created_at"/>
<mk-time :time="post.createdAt"/>
</a>
</div>
</template>
src/web/app/mobile/views/components/post-detail.sub.vue
+1 -1
View File
@@ -8,7 +8,7 @@
<router-link class="name" :to="`/@${acct}`">{{ post.user.name }}</router-link>
<span class="username">@{{ acct }}</span>
<router-link class="time" :to="`/@${acct}/${post.id}`">
<mk-time :time="post.created_at"/>
<mk-time :time="post.createdAt"/>
</router-link>
</header>
<div class="body">
src/web/app/mobile/views/components/post-detail.vue
+6 -6
View File
@@ -2,7 +2,7 @@
<div class="mk-post-detail">
<button
class="more"
v-if="p.reply && p.reply.reply_id && context == null"
v-if="p.reply && p.reply.replyId && context == null"
@click="fetchContext"
:disabled="fetchingContext"
>
@@ -54,7 +54,7 @@
</div>
</div>
<router-link class="time" :to="`/@${pAcct}/${p.id}`">
<mk-time :time="p.created_at" mode="detail"/>
<mk-time :time="p.createdAt" mode="detail"/>
</router-link>
<footer>
<mk-reactions-viewer :post="p"/>
@@ -115,7 +115,7 @@ export default Vue.extend({
isRepost(): boolean {
return (this.post.repost &&
this.post.text == null &&
this.post.media_ids == null &&
this.post.mediaIds == null &&
this.post.poll == null);
},
p(): any {
@@ -142,7 +142,7 @@ export default Vue.extend({
// Get replies
if (!this.compact) {
(this as any).api('posts/replies', {
post_id: this.p.id,
postId: this.p.id,
limit: 8
}).then(replies => {
this.replies = replies;
@@ -151,7 +151,7 @@ export default Vue.extend({
// Draw map
if (this.p.geo) {
const shouldShowMap = (this as any).os.isSignedIn ? (this as any).os.i.account.client_settings.showMaps : true;
const shouldShowMap = (this as any).os.isSignedIn ? (this as any).os.i.account.clientSettings.showMaps : true;
if (shouldShowMap) {
(this as any).os.getGoogleMaps().then(maps => {
const uluru = new maps.LatLng(this.p.geo.latitude, this.p.geo.longitude);
@@ -173,7 +173,7 @@ export default Vue.extend({
// Fetch context
(this as any).api('posts/context', {
post_id: this.p.reply_id
postId: this.p.replyId
}).then(context => {
this.contextFetching = false;
this.context = context.reverse();
src/web/app/mobile/views/components/post-form.vue
+4 -4
View File
@@ -111,11 +111,11 @@ export default Vue.extend({
},
post() {
this.posting = true;
const viaMobile = (this as any).os.i.account.client_settings.disableViaMobile !== true;
const viaMobile = (this as any).os.i.account.clientSettings.disableViaMobile !== true;
(this as any).api('posts/create', {
text: this.text == '' ? undefined : this.text,
media_ids: this.files.length > 0 ? this.files.map(f => f.id) : undefined,
reply_id: this.reply ? this.reply.id : undefined,
mediaIds: this.files.length > 0 ? this.files.map(f => f.id) : undefined,
replyId: this.reply ? this.reply.id : undefined,
poll: this.poll ? (this.$refs.poll as any).get() : undefined,
geo: this.geo ? {
latitude: this.geo.latitude,
@@ -126,7 +126,7 @@ export default Vue.extend({
heading: isNaN(this.geo.heading) ? null : this.geo.heading,
speed: this.geo.speed,
} : null,
via_mobile: viaMobile
viaMobile: viaMobile
}).then(data => {
this.$emit('post');
this.$destroy();
src/web/app/mobile/views/components/post-preview.vue
+1 -1
View File
@@ -8,7 +8,7 @@
<router-link class="name" :to="`/@${acct}`">{{ post.user.name }}</router-link>
<span class="username">@{{ acct }}</span>
<router-link class="time" :to="`/@${acct}/${post.id}`">
<mk-time :time="post.created_at"/>
<mk-time :time="post.createdAt"/>
</router-link>
</header>
<div class="body">
src/web/app/mobile/views/components/post.sub.vue
+1 -1
View File
@@ -8,7 +8,7 @@
<router-link class="name" :to="`/@${acct}`">{{ post.user.name }}</router-link>
<span class="username">@{{ acct }}</span>
<router-link class="created-at" :to="`/@${acct}/${post.id}`">
<mk-time :time="post.created_at"/>
<mk-time :time="post.createdAt"/>
</router-link>
</header>
<div class="body">
src/web/app/mobile/views/components/post.vue
+7 -7
View File
@@ -13,7 +13,7 @@
<router-link class="name" :to="`/@${acct}`">{{ post.user.name }}</router-link>
<span>{{ '%i18n:mobile.tags.mk-timeline-post.reposted-by%'.substr('%i18n:mobile.tags.mk-timeline-post.reposted-by%'.indexOf('}') + 1) }}</span>
</p>
<mk-time :time="post.created_at"/>
<mk-time :time="post.createdAt"/>
</div>
<article>
<router-link class="avatar-anchor" :to="`/@${pAcct}`">
@@ -22,12 +22,12 @@
<div class="main">
<header>
<router-link class="name" :to="`/@${pAcct}`">{{ p.user.name }}</router-link>
<span class="is-bot" v-if="p.user.host === null && p.user.account.is_bot">bot</span>
<span class="is-bot" v-if="p.user.host === null && p.user.account.isBot">bot</span>
<span class="username">@{{ pAcct }}</span>
<div class="info">
<span class="mobile" v-if="p.via_mobile">%fa:mobile-alt%</span>
<span class="mobile" v-if="p.viaMobile">%fa:mobile-alt%</span>
<router-link class="created-at" :to="url">
<mk-time :time="p.created_at"/>
<mk-time :time="p.createdAt"/>
</router-link>
</div>
</header>
@@ -103,7 +103,7 @@ export default Vue.extend({
isRepost(): boolean {
return (this.post.repost &&
this.post.text == null &&
this.post.media_ids == null &&
this.post.mediaIds == null &&
this.post.poll == null);
},
p(): any {
@@ -144,7 +144,7 @@ export default Vue.extend({
// Draw map
if (this.p.geo) {
const shouldShowMap = (this as any).os.isSignedIn ? (this as any).os.i.account.client_settings.showMaps : true;
const shouldShowMap = (this as any).os.isSignedIn ? (this as any).os.i.account.clientSettings.showMaps : true;
if (shouldShowMap) {
(this as any).os.getGoogleMaps().then(maps => {
const uluru = new maps.LatLng(this.p.geo.latitude, this.p.geo.longitude);
@@ -194,7 +194,7 @@ export default Vue.extend({
const post = data.post;
if (post.id == this.post.id) {
this.$emit('update:post', post);
} else if (post.id == this.post.repost_id) {
} else if (post.id == this.post.repostId) {
this.post.repost = post;
}
},
src/web/app/mobile/views/components/posts.vue
+2 -2
View File
@@ -28,8 +28,8 @@ export default Vue.extend({
computed: {
_posts(): any[] {
return (this.posts as any).map(post => {
const date = new Date(post.created_at).getDate();
const month = new Date(post.created_at).getMonth() + 1;
const date = new Date(post.createdAt).getDate();
const month = new Date(post.createdAt).getMonth() + 1;
post._date = date;
post._datetext = `${month}月 ${date}日`;
return post;
src/web/app/mobile/views/components/sub-post-content.vue
+2 -2
View File
@@ -1,9 +1,9 @@
<template>
<div class="mk-sub-post-content">
<div class="body">
<a class="reply" v-if="post.reply_id">%fa:reply%</a>
<a class="reply" v-if="post.replyId">%fa:reply%</a>
<mk-post-html v-if="post.ast" :ast="post.ast" :i="os.i"/>
<a class="rp" v-if="post.repost_id">RP: ...</a>
<a class="rp" v-if="post.repostId">RP: ...</a>
</div>
<details v-if="post.media">
<summary>({{ post.media.length }}個のメディア)</summary>
src/web/app/mobile/views/components/timeline.vue
+1 -1
View File
@@ -41,7 +41,7 @@ export default Vue.extend({
},
computed: {
alone(): boolean {
return (this as any).os.i.following_count == 0;
return (this as any).os.i.followingCount == 0;
}
},
mounted() {
src/web/app/mobile/views/components/ui.header.vue
+2 -2
View File
@@ -57,9 +57,9 @@ export default Vue.extend({
}
});
const ago = (new Date().getTime() - new Date((this as any).os.i.account.last_used_at).getTime()) / 1000
const ago = (new Date().getTime() - new Date((this as any).os.i.account.lastUsedAt).getTime()) / 1000
const isHisasiburi = ago >= 3600;
(this as any).os.i.account.last_used_at = new Date();
(this as any).os.i.account.lastUsedAt = new Date();
if (isHisasiburi) {
(this.$refs.welcomeback as any).style.display = 'block';
(this.$refs.main as any).style.overflow = 'hidden';
src/web/app/mobile/views/components/user-timeline.vue
+2 -2
View File
@@ -33,7 +33,7 @@ export default Vue.extend({
},
mounted() {
(this as any).api('users/posts', {
user_id: this.user.id,
userId: this.user.id,
with_media: this.withMedia,
limit: limit + 1
}).then(posts => {
@@ -50,7 +50,7 @@ export default Vue.extend({
more() {
this.moreFetching = true;
(this as any).api('users/posts', {
user_id: this.user.id,
userId: this.user.id,
with_media: this.withMedia,
limit: limit + 1,
until_id: this.posts[this.posts.length - 1].id