profxadke/misskey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #6 from syuilo/master

Browse source 
追従
This commit is contained in:
tamaina 2018-04-15 19:06:15 +09:00 • committed by GitHub
commit c0a7e13f04
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 56 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
locales/en.yml
View file

@ -403,6 +403,10 @@ desktop/views/pages/user/user.friends.vue:
loading: "Loading"
no-users: "No users"
desktop/views/pages/user/user.header.vue:
is-remote: "This user is not a user of Misskey, so the information is not accurate."
view-remote: "See accurate information"
desktop/views/pages/user/user.home.vue:
last-used-at: "Last used at"
@ -585,6 +589,8 @@ mobile/views/pages/user.vue:
overview: "Overview"
timeline: "Timeline"
media: "Media"
is-remote: "This user is not a user of Misskey, so the information is not accurate."
view-remote: "See accurate information"
mobile/views/pages/user/home.vue:
recent-notes: "Recent notes"

6
locales/ja.yml
View file

@ -403,6 +403,10 @@ desktop/views/pages/user/user.friends.vue:
loading: "読み込み中"
no-users: "よく話すユーザーはいません"
desktop/views/pages/user/user.header.vue:
is-remote: "このユーザーはMisskeyのユーザーではないため情報が正確ではありません。"
view-remote: "正確な情報を見る"
desktop/views/pages/user/user.home.vue:
last-used-at: "最終アクセス"
@ -585,6 +589,8 @@ mobile/views/pages/user.vue:
overview: "概要"
timeline: "タイムライン"
media: "メディア"
is-remote: "このユーザーはMisskeyのユーザーではないため情報が正確ではありません。"
view-remote: "正確な情報を見る"
mobile/views/pages/user/home.vue:
recent-notes: "最近の投稿"

2
package.json
View file

@ -1,7 +1,7 @@
{
"name": "misskey",
"author": "syuilo <i@syuilo.com>",
"version": "0.0.4876",
"version": "0.0.4895",
"codename": "nighthike",
"license": "MIT",
"description": "A miniblog-based SNS",

2
src/client/app/desktop/views/components/note-detail.vue
View file

@ -2,7 +2,7 @@
<div class="mk-note-detail" :title="title">
<button
class="read-more"
v-if="p.reply && p.reply.replyId && context == null"
v-if="p.reply && p.reply.replyId && context.length == 0"
title="会話をもっと読み込む"
@click="fetchContext"
:disabled="contextFetching"

33
src/client/app/desktop/views/pages/user/user.header.vue
View file

@ -1,5 +1,6 @@
<template>
<div class="header" :data-is-dark-background="user.bannerUrl != null">
<div class="is-remote" v-if="user.host != null"><p>%fa:exclamation-triangle% %i18n:@is-remote% <a :href="user.url || user.uri" target="_blank">%i18n:@view-remote%</a></p></div>
<div class="banner-container" :style="user.bannerUrl ? `background-image: url(${user.bannerUrl}?thumbnail&size=2048)` : ''">
<div class="banner" ref="banner" :style="user.bannerUrl ? `background-image: url(${user.bannerUrl}?thumbnail&size=2048)` : ''" @click="onBannerClick"></div>
</div>
@ -26,14 +27,18 @@ import Vue from 'vue';
export default Vue.extend({
props: ['user'],
mounted() {
window.addEventListener('load', this.onScroll);
window.addEventListener('scroll', this.onScroll);
window.addEventListener('resize', this.onScroll);
if (this.user.bannerUrl) {
window.addEventListener('load', this.onScroll);
window.addEventListener('scroll', this.onScroll);
window.addEventListener('resize', this.onScroll);
}
},
beforeDestroy() {
window.removeEventListener('load', this.onScroll);
window.removeEventListener('scroll', this.onScroll);
window.removeEventListener('resize', this.onScroll);
if (this.user.bannerUrl) {
window.removeEventListener('load', this.onScroll);
window.removeEventListener('scroll', this.onScroll);
window.removeEventListener('resize', this.onScroll);
}
},
methods: {
onScroll() {
@ -68,9 +73,21 @@ export default Vue.extend({
$footer-height = 58px
overflow hidden
background #f7f7f7
background #bfccd0
box-shadow 0 1px 1px rgba(0, 0, 0, 0.075)
> .is-remote
padding 16px
color #573c08
background #fff0db
> p
margin 0 auto
max-width 1024px
> a
font-weight bold
&[data-is-dark-background]
> .banner-container
> .banner
@ -130,7 +147,7 @@ export default Vue.extend({
left 0
width 100%
padding 0 0 8px 195px
color #656565
color #5e6367
font-family '游ゴシック', 'YuGothic', 'ヒラギノ角ゴ ProN W3', 'Hiragino Kaku Gothic ProN', 'Meiryo', 'メイリオ', sans-serif
> .name

2
src/client/app/mobile/views/components/note-detail.vue
View file

@ -2,7 +2,7 @@
<div class="mk-note-detail">
<button
class="more"
v-if="p.reply && p.reply.replyId && context == null"
v-if="p.reply && p.reply.replyId && context.length == 0"
@click="fetchContext"
:disabled="fetchingContext"
>

13
src/client/app/mobile/views/pages/user.vue
View file

@ -2,6 +2,7 @@
<mk-ui>
<span slot="header" v-if="!fetching">%fa:user% {{ user | userName }}</span>
<main v-if="!fetching">
<div class="is-remote" v-if="user.host != null"><p>%fa:exclamation-triangle% %i18n:@is-remote% <a :href="user.url || user.uri" target="_blank">%i18n:@view-remote%</a></p></div>
<header>
<div class="banner" :style="user.bannerUrl ? `background-image: url(${user.bannerUrl}?thumbnail&size=1024)` : ''"></div>
<div class="body">
@ -109,6 +110,18 @@ export default Vue.extend({
@import '~const.styl'
main
> .is-remote
padding 16px
color #573c08
background #fff0db
> p
margin 0 auto
max-width 1024px
> a
font-weight bold
> header
> .banner

1
src/models/user.ts
View file

@ -88,6 +88,7 @@ export interface ILocalUser extends IUserBase {
export interface IRemoteUser extends IUserBase {
inbox: string;
uri: string;
url?: string;
publicKey: {
id: string;
publicKeyPem: string;

3
src/remote/activitypub/objects/person.ts
View file

@ -96,7 +96,8 @@ export async function createPerson(value: any, resolver?: Resolver): Promise<IUs
publicKeyPem: person.publicKey.publicKeyPem
},
inbox: person.inbox,
uri: person.id
uri: person.id,
url: person.url
}) as IRemoteUser;
//#region アイコンとヘッダー画像をフェッチ