1
0

Implement remote account resolution

This commit is contained in:
Akihiko Odaki
2018-03-27 16:51:12 +09:00
parent bee892d446
commit 68ce6d5748
73 changed files with 735 additions and 334 deletions
+1 -1
View File
@@ -57,7 +57,7 @@ init((launch) => {
{ path: '/i/settings/profile', component: MkProfileSetting },
{ path: '/i/notifications', component: MkNotifications },
{ path: '/i/messaging', component: MkMessaging },
{ path: '/i/messaging/:username', component: MkMessagingRoom },
{ path: '/i/messaging/:user', component: MkMessagingRoom },
{ path: '/i/drive', component: MkDrive },
{ path: '/i/drive/folder/:folder', component: MkDrive },
{ path: '/i/drive/file/:file', component: MkDrive },
@@ -2,15 +2,15 @@
<div class="mk-notification">
<div class="notification reaction" v-if="notification.type == 'reaction'">
<mk-time :time="notification.created_at"/>
<router-link class="avatar-anchor" :to="`/@${notification.user.username}`">
<router-link class="avatar-anchor" :to="`/@${acct}`">
<img class="avatar" :src="`${notification.user.avatar_url}?thumbnail&size=64`" alt="avatar"/>
</router-link>
<div class="text">
<p>
<mk-reaction-icon :reaction="notification.reaction"/>
<router-link :to="`/@${notification.user.username}`">{{ notification.user.name }}</router-link>
<router-link :to="`/@${acct}`">{{ notification.user.name }}</router-link>
</p>
<router-link class="post-ref" :to="`/@${notification.post.user.username}/${notification.post.id}`">
<router-link class="post-ref" :to="`/@${acct}/${notification.post.id}`">
%fa:quote-left%{{ getPostSummary(notification.post) }}
%fa:quote-right%
</router-link>
@@ -19,15 +19,15 @@
<div class="notification repost" v-if="notification.type == 'repost'">
<mk-time :time="notification.created_at"/>
<router-link class="avatar-anchor" :to="`/@${notification.post.user.username}`">
<router-link class="avatar-anchor" :to="`/@${acct}`">
<img class="avatar" :src="`${notification.post.user.avatar_url}?thumbnail&size=64`" alt="avatar"/>
</router-link>
<div class="text">
<p>
%fa:retweet%
<router-link :to="`/@${notification.post.user.username}`">{{ notification.post.user.name }}</router-link>
<router-link :to="`/@${acct}`">{{ notification.post.user.name }}</router-link>
</p>
<router-link class="post-ref" :to="`/@${notification.post.user.username}/${notification.post.id}`">
<router-link class="post-ref" :to="`/@${acct}/${notification.post.id}`">
%fa:quote-left%{{ getPostSummary(notification.post.repost) }}%fa:quote-right%
</router-link>
</div>
@@ -39,13 +39,13 @@
<div class="notification follow" v-if="notification.type == 'follow'">
<mk-time :time="notification.created_at"/>
<router-link class="avatar-anchor" :to="`/@${notification.user.username}`">
<router-link class="avatar-anchor" :to="`/@${acct}`">
<img class="avatar" :src="`${notification.user.avatar_url}?thumbnail&size=64`" alt="avatar"/>
</router-link>
<div class="text">
<p>
%fa:user-plus%
<router-link :to="`/@${notification.user.username}`">{{ notification.user.name }}</router-link>
<router-link :to="`/@${acct}`">{{ notification.user.name }}</router-link>
</p>
</div>
</div>
@@ -60,15 +60,15 @@
<div class="notification poll_vote" v-if="notification.type == 'poll_vote'">
<mk-time :time="notification.created_at"/>
<router-link class="avatar-anchor" :to="`/@${notification.user.username}`">
<router-link class="avatar-anchor" :to="`/@${acct}`">
<img class="avatar" :src="`${notification.user.avatar_url}?thumbnail&size=64`" alt="avatar"/>
</router-link>
<div class="text">
<p>
%fa:chart-pie%
<router-link :to="`/@${notification.user.username}`">{{ notification.user.name }}</router-link>
<router-link :to="`/@${acct}`">{{ notification.user.name }}</router-link>
</p>
<router-link class="post-ref" :to="`/@${notification.post.user.username}/${notification.post.id}`">
<router-link class="post-ref" :to="`/@${acct}/${notification.post.id}`">
%fa:quote-left%{{ getPostSummary(notification.post) }}%fa:quote-right%
</router-link>
</div>
@@ -79,9 +79,15 @@
<script lang="ts">
import Vue from 'vue';
import getPostSummary from '../../../../../common/get-post-summary';
import getAcct from '../../../../../common/user/get-acct';
export default Vue.extend({
props: ['notification'],
computed: {
acct() {
return getAcct(this.notification.user);
}
},
data() {
return {
getPostSummary
@@ -1,8 +1,8 @@
<template>
<div class="mk-post-card">
<a :href="`/@${post.user.username}/${post.id}`">
<a :href="`/@${acct}/${post.id}`">
<header>
<img :src="`${post.user.avatar_url}?thumbnail&size=64`" alt="avatar"/><h3>{{ post.user.name }}</h3>
<img :src="`${acct}?thumbnail&size=64`" alt="avatar"/><h3>{{ post.user.name }}</h3>
</header>
<div>
{{ text }}
@@ -15,10 +15,14 @@
<script lang="ts">
import Vue from 'vue';
import summary from '../../../../../common/get-post-summary';
import getAcct from '../../../../../common/user/get-acct';
export default Vue.extend({
props: ['post'],
computed: {
acct() {
return getAcct(this.post.user);
},
text(): string {
return summary(this.post);
}
@@ -1,13 +1,13 @@
<template>
<div class="root sub">
<router-link class="avatar-anchor" :to="`/@${post.user.username}`">
<router-link class="avatar-anchor" :to="`/@${acct}`">
<img class="avatar" :src="`${post.user.avatar_url}?thumbnail&size=64`" alt="avatar"/>
</router-link>
<div class="main">
<header>
<router-link class="name" :to="`/@${post.user.username}`">{{ post.user.name }}</router-link>
<span class="username">@{{ post.user.username }}</span>
<router-link class="time" :to="`/@${post.user.username}/${post.id}`">
<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"/>
</router-link>
</header>
@@ -20,8 +20,15 @@
<script lang="ts">
import Vue from 'vue';
import getAcct from '../../../../../common/user/get-acct';
export default Vue.extend({
props: ['post']
props: ['post'],
computed: {
acct() {
return getAcct(this.post.user);
}
}
});
</script>
@@ -17,11 +17,11 @@
</div>
<div class="repost" v-if="isRepost">
<p>
<router-link class="avatar-anchor" :to="`/@${post.user.username}`">
<router-link class="avatar-anchor" :to="`/@${acct}`">
<img class="avatar" :src="`${post.user.avatar_url}?thumbnail&size=32`" alt="avatar"/>
</router-link>
%fa:retweet%
<router-link class="name" :to="`/@${post.user.username}`">
<router-link class="name" :to="`/@${acct}`">
{{ post.user.name }}
</router-link>
がRepost
@@ -29,12 +29,12 @@
</div>
<article>
<header>
<router-link class="avatar-anchor" :to="`/@${p.user.username}`">
<router-link class="avatar-anchor" :to="`/@${pAcct}`">
<img class="avatar" :src="`${p.user.avatar_url}?thumbnail&size=64`" alt="avatar"/>
</router-link>
<div>
<router-link class="name" :to="`/@${p.user.username}`">{{ p.user.name }}</router-link>
<span class="username">@{{ p.user.username }}</span>
<router-link class="name" :to="`/@${pAcct}`">{{ p.user.name }}</router-link>
<span class="username">@{{ pAcct }}</span>
</div>
</header>
<div class="body">
@@ -53,7 +53,7 @@
<mk-post-preview :post="p.repost"/>
</div>
</div>
<router-link class="time" :to="`/@${p.user.username}/${p.id}`">
<router-link class="time" :to="`/@${pAcct}/${p.id}`">
<mk-time :time="p.created_at" mode="detail"/>
</router-link>
<footer>
@@ -80,6 +80,7 @@
<script lang="ts">
import Vue from 'vue';
import getAcct from '../../../../../common/user/get-acct';
import MkPostMenu from '../../../common/views/components/post-menu.vue';
import MkReactionPicker from '../../../common/views/components/reaction-picker.vue';
import XSub from './post-detail.sub.vue';
@@ -105,6 +106,12 @@ export default Vue.extend({
};
},
computed: {
acct() {
return getAcct(this.post.user);
},
pAcct() {
return getAcct(this.p.user);
},
isRepost(): boolean {
return (this.post.repost &&
this.post.text == null &&
@@ -1,13 +1,13 @@
<template>
<div class="mk-post-preview">
<router-link class="avatar-anchor" :to="`/@${post.user.username}`">
<router-link class="avatar-anchor" :to="`/@${acct}`">
<img class="avatar" :src="`${post.user.avatar_url}?thumbnail&size=64`" alt="avatar"/>
</router-link>
<div class="main">
<header>
<router-link class="name" :to="`/@${post.user.username}`">{{ post.user.name }}</router-link>
<span class="username">@{{ post.user.username }}</span>
<router-link class="time" :to="`/@${post.user.username}/${post.id}`">
<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"/>
</router-link>
</header>
@@ -20,8 +20,15 @@
<script lang="ts">
import Vue from 'vue';
import getAcct from '../../../../../common/user/get-acct';
export default Vue.extend({
props: ['post']
props: ['post'],
computed: {
acct() {
return getAcct(this.post.user);
}
}
});
</script>
@@ -1,13 +1,13 @@
<template>
<div class="sub">
<router-link class="avatar-anchor" :to="`/@${post.user.username}`">
<router-link class="avatar-anchor" :to="`/@${acct}`">
<img class="avatar" :src="`${post.user.avatar_url}?thumbnail&size=96`" alt="avatar"/>
</router-link>
<div class="main">
<header>
<router-link class="name" :to="`/@${post.user.username}`">{{ post.user.name }}</router-link>
<span class="username">@{{ post.user.username }}</span>
<router-link class="created-at" :to="`/@${post.user.username}/${post.id}`">
<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"/>
</router-link>
</header>
@@ -20,8 +20,15 @@
<script lang="ts">
import Vue from 'vue';
import getAcct from '../../../../../common/user/get-acct';
export default Vue.extend({
props: ['post']
props: ['post'],
computed: {
acct() {
return getAcct(this.post.user);
}
}
});
</script>
+14 -7
View File
@@ -5,25 +5,25 @@
</div>
<div class="repost" v-if="isRepost">
<p>
<router-link class="avatar-anchor" :to="`/@${post.user.username}`">
<router-link class="avatar-anchor" :to="`/@${acct}`">
<img class="avatar" :src="`${post.user.avatar_url}?thumbnail&size=64`" alt="avatar"/>
</router-link>
%fa:retweet%
<span>{{ '%i18n:mobile.tags.mk-timeline-post.reposted-by%'.substr(0, '%i18n:mobile.tags.mk-timeline-post.reposted-by%'.indexOf('{')) }}</span>
<router-link class="name" :to="`/@${post.user.username}`">{{ post.user.name }}</router-link>
<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"/>
</div>
<article>
<router-link class="avatar-anchor" :to="`/@${p.user.username}`">
<router-link class="avatar-anchor" :to="`/@${pAcct}`">
<img class="avatar" :src="`${p.user.avatar_url}?thumbnail&size=96`" alt="avatar"/>
</router-link>
<div class="main">
<header>
<router-link class="name" :to="`/@${p.user.username}`">{{ p.user.name }}</router-link>
<span class="is-bot" v-if="p.user.account.is_bot">bot</span>
<span class="username">@{{ p.user.username }}</span>
<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="username">@{{ pAcct }}</span>
<div class="info">
<span class="mobile" v-if="p.via_mobile">%fa:mobile-alt%</span>
<router-link class="created-at" :to="url">
@@ -77,6 +77,7 @@
<script lang="ts">
import Vue from 'vue';
import getAcct from '../../../../../common/user/get-acct';
import MkPostMenu from '../../../common/views/components/post-menu.vue';
import MkReactionPicker from '../../../common/views/components/reaction-picker.vue';
import XSub from './post.sub.vue';
@@ -93,6 +94,12 @@ export default Vue.extend({
};
},
computed: {
acct() {
return getAcct(this.post.user);
},
pAcct() {
return getAcct(this.p.user);
},
isRepost(): boolean {
return (this.post.repost &&
this.post.text == null &&
@@ -110,7 +117,7 @@ export default Vue.extend({
: 0;
},
url(): string {
return `/@${this.p.user.username}/${this.p.id}`;
return `/@${this.pAcct}/${this.p.id}`;
},
urls(): string[] {
if (this.p.ast) {
@@ -1,20 +1,27 @@
<template>
<div class="mk-user-card">
<header :style="user.banner_url ? `background-image: url(${user.banner_url}?thumbnail&size=1024)` : ''">
<a :href="`/@${user.username}`">
<a :href="`/@${acct}`">
<img :src="`${user.avatar_url}?thumbnail&size=200`" alt="avatar"/>
</a>
</header>
<a class="name" :href="`/@${user.username}`" target="_blank">{{ user.name }}</a>
<p class="username">@{{ user.username }}</p>
<a class="name" :href="`/@${acct}`" target="_blank">{{ user.name }}</a>
<p class="username">@{{ acct }}</p>
<mk-follow-button :user="user"/>
</div>
</template>
<script lang="ts">
import Vue from 'vue';
import getAcct from '../../../../../common/user/get-acct';
export default Vue.extend({
props: ['user']
props: ['user'],
computed: {
acct() {
return getAcct(this.user);
}
}
});
</script>
@@ -1,12 +1,12 @@
<template>
<div class="mk-user-preview">
<router-link class="avatar-anchor" :to="`/@${user.username}`">
<router-link class="avatar-anchor" :to="`/@${acct}`">
<img class="avatar" :src="`${user.avatar_url}?thumbnail&size=64`" alt="avatar"/>
</router-link>
<div class="main">
<header>
<router-link class="name" :to="`/@${user.username}`">{{ user.name }}</router-link>
<span class="username">@{{ user.username }}</span>
<router-link class="name" :to="`/@${acct}`">{{ user.name }}</router-link>
<span class="username">@{{ acct }}</span>
</header>
<div class="body">
<div class="description">{{ user.description }}</div>
@@ -17,8 +17,15 @@
<script lang="ts">
import Vue from 'vue';
import getAcct from '../../../../../common/user/get-acct';
export default Vue.extend({
props: ['user']
props: ['user'],
computed: {
acct() {
return getAcct(this.user);
}
}
});
</script>
+2 -3
View File
@@ -19,6 +19,7 @@
<script lang="ts">
import Vue from 'vue';
import Progress from '../../../common/scripts/loading';
import parseAcct from '../../../../../common/user/parse-acct';
export default Vue.extend({
data() {
@@ -41,9 +42,7 @@ export default Vue.extend({
Progress.start();
this.fetching = true;
(this as any).api('users/show', {
username: this.$route.params.user
}).then(user => {
(this as any).api('users/show', parseAcct(this.$route.params.user)).then(user => {
this.user = user;
this.fetching = false;
+2 -3
View File
@@ -19,6 +19,7 @@
<script lang="ts">
import Vue from 'vue';
import Progress from '../../../common/scripts/loading';
import parseAcct from '../../../../../common/user/parse-acct';
export default Vue.extend({
data() {
@@ -41,9 +42,7 @@ export default Vue.extend({
Progress.start();
this.fetching = true;
(this as any).api('users/show', {
username: this.$route.params.user
}).then(user => {
(this as any).api('users/show', parseAcct(this.$route.params.user)).then(user => {
this.user = user;
this.fetching = false;
@@ -10,6 +10,8 @@
<script lang="ts">
import Vue from 'vue';
import parseAcct from '../../../../../common/user/parse-acct';
export default Vue.extend({
data() {
return {
@@ -27,9 +29,7 @@ export default Vue.extend({
methods: {
fetch() {
this.fetching = true;
(this as any).api('users/show', {
username: (this as any).$route.params.username
}).then(user => {
(this as any).api('users/show', parseAcct(this.$route.params.user)).then(user => {
this.user = user;
this.fetching = false;
+3 -1
View File
@@ -7,6 +7,8 @@
<script lang="ts">
import Vue from 'vue';
import getAcct from '../../../../../common/user/get-acct';
export default Vue.extend({
mounted() {
document.title = 'Misskey %i18n:mobile.tags.mk-messaging-page.message%';
@@ -14,7 +16,7 @@ export default Vue.extend({
},
methods: {
navigate(user) {
(this as any).$router.push(`/i/messaging/${user.username}`);
(this as any).$router.push(`/i/messaging/${getAcct(user)}`);
}
}
});
+11 -8
View File
@@ -13,15 +13,15 @@
</div>
<div class="title">
<h1>{{ user.name }}</h1>
<span class="username">@{{ user.username }}</span>
<span class="username">@{{ acct }}</span>
<span class="followed" v-if="user.is_followed">%i18n:mobile.tags.mk-user.follows-you%</span>
</div>
<div class="description">{{ user.description }}</div>
<div class="info">
<p class="location" v-if="user.account.profile.location">
<p class="location" v-if="user.host === null && user.account.profile.location">
%fa:map-marker%{{ user.account.profile.location }}
</p>
<p class="birthday" v-if="user.account.profile.birthday">
<p class="birthday" v-if="user.host === null && user.account.profile.birthday">
%fa:birthday-cake%{{ user.account.profile.birthday.replace('-', '').replace('-', '') + '' }} ({{ age }})
</p>
</div>
@@ -30,11 +30,11 @@
<b>{{ user.posts_count | number }}</b>
<i>%i18n:mobile.tags.mk-user.posts%</i>
</a>
<a :href="`@${user.username}/following`">
<a :href="`@${acct}/following`">
<b>{{ user.following_count | number }}</b>
<i>%i18n:mobile.tags.mk-user.following%</i>
</a>
<a :href="`@${user.username}/followers`">
<a :href="`@${acct}/followers`">
<b>{{ user.followers_count | number }}</b>
<i>%i18n:mobile.tags.mk-user.followers%</i>
</a>
@@ -60,6 +60,8 @@
<script lang="ts">
import Vue from 'vue';
import * as age from 's-age';
import getAcct from '../../../../../common/user/get-acct';
import getAcct from '../../../../../common/user/parse-acct';
import Progress from '../../../common/scripts/loading';
import XHome from './user/home.vue';
@@ -75,6 +77,9 @@ export default Vue.extend({
};
},
computed: {
acct() {
return this.getAcct(this.user);
},
age(): number {
return age(this.user.account.profile.birthday);
}
@@ -92,9 +97,7 @@ export default Vue.extend({
fetch() {
Progress.start();
(this as any).api('users/show', {
username: this.$route.params.user
}).then(user => {
(this as any).api('users/show', parseAcct(this.$route.params.user)).then(user => {
this.user = user;
this.fetching = false;
@@ -2,7 +2,7 @@
<div class="root followers-you-know">
<p class="initializing" v-if="fetching">%fa:spinner .pulse .fw%%i18n:mobile.tags.mk-user-overview-followers-you-know.loading%<mk-ellipsis/></p>
<div v-if="!fetching && users.length > 0">
<a v-for="user in users" :key="user.id" :href="`/@${user.username}`">
<a v-for="user in users" :key="user.id" :href="`/@${getAcct(user)}`">
<img :src="`${user.avatar_url}?thumbnail&size=64`" :alt="user.name"/>
</a>
</div>
@@ -12,6 +12,8 @@
<script lang="ts">
import Vue from 'vue';
import getAcct from '../../../../../../common/user/get-acct';
export default Vue.extend({
props: ['user'],
data() {
@@ -20,6 +22,9 @@ export default Vue.extend({
users: []
};
},
methods: {
getAcct
},
mounted() {
(this as any).api('users/followers', {
user_id: this.user.id,
@@ -5,7 +5,7 @@
<a v-for="image in images"
class="img"
:style="`background-image: url(${image.media.url}?thumbnail&size=256)`"
:href="`/@${image.post.user.username}/${image.post.id}`"
:href="`/@${getAcct(image.post.user)}/${image.post.id}`"
></a>
</div>
<p class="empty" v-if="!fetching && images.length == 0">%i18n:mobile.tags.mk-user-overview-photos.no-photos%</p>
@@ -14,6 +14,8 @@
<script lang="ts">
import Vue from 'vue';
import getAcct from '../../../../../../common/user/get-acct';
export default Vue.extend({
props: ['user'],
data() {
@@ -22,6 +24,9 @@ export default Vue.extend({
images: []
};
},
methods: {
getAcct
},
mounted() {
(this as any).api('users/posts', {
user_id: this.user.id,
+1 -1
View File
@@ -31,7 +31,7 @@
<x-followers-you-know :user="user"/>
</div>
</section>
<p>%i18n:mobile.tags.mk-user-overview.last-used-at%: <b><mk-time :time="user.account.last_used_at"/></b></p>
<p v-if="user.host === null">%i18n:mobile.tags.mk-user-overview.last-used-at%: <b><mk-time :time="user.account.last_used_at"/></b></p>
</div>
</template>