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
+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>