diff --git a/package.json b/package.json index 6399e2ea4a..20fda6faa6 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "misskey", "author": "syuilo <i@syuilo.com>", - "version": "0.0.1576", + "version": "0.0.1578", "license": "MIT", "description": "A miniblog-based SNS", "bugs": "https://github.com/syuilo/misskey/issues", diff --git a/src/web/app/common/tags/messaging/message.tag b/src/web/app/common/tags/messaging/message.tag index a221fc0604..4da9e2292b 100644 --- a/src/web/app/common/tags/messaging/message.tag +++ b/src/web/app/common/tags/messaging/message.tag @@ -1,4 +1,4 @@ -<mk-messaging-message data-is-me={ message.is_me }><a class="avatar-anchor" href={ CONFIG.url + '/' + message.user.username } title={ message.user.username } target="_blank"><img class="avatar" src={ message.user.avatar_url + '?thumbnail&size=64' } alt=""/></a> +<mk-messaging-message data-is-me={ message.is_me }><a class="avatar-anchor" href={ '/' + message.user.username } title={ message.user.username } target="_blank"><img class="avatar" src={ message.user.avatar_url + '?thumbnail&size=64' } alt=""/></a> <div class="content-container"> <div class="balloon"> <p class="read" if={ message.is_me && message.is_read }>%i18n:common.tags.mk-messaging-message.is-read%</p> diff --git a/src/web/app/common/tags/signup.tag b/src/web/app/common/tags/signup.tag index e4cc842ade..3862523f99 100644 --- a/src/web/app/common/tags/signup.tag +++ b/src/web/app/common/tags/signup.tag @@ -3,7 +3,7 @@ <label class="username"> <p class="caption"><i class="fa fa-at"></i>%i18n:common.tags.mk-signup.username%</p> <input ref="username" type="text" pattern="^[a-zA-Z0-9-]{3,20}$" placeholder="a~z、A~Z、0~9、-" autocomplete="off" required="required" onkeyup={ onChangeUsername }/> - <p class="profile-page-url-preview" if={ refs.username.value != '' && username-state != 'invalidFormat' && username-state != 'minRange' && username-state != 'maxRange' }>{ CONFIG.url + '/' + refs.username.value }</p> + <p class="profile-page-url-preview" if={ refs.username.value != '' && username-state != 'invalidFormat' && username-state != 'minRange' && username-state != 'maxRange' }>{ '/' + refs.username.value }</p> <p class="info" if={ usernameState == 'wait' } style="color:#999"><i class="fa fa-fw fa-spinner fa-pulse"></i>%i18n:common.tags.mk-signup.checking%</p> <p class="info" if={ usernameState == 'ok' } style="color:#3CB7B5"><i class="fa fa-fw fa-check"></i>%i18n:common.tags.mk-signup.available%</p> <p class="info" if={ usernameState == 'unavailable' } style="color:#FF1161"><i class="fa fa-fw fa-exclamation-triangle"></i>%i18n:common.tags.mk-signup.unavailable%</p> diff --git a/src/web/app/desktop/tags/following-setuper.tag b/src/web/app/desktop/tags/following-setuper.tag index ea3c9b9f63..ca52950ae1 100644 --- a/src/web/app/desktop/tags/following-setuper.tag +++ b/src/web/app/desktop/tags/following-setuper.tag @@ -1,8 +1,8 @@ <mk-following-setuper> <p class="title">気になるユーザーをフォロー:</p> <div class="users" if={ !fetching && users.length > 0 }> - <div class="user" each={ users }><a class="avatar-anchor" href={ CONFIG.url + '/' + username }><img class="avatar" src={ avatar_url + '?thumbnail&size=42' } alt="" data-user-preview={ id }/></a> - <div class="body"><a class="name" href={ CONFIG.url + '/' + username } target="_blank" data-user-preview={ id }>{ name }</a> + <div class="user" each={ users }><a class="avatar-anchor" href={ '/' + username }><img class="avatar" src={ avatar_url + '?thumbnail&size=42' } alt="" data-user-preview={ id }/></a> + <div class="body"><a class="name" href={ '/' + username } target="_blank" data-user-preview={ id }>{ name }</a> <p class="username">@{ username }</p> </div> <mk-follow-button user={ this }></mk-follow-button> diff --git a/src/web/app/desktop/tags/home-widgets/profile.tag b/src/web/app/desktop/tags/home-widgets/profile.tag index 78c95f72a6..e6a8752113 100644 --- a/src/web/app/desktop/tags/home-widgets/profile.tag +++ b/src/web/app/desktop/tags/home-widgets/profile.tag @@ -1,5 +1,5 @@ <mk-profile-home-widget> - <div class="banner" style={ I.banner_url ? 'background-image: url(' + I.banner_url + '?thumbnail&size=256)' : '' } title="クリックでバナー編集" onclick={ setBanner }></div><img class="avatar" src={ I.avatar_url + '?thumbnail&size=64' } onclick={ setAvatar } alt="avatar" title="クリックでアバター編集" data-user-preview={ I.id }/><a class="name" href={ CONFIG.url + '/' + I.username }>{ I.name }</a> + <div class="banner" style={ I.banner_url ? 'background-image: url(' + I.banner_url + '?thumbnail&size=256)' : '' } title="クリックでバナー編集" onclick={ setBanner }></div><img class="avatar" src={ I.avatar_url + '?thumbnail&size=64' } onclick={ setAvatar } alt="avatar" title="クリックでアバター編集" data-user-preview={ I.id }/><a class="name" href={ '/' + I.username }>{ I.name }</a> <p class="username">@{ I.username }</p> <style> :scope diff --git a/src/web/app/desktop/tags/home-widgets/user-recommendation.tag b/src/web/app/desktop/tags/home-widgets/user-recommendation.tag index a299609c2d..383cf56eb2 100644 --- a/src/web/app/desktop/tags/home-widgets/user-recommendation.tag +++ b/src/web/app/desktop/tags/home-widgets/user-recommendation.tag @@ -2,11 +2,11 @@ <p class="title"><i class="fa fa-users"></i>%i18n:desktop.tags.mk-user-recommendation-home-widget.title%</p> <button onclick={ refresh } title="%i18n:desktop.tags.mk-user-recommendation-home-widget.refresh%"><i class="fa fa-refresh"></i></button> <div class="user" if={ !loading && users.length != 0 } each={ _user in users }> - <a class="avatar-anchor" href={ CONFIG.url + '/' + _user.username }> + <a class="avatar-anchor" href={ '/' + _user.username }> <img class="avatar" src={ _user.avatar_url + '?thumbnail&size=42' } alt="" data-user-preview={ _user.id }/> </a> <div class="body"> - <a class="name" href={ CONFIG.url + '/' + _user.username } data-user-preview={ _user.id }>{ _user.name }</a> + <a class="name" href={ '/' + _user.username } data-user-preview={ _user.id }>{ _user.name }</a> <p class="username">@{ _user.username }</p> </div> <mk-follow-button user={ _user }></mk-follow-button> diff --git a/src/web/app/desktop/tags/list-user.tag b/src/web/app/desktop/tags/list-user.tag index e709d8d708..c7d6e5edcd 100644 --- a/src/web/app/desktop/tags/list-user.tag +++ b/src/web/app/desktop/tags/list-user.tag @@ -1,10 +1,10 @@ <mk-list-user> - <a class="avatar-anchor" href={ CONFIG.url + '/' + user.username }> + <a class="avatar-anchor" href={ '/' + user.username }> <img class="avatar" src={ user.avatar_url + '?thumbnail&size=64' } alt="avatar"/> </a> <div class="main"> <header> - <a class="name" href={ CONFIG.url + '/' + user.username }>{ user.name }</a> + <a class="name" href={ '/' + user.username }>{ user.name }</a> <span class="username">@{ user.username }</span> </header> <div class="body"> diff --git a/src/web/app/desktop/tags/notifications.tag b/src/web/app/desktop/tags/notifications.tag index 5d812895f1..5bc2484313 100644 --- a/src/web/app/desktop/tags/notifications.tag +++ b/src/web/app/desktop/tags/notifications.tag @@ -4,59 +4,59 @@ <div class="notification { notification.type }"> <mk-time time={ notification.created_at }></mk-time> <virtual if={ notification.type == 'reaction' }> - <a class="avatar-anchor" href={ CONFIG.url + '/' + notification.user.username } data-user-preview={ notification.user.id }> + <a class="avatar-anchor" href={ '/' + notification.user.username } data-user-preview={ notification.user.id }> <img class="avatar" src={ notification.user.avatar_url + '?thumbnail&size=48' } alt="avatar"/> </a> <div class="text"> - <p><mk-reaction-icon reaction={ notification.reaction }></mk-reaction-icon><a href={ CONFIG.url + '/' + notification.user.username } data-user-preview={ notification.user.id }>{ notification.user.name }</a></p><a class="post-ref" href={ CONFIG.url + '/' + notification.post.user.username + '/' + notification.post.id }>{ getPostSummary(notification.post) }</a> + <p><mk-reaction-icon reaction={ notification.reaction }></mk-reaction-icon><a href={ '/' + notification.user.username } data-user-preview={ notification.user.id }>{ notification.user.name }</a></p><a class="post-ref" href={ '/' + notification.post.user.username + '/' + notification.post.id }>{ getPostSummary(notification.post) }</a> </div> </virtual> <virtual if={ notification.type == 'repost' }> - <a class="avatar-anchor" href={ CONFIG.url + '/' + notification.post.user.username } data-user-preview={ notification.post.user_id }> + <a class="avatar-anchor" href={ '/' + notification.post.user.username } data-user-preview={ notification.post.user_id }> <img class="avatar" src={ notification.post.user.avatar_url + '?thumbnail&size=48' } alt="avatar"/> </a> <div class="text"> - <p><i class="fa fa-retweet"></i><a href={ CONFIG.url + '/' + notification.post.user.username } data-user-preview={ notification.post.user_id }>{ notification.post.user.name }</a></p><a class="post-ref" href={ CONFIG.url + '/' + notification.post.user.username + '/' + notification.post.id }>{ getPostSummary(notification.post.repost) }</a> + <p><i class="fa fa-retweet"></i><a href={ '/' + notification.post.user.username } data-user-preview={ notification.post.user_id }>{ notification.post.user.name }</a></p><a class="post-ref" href={ '/' + notification.post.user.username + '/' + notification.post.id }>{ getPostSummary(notification.post.repost) }</a> </div> </virtual> <virtual if={ notification.type == 'quote' }> - <a class="avatar-anchor" href={ CONFIG.url + '/' + notification.post.user.username } data-user-preview={ notification.post.user_id }> + <a class="avatar-anchor" href={ '/' + notification.post.user.username } data-user-preview={ notification.post.user_id }> <img class="avatar" src={ notification.post.user.avatar_url + '?thumbnail&size=48' } alt="avatar"/> </a> <div class="text"> - <p><i class="fa fa-quote-left"></i><a href={ CONFIG.url + '/' + notification.post.user.username } data-user-preview={ notification.post.user_id }>{ notification.post.user.name }</a></p><a class="post-preview" href={ CONFIG.url + '/' + notification.post.user.username + '/' + notification.post.id }>{ getPostSummary(notification.post) }</a> + <p><i class="fa fa-quote-left"></i><a href={ '/' + notification.post.user.username } data-user-preview={ notification.post.user_id }>{ notification.post.user.name }</a></p><a class="post-preview" href={ '/' + notification.post.user.username + '/' + notification.post.id }>{ getPostSummary(notification.post) }</a> </div> </virtual> <virtual if={ notification.type == 'follow' }> - <a class="avatar-anchor" href={ CONFIG.url + '/' + notification.user.username } data-user-preview={ notification.user.id }> + <a class="avatar-anchor" href={ '/' + notification.user.username } data-user-preview={ notification.user.id }> <img class="avatar" src={ notification.user.avatar_url + '?thumbnail&size=48' } alt="avatar"/> </a> <div class="text"> - <p><i class="fa fa-user-plus"></i><a href={ CONFIG.url + '/' + notification.user.username } data-user-preview={ notification.user.id }>{ notification.user.name }</a></p> + <p><i class="fa fa-user-plus"></i><a href={ '/' + notification.user.username } data-user-preview={ notification.user.id }>{ notification.user.name }</a></p> </div> </virtual> <virtual if={ notification.type == 'reply' }> - <a class="avatar-anchor" href={ CONFIG.url + '/' + notification.post.user.username } data-user-preview={ notification.post.user_id }> + <a class="avatar-anchor" href={ '/' + notification.post.user.username } data-user-preview={ notification.post.user_id }> <img class="avatar" src={ notification.post.user.avatar_url + '?thumbnail&size=48' } alt="avatar"/> </a> <div class="text"> - <p><i class="fa fa-reply"></i><a href={ CONFIG.url + '/' + notification.post.user.username } data-user-preview={ notification.post.user_id }>{ notification.post.user.name }</a></p><a class="post-preview" href={ CONFIG.url + '/' + notification.post.user.username + '/' + notification.post.id }>{ getPostSummary(notification.post) }</a> + <p><i class="fa fa-reply"></i><a href={ '/' + notification.post.user.username } data-user-preview={ notification.post.user_id }>{ notification.post.user.name }</a></p><a class="post-preview" href={ '/' + notification.post.user.username + '/' + notification.post.id }>{ getPostSummary(notification.post) }</a> </div> </virtual> <virtual if={ notification.type == 'mention' }> - <a class="avatar-anchor" href={ CONFIG.url + '/' + notification.post.user.username } data-user-preview={ notification.post.user_id }> + <a class="avatar-anchor" href={ '/' + notification.post.user.username } data-user-preview={ notification.post.user_id }> <img class="avatar" src={ notification.post.user.avatar_url + '?thumbnail&size=48' } alt="avatar"/> </a> <div class="text"> - <p><i class="fa fa-at"></i><a href={ CONFIG.url + '/' + notification.post.user.username } data-user-preview={ notification.post.user_id }>{ notification.post.user.name }</a></p><a class="post-preview" href={ CONFIG.url + '/' + notification.post.user.username + '/' + notification.post.id }>{ getPostSummary(notification.post) }</a> + <p><i class="fa fa-at"></i><a href={ '/' + notification.post.user.username } data-user-preview={ notification.post.user_id }>{ notification.post.user.name }</a></p><a class="post-preview" href={ '/' + notification.post.user.username + '/' + notification.post.id }>{ getPostSummary(notification.post) }</a> </div> </virtual> <virtual if={ notification.type == 'poll_vote' }> - <a class="avatar-anchor" href={ CONFIG.url + '/' + notification.user.username } data-user-preview={ notification.user.id }> + <a class="avatar-anchor" href={ '/' + notification.user.username } data-user-preview={ notification.user.id }> <img class="avatar" src={ notification.user.avatar_url + '?thumbnail&size=48' } alt="avatar"/> </a> <div class="text"> - <p><i class="fa fa-pie-chart"></i><a href={ CONFIG.url + '/' + notification.user.username } data-user-preview={ notification.user.id }>{ notification.user.name }</a></p><a class="post-ref" href={ CONFIG.url + '/' + notification.post.user.username + '/' + notification.post.id }>{ getPostSummary(notification.post) }</a> + <p><i class="fa fa-pie-chart"></i><a href={ '/' + notification.user.username } data-user-preview={ notification.user.id }>{ notification.user.name }</a></p><a class="post-ref" href={ '/' + notification.post.user.username + '/' + notification.post.id }>{ getPostSummary(notification.post) }</a> </div> </virtual> </div> diff --git a/src/web/app/desktop/tags/post-detail-sub.tag b/src/web/app/desktop/tags/post-detail-sub.tag index f43e85254f..c8aec616a0 100644 --- a/src/web/app/desktop/tags/post-detail-sub.tag +++ b/src/web/app/desktop/tags/post-detail-sub.tag @@ -1,11 +1,11 @@ <mk-post-detail-sub title={ title }> - <a class="avatar-anchor" href={ CONFIG.url + '/' + post.user.username }> + <a class="avatar-anchor" href={ '/' + post.user.username }> <img class="avatar" src={ post.user.avatar_url + '?thumbnail&size=64' } alt="avatar" data-user-preview={ post.user_id }/> </a> <div class="main"> <header> <div class="left"> - <a class="name" href={ CONFIG.url + '/' + post.user.username } data-user-preview={ post.user_id }>{ post.user.name }</a> + <a class="name" href={ '/' + post.user.username } data-user-preview={ post.user_id }>{ post.user.name }</a> <span class="username">@{ post.user.username }</span> </div> <div class="right"> diff --git a/src/web/app/desktop/tags/post-detail.tag b/src/web/app/desktop/tags/post-detail.tag index d232cbaa5e..6a3c353629 100644 --- a/src/web/app/desktop/tags/post-detail.tag +++ b/src/web/app/desktop/tags/post-detail.tag @@ -17,21 +17,21 @@ </div> <div class="repost" if={ isRepost }> <p> - <a class="avatar-anchor" href={ CONFIG.url + '/' + post.user.username } data-user-preview={ post.user_id }> + <a class="avatar-anchor" href={ '/' + post.user.username } data-user-preview={ post.user_id }> <img class="avatar" src={ post.user.avatar_url + '?thumbnail&size=32' } alt="avatar"/> </a> - <i class="fa fa-retweet"></i><a class="name" href={ CONFIG.url + '/' + post.user.username }> + <i class="fa fa-retweet"></i><a class="name" href={ '/' + post.user.username }> { post.user.name } </a> がRepost </p> </div> <article> - <a class="avatar-anchor" href={ CONFIG.url + '/' + p.user.username }> + <a class="avatar-anchor" href={ '/' + p.user.username }> <img class="avatar" src={ p.user.avatar_url + '?thumbnail&size=64' } alt="avatar" data-user-preview={ p.user.id }/> </a> <header> - <a class="name" href={ CONFIG.url + '/' + p.user.username } data-user-preview={ p.user.id }>{ p.user.name }</a> + <a class="name" href={ '/' + p.user.username } data-user-preview={ p.user.id }>{ p.user.name }</a> <span class="username">@{ p.user.username }</span> <a class="time" href={ url }> <mk-time time={ p.created_at }></mk-time> diff --git a/src/web/app/desktop/tags/post-preview.tag b/src/web/app/desktop/tags/post-preview.tag index be94012faa..e4a94a9b79 100644 --- a/src/web/app/desktop/tags/post-preview.tag +++ b/src/web/app/desktop/tags/post-preview.tag @@ -1,7 +1,7 @@ <mk-post-preview title={ title }> - <article><a class="avatar-anchor" href={ CONFIG.url + '/' + post.user.username }><img class="avatar" src={ post.user.avatar_url + '?thumbnail&size=64' } alt="avatar" data-user-preview={ post.user_id }/></a> + <article><a class="avatar-anchor" href={ '/' + post.user.username }><img class="avatar" src={ post.user.avatar_url + '?thumbnail&size=64' } alt="avatar" data-user-preview={ post.user_id }/></a> <div class="main"> - <header><a class="name" href={ CONFIG.url + '/' + post.user.username } data-user-preview={ post.user_id }>{ post.user.name }</a><span class="username">@{ post.user.username }</span><a class="time" href={ CONFIG.url + '/' + post.user.username + '/' + post.id }> + <header><a class="name" href={ '/' + post.user.username } data-user-preview={ post.user_id }>{ post.user.name }</a><span class="username">@{ post.user.username }</span><a class="time" href={ '/' + post.user.username + '/' + post.id }> <mk-time time={ post.created_at }></mk-time></a></header> <div class="body"> <mk-sub-post-content class="text" post={ post }></mk-sub-post-content> diff --git a/src/web/app/desktop/tags/timeline-post-sub.tag b/src/web/app/desktop/tags/timeline-post-sub.tag index a858a04b7c..cc4c99c298 100644 --- a/src/web/app/desktop/tags/timeline-post-sub.tag +++ b/src/web/app/desktop/tags/timeline-post-sub.tag @@ -1,13 +1,13 @@ <mk-timeline-post-sub title={ title }> <article> - <a class="avatar-anchor" href={ CONFIG.url + '/' + post.user.username }> + <a class="avatar-anchor" href={ '/' + post.user.username }> <img class="avatar" src={ post.user.avatar_url + '?thumbnail&size=64' } alt="avatar" data-user-preview={ post.user_id }/> </a> <div class="main"> <header> - <a class="name" href={ CONFIG.url + '/' + post.user.username } data-user-preview={ post.user_id }>{ post.user.name }</a> + <a class="name" href={ '/' + post.user.username } data-user-preview={ post.user_id }>{ post.user.name }</a> <span class="username">@{ post.user.username }</span> - <a class="created-at" href={ CONFIG.url + '/' + post.user.username + '/' + post.id }> + <a class="created-at" href={ '/' + post.user.username + '/' + post.id }> <mk-time time={ post.created_at }></mk-time> </a> </header> diff --git a/src/web/app/desktop/tags/timeline-post.tag b/src/web/app/desktop/tags/timeline-post.tag index cd4f047faa..1b5b811a9a 100644 --- a/src/web/app/desktop/tags/timeline-post.tag +++ b/src/web/app/desktop/tags/timeline-post.tag @@ -4,20 +4,20 @@ </div> <div class="repost" if={ isRepost }> <p> - <a class="avatar-anchor" href={ CONFIG.url + '/' + post.user.username } data-user-preview={ post.user_id }> + <a class="avatar-anchor" href={ '/' + post.user.username } data-user-preview={ post.user_id }> <img class="avatar" src={ post.user.avatar_url + '?thumbnail&size=32' } alt="avatar"/> </a> - <i class="fa fa-retweet"></i>{'%i18n:desktop.tags.mk-timeline-post.reposted-by%'.substr(0, '%i18n:desktop.tags.mk-timeline-post.reposted-by%'.indexOf('{'))}<a class="name" href={ CONFIG.url + '/' + post.user.username } data-user-preview={ post.user_id }>{ post.user.name }</a>{'%i18n:desktop.tags.mk-timeline-post.reposted-by%'.substr('%i18n:desktop.tags.mk-timeline-post.reposted-by%'.indexOf('}') + 1)} + <i class="fa fa-retweet"></i>{'%i18n:desktop.tags.mk-timeline-post.reposted-by%'.substr(0, '%i18n:desktop.tags.mk-timeline-post.reposted-by%'.indexOf('{'))}<a class="name" href={ '/' + post.user.username } data-user-preview={ post.user_id }>{ post.user.name }</a>{'%i18n:desktop.tags.mk-timeline-post.reposted-by%'.substr('%i18n:desktop.tags.mk-timeline-post.reposted-by%'.indexOf('}') + 1)} </p> <mk-time time={ post.created_at }></mk-time> </div> <article> - <a class="avatar-anchor" href={ CONFIG.url + '/' + p.user.username }> + <a class="avatar-anchor" href={ '/' + p.user.username }> <img class="avatar" src={ p.user.avatar_url + '?thumbnail&size=64' } alt="avatar" data-user-preview={ p.user.id }/> </a> <div class="main"> <header> - <a class="name" href={ CONFIG.url + '/' + p.user.username } data-user-preview={ p.user.id }>{ p.user.name }</a> + <a class="name" href={ '/' + p.user.username } data-user-preview={ p.user.id }>{ p.user.name }</a> <span class="is-bot" if={ p.user.is_bot }>bot</span> <span class="username">@{ p.user.username }</span> <div class="info"> diff --git a/src/web/app/desktop/tags/user-header.tag b/src/web/app/desktop/tags/user-header.tag index 8ec5003b99..ea7ea6bb37 100644 --- a/src/web/app/desktop/tags/user-header.tag +++ b/src/web/app/desktop/tags/user-header.tag @@ -1,7 +1,7 @@ <mk-user-header data-is-dark-background={ user.banner_url != null }> <div class="banner" ref="banner" style={ user.banner_url ? 'background-image: url(' + user.banner_url + '?thumbnail&size=1024)' : '' } onclick={ onUpdateBanner }></div><img class="avatar" src={ user.avatar_url + '?thumbnail&size=150' } alt="avatar"/> <div class="title"> - <p class="name" href={ CONFIG.url + '/' + user.username }>{ user.name }</p> + <p class="name" href={ '/' + user.username }>{ user.name }</p> <p class="username">@{ user.username }</p> <p class="location" if={ user.profile.location }><i class="fa fa-map-marker"></i>{ user.profile.location }</p> </div> diff --git a/src/web/app/desktop/tags/user-preview.tag b/src/web/app/desktop/tags/user-preview.tag index 129dcaac3d..f7a1fe3593 100644 --- a/src/web/app/desktop/tags/user-preview.tag +++ b/src/web/app/desktop/tags/user-preview.tag @@ -1,6 +1,6 @@ <mk-user-preview> <virtual if={ user != null }> - <div class="banner" style={ user.banner_url ? 'background-image: url(' + user.banner_url + '?thumbnail&size=512)' : '' }></div><a class="avatar" href={ CONFIG.url + '/' + user.username } target="_blank"><img src={ user.avatar_url + '?thumbnail&size=64' } alt="avatar"/></a> + <div class="banner" style={ user.banner_url ? 'background-image: url(' + user.banner_url + '?thumbnail&size=512)' : '' }></div><a class="avatar" href={ '/' + user.username } target="_blank"><img src={ user.avatar_url + '?thumbnail&size=64' } alt="avatar"/></a> <div class="title"> <p class="name">{ user.name }</p> <p class="username">@{ user.username }</p> diff --git a/src/web/app/mobile/tags/notification.tag b/src/web/app/mobile/tags/notification.tag index fcdc05dcb5..1e543efc1a 100644 --- a/src/web/app/mobile/tags/notification.tag +++ b/src/web/app/mobile/tags/notification.tag @@ -1,86 +1,86 @@ <mk-notification class={ notification.type }> <mk-time time={ notification.created_at }></mk-time> <virtual if={ notification.type == 'reaction' }> - <a class="avatar-anchor" href={ CONFIG.url + '/' + notification.user.username }> + <a class="avatar-anchor" href={ '/' + notification.user.username }> <img class="avatar" src={ notification.user.avatar_url + '?thumbnail&size=64' } alt="avatar"/> </a> <div class="text"> <p> <mk-reaction-icon reaction={ notification.reaction }></mk-reaction-icon> - <a href={ CONFIG.url + '/' + notification.user.username }>{ notification.user.name }</a> + <a href={ '/' + notification.user.username }>{ notification.user.name }</a> </p> - <a class="post-ref" href={ CONFIG.url + '/' + notification.post.user.username + '/' + notification.post.id }>{ getPostSummary(notification.post) }</a> + <a class="post-ref" href={ '/' + notification.post.user.username + '/' + notification.post.id }>{ getPostSummary(notification.post) }</a> </div> </virtual> <virtual if={ notification.type == 'repost' }> - <a class="avatar-anchor" href={ CONFIG.url + '/' + notification.post.user.username }> + <a class="avatar-anchor" href={ '/' + notification.post.user.username }> <img class="avatar" src={ notification.post.user.avatar_url + '?thumbnail&size=64' } alt="avatar"/> </a> <div class="text"> <p> <i class="fa fa-retweet"></i> - <a href={ CONFIG.url + '/' + notification.post.user.username }>{ notification.post.user.name }</a> + <a href={ '/' + notification.post.user.username }>{ notification.post.user.name }</a> </p> - <a class="post-ref" href={ CONFIG.url + '/' + notification.post.user.username + '/' + notification.post.id }>{ getPostSummary(notification.post.repost) }</a> + <a class="post-ref" href={ '/' + notification.post.user.username + '/' + notification.post.id }>{ getPostSummary(notification.post.repost) }</a> </div> </virtual> <virtual if={ notification.type == 'quote' }> - <a class="avatar-anchor" href={ CONFIG.url + '/' + notification.post.user.username }> + <a class="avatar-anchor" href={ '/' + notification.post.user.username }> <img class="avatar" src={ notification.post.user.avatar_url + '?thumbnail&size=64' } alt="avatar"/> </a> <div class="text"> <p> <i class="fa fa-quote-left"></i> - <a href={ CONFIG.url + '/' + notification.post.user.username }>{ notification.post.user.name }</a> + <a href={ '/' + notification.post.user.username }>{ notification.post.user.name }</a> </p> - <a class="post-preview" href={ CONFIG.url + '/' + notification.post.user.username + '/' + notification.post.id }>{ getPostSummary(notification.post) }</a> + <a class="post-preview" href={ '/' + notification.post.user.username + '/' + notification.post.id }>{ getPostSummary(notification.post) }</a> </div> </virtual> <virtual if={ notification.type == 'follow' }> - <a class="avatar-anchor" href={ CONFIG.url + '/' + notification.user.username }> + <a class="avatar-anchor" href={ '/' + notification.user.username }> <img class="avatar" src={ notification.user.avatar_url + '?thumbnail&size=64' } alt="avatar"/> </a> <div class="text"> <p> <i class="fa fa-user-plus"></i> - <a href={ CONFIG.url + '/' + notification.user.username }>{ notification.user.name }</a> + <a href={ '/' + notification.user.username }>{ notification.user.name }</a> </p> </div> </virtual> <virtual if={ notification.type == 'reply' }> - <a class="avatar-anchor" href={ CONFIG.url + '/' + notification.post.user.username }> + <a class="avatar-anchor" href={ '/' + notification.post.user.username }> <img class="avatar" src={ notification.post.user.avatar_url + '?thumbnail&size=64' } alt="avatar"/> </a> <div class="text"> <p> <i class="fa fa-reply"></i> - <a href={ CONFIG.url + '/' + notification.post.user.username }>{ notification.post.user.name }</a> + <a href={ '/' + notification.post.user.username }>{ notification.post.user.name }</a> </p> - <a class="post-preview" href={ CONFIG.url + '/' + notification.post.user.username + '/' + notification.post.id }>{ getPostSummary(notification.post) }</a> + <a class="post-preview" href={ '/' + notification.post.user.username + '/' + notification.post.id }>{ getPostSummary(notification.post) }</a> </div> </virtual> <virtual if={ notification.type == 'mention' }> - <a class="avatar-anchor" href={ CONFIG.url + '/' + notification.post.user.username }> + <a class="avatar-anchor" href={ '/' + notification.post.user.username }> <img class="avatar" src={ notification.post.user.avatar_url + '?thumbnail&size=64' } alt="avatar"/> </a> <div class="text"> <p> <i class="fa fa-at"></i> - <a href={ CONFIG.url + '/' + notification.post.user.username }>{ notification.post.user.name }</a> + <a href={ '/' + notification.post.user.username }>{ notification.post.user.name }</a> </p> - <a class="post-preview" href={ CONFIG.url + '/' + notification.post.user.username + '/' + notification.post.id }>{ getPostSummary(notification.post) }</a> + <a class="post-preview" href={ '/' + notification.post.user.username + '/' + notification.post.id }>{ getPostSummary(notification.post) }</a> </div> </virtual> <virtual if={ notification.type == 'poll_vote' }> - <a class="avatar-anchor" href={ CONFIG.url + '/' + notification.user.username }> + <a class="avatar-anchor" href={ '/' + notification.user.username }> <img class="avatar" src={ notification.user.avatar_url + '?thumbnail&size=64' } alt="avatar"/> </a> <div class="text"> <p> <i class="fa fa-pie-chart"></i> - <a href={ CONFIG.url + '/' + notification.user.username }>{ notification.user.name }</a> + <a href={ '/' + notification.user.username }>{ notification.user.name }</a> </p> - <a class="post-ref" href={ CONFIG.url + '/' + notification.post.user.username + '/' + notification.post.id }>{ getPostSummary(notification.post) }</a> + <a class="post-ref" href={ '/' + notification.post.user.username + '/' + notification.post.id }>{ getPostSummary(notification.post) }</a> </div> </virtual> <style> diff --git a/src/web/app/mobile/tags/post-detail.tag b/src/web/app/mobile/tags/post-detail.tag index 14d1a9a576..0fe30178df 100644 --- a/src/web/app/mobile/tags/post-detail.tag +++ b/src/web/app/mobile/tags/post-detail.tag @@ -17,9 +17,9 @@ </div> <div class="repost" if={ isRepost }> <p> - <a class="avatar-anchor" href={ CONFIG.url + '/' + post.user.username }> + <a class="avatar-anchor" href={ '/' + post.user.username }> <img class="avatar" src={ post.user.avatar_url + '?thumbnail&size=32' } alt="avatar"/></a> - <i class="fa fa-retweet"></i><a class="name" href={ CONFIG.url + '/' + post.user.username }> + <i class="fa fa-retweet"></i><a class="name" href={ '/' + post.user.username }> { post.user.name } </a> がRepost @@ -27,11 +27,11 @@ </div> <article> <header> - <a class="avatar-anchor" href={ CONFIG.url + '/' + p.user.username }> + <a class="avatar-anchor" href={ '/' + p.user.username }> <img class="avatar" src={ p.user.avatar_url + '?thumbnail&size=64' } alt="avatar"/> </a> <div> - <a class="name" href={ CONFIG.url + '/' + p.user.username }>{ p.user.name }</a> + <a class="name" href={ '/' + p.user.username }>{ p.user.name }</a> <span class="username">@{ p.user.username }</span> </div> </header> diff --git a/src/web/app/mobile/tags/post-preview.tag b/src/web/app/mobile/tags/post-preview.tag index aa1d5f9b29..cb3f7fd617 100644 --- a/src/web/app/mobile/tags/post-preview.tag +++ b/src/web/app/mobile/tags/post-preview.tag @@ -1,13 +1,13 @@ <mk-post-preview> <article> - <a class="avatar-anchor" href={ CONFIG.url + '/' + post.user.username }> + <a class="avatar-anchor" href={ '/' + post.user.username }> <img class="avatar" src={ post.user.avatar_url + '?thumbnail&size=64' } alt="avatar"/> </a> <div class="main"> <header> - <a class="name" href={ CONFIG.url + '/' + post.user.username }>{ post.user.name }</a> + <a class="name" href={ '/' + post.user.username }>{ post.user.name }</a> <span class="username">@{ post.user.username }</span> - <a class="time" href={ CONFIG.url + '/' + post.user.username + '/' + post.id }> + <a class="time" href={ '/' + post.user.username + '/' + post.id }> <mk-time time={ post.created_at }></mk-time> </a> </header> diff --git a/src/web/app/mobile/tags/timeline-post.tag b/src/web/app/mobile/tags/timeline-post.tag index 32e1a46120..3b10b725f4 100644 --- a/src/web/app/mobile/tags/timeline-post.tag +++ b/src/web/app/mobile/tags/timeline-post.tag @@ -4,20 +4,20 @@ </div> <div class="repost" if={ isRepost }> <p> - <a class="avatar-anchor" href={ CONFIG.url + '/' + post.user.username }> + <a class="avatar-anchor" href={ '/' + post.user.username }> <img class="avatar" src={ post.user.avatar_url + '?thumbnail&size=64' } alt="avatar"/> </a> - <i class="fa fa-retweet"></i>{'%i18n:mobile.tags.mk-timeline-post.reposted-by%'.substr(0, '%i18n:mobile.tags.mk-timeline-post.reposted-by%'.indexOf('{'))}<a class="name" href={ CONFIG.url + '/' + post.user.username }>{ post.user.name }</a>{'%i18n:mobile.tags.mk-timeline-post.reposted-by%'.substr('%i18n:mobile.tags.mk-timeline-post.reposted-by%'.indexOf('}') + 1)} + <i class="fa fa-retweet"></i>{'%i18n:mobile.tags.mk-timeline-post.reposted-by%'.substr(0, '%i18n:mobile.tags.mk-timeline-post.reposted-by%'.indexOf('{'))}<a class="name" href={ '/' + post.user.username }>{ post.user.name }</a>{'%i18n:mobile.tags.mk-timeline-post.reposted-by%'.substr('%i18n:mobile.tags.mk-timeline-post.reposted-by%'.indexOf('}') + 1)} </p> <mk-time time={ post.created_at }></mk-time> </div> <article> - <a class="avatar-anchor" href={ CONFIG.url + '/' + p.user.username }> + <a class="avatar-anchor" href={ '/' + p.user.username }> <img class="avatar" src={ p.user.avatar_url + '?thumbnail&size=96' } alt="avatar"/> </a> <div class="main"> <header> - <a class="name" href={ CONFIG.url + '/' + p.user.username }>{ p.user.name }</a> + <a class="name" href={ '/' + p.user.username }>{ p.user.name }</a> <span class="is-bot" if={ p.user.is_bot }>bot</span> <span class="username">@{ p.user.username }</span> <a class="created-at" href={ url }> diff --git a/src/web/app/mobile/tags/ui-nav.tag b/src/web/app/mobile/tags/ui-nav.tag index 7e256624d9..3a5dbdab03 100644 --- a/src/web/app/mobile/tags/ui-nav.tag +++ b/src/web/app/mobile/tags/ui-nav.tag @@ -1,7 +1,7 @@ <mk-ui-nav> <div class="backdrop" onclick={ parent.toggleDrawer }></div> <div class="body"> - <a class="me" if={ SIGNIN } href={ CONFIG.url + '/' + I.username }> + <a class="me" if={ SIGNIN } href={ '/' + I.username }> <img class="avatar" src={ I.avatar_url + '?thumbnail&size=128' } alt="avatar"/> <p class="name">{ I.name }</p> </a> diff --git a/src/web/app/mobile/tags/user-preview.tag b/src/web/app/mobile/tags/user-preview.tag index eae4d610d8..48bf88a892 100644 --- a/src/web/app/mobile/tags/user-preview.tag +++ b/src/web/app/mobile/tags/user-preview.tag @@ -1,10 +1,10 @@ <mk-user-preview> - <a class="avatar-anchor" href={ CONFIG.url + '/' + user.username }> + <a class="avatar-anchor" href={ '/' + user.username }> <img class="avatar" src={ user.avatar_url + '?thumbnail&size=64' } alt="avatar"/> </a> <div class="main"> <header> - <a class="name" href={ CONFIG.url + '/' + user.username }>{ user.name }</a> + <a class="name" href={ '/' + user.username }>{ user.name }</a> <span class="username">@{ user.username }</span> </header> <div class="body">