2.15.0

New Crowdin translations

locales/de.yml

@@ -684,7 +684,6 @@ mobile/views/pages/settings/settings.profile.vue:
   birthday: "誕生日"
   avatar: "アイコン"
   banner: "バナー"
-  is-bot: "このアカウントはBotです"
   is-cat: "このアカウントはCatです"
   save: "保存"
   saved: "プロフィールを保存しました"

locales/en.yml

@@ -684,7 +684,6 @@ mobile/views/pages/settings/settings.profile.vue:
   birthday: "Birthday"
   avatar: "Avatar"
   banner: "Banner"
-  is-bot: "This account is a Bot"
   is-cat: "このアカウントはCatです"
   save: "Update profile"
   saved: "Profile updated successfully"

locales/es.yml

@@ -684,7 +684,6 @@ mobile/views/pages/settings/settings.profile.vue:
   birthday: "誕生日"
   avatar: "アイコン"
   banner: "バナー"
-  is-bot: "このアカウントはBotです"
   is-cat: "このアカウントはCatです"
   save: "保存"
   saved: "プロフィールを保存しました"

locales/fr.yml

@@ -684,7 +684,6 @@ mobile/views/pages/settings/settings.profile.vue:
   birthday: "誕生日"
   avatar: "アイコン"
   banner: "バナー"
-  is-bot: "このアカウントはBotです"
   is-cat: "このアカウントはCatです"
   save: "保存"
   saved: "プロフィールを保存しました"

locales/it.yml

@@ -684,7 +684,6 @@ mobile/views/pages/settings/settings.profile.vue:
   birthday: "誕生日"
   avatar: "アイコン"
   banner: "バナー"
-  is-bot: "このアカウントはBotです"
   is-cat: "このアカウントはCatです"
   save: "保存"
   saved: "プロフィールを保存しました"

locales/ja.yml

@@ -815,7 +815,6 @@ mobile/views/pages/settings/settings.profile.vue:
   birthday: "誕生日"
   avatar: "アイコン"
   banner: "バナー"
-  is-bot: "このアカウントはBotです"
   is-cat: "このアカウントはCatです"
   save: "保存"
   saved: "プロフィールを保存しました"

locales/ko.yml

@@ -684,7 +684,6 @@ mobile/views/pages/settings/settings.profile.vue:
   birthday: "誕生日"
   avatar: "アイコン"
   banner: "バナー"
-  is-bot: "このアカウントはBotです"
   is-cat: "このアカウントはCatです"
   save: "保存"
   saved: "プロフィールを保存しました"

locales/pl.yml

@@ -684,7 +684,6 @@ mobile/views/pages/settings/settings.profile.vue:
   birthday: "Data urodzenia"
   avatar: "Awatar"
   banner: "Baner"
-  is-bot: "To konto jest botem"
   is-cat: "このアカウントはCatです"
   save: "Aktualizuj profil"
   saved: "Pomyślnie zaktualizowano profil"

locales/ru.yml

@@ -684,7 +684,6 @@ mobile/views/pages/settings/settings.profile.vue:
   birthday: "誕生日"
   avatar: "アイコン"
   banner: "バナー"
-  is-bot: "このアカウントはBotです"
   is-cat: "このアカウントはCatです"
   save: "保存"
   saved: "プロフィールを保存しました"

locales/zh.yml

@@ -684,7 +684,6 @@ mobile/views/pages/settings/settings.profile.vue:
   birthday: "誕生日"
   avatar: "アイコン"
   banner: "バナー"
-  is-bot: "このアカウントはBotです"
   is-cat: "このアカウントはCatです"
   save: "保存"
   saved: "プロフィールを保存しました"

package.json

@@ -1,8 +1,8 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "2.14.0",
+	"version": "2.15.0",
-	"clientVersion": "1.0.5606",
+	"clientVersion": "1.0.5620",
 	"codename": "nighthike",
 	"main": "./built/index.js",
 	"private": true,

src/client/app/desktop/views/components/notes.note.sub.vue

@@ -4,6 +4,9 @@
 	<div class="main">
 		<header>
 			<router-link class="name" :to="note.user | userPage" v-user-preview="note.userId">{{ note.user | userName }}</router-link>
+			<span class="is-admin" v-if="note.user.isAdmin">admin</span>
+			<span class="is-bot" v-if="note.user.isBot">bot</span>
+			<span class="is-cat" v-if="note.user.isCat">cat</span>
 			<span class="username"><mk-acct :user="note.user"/></span>
 			<div class="info">
 				<span class="mobile" v-if="note.viaMobile">%fa:mobile-alt%</span>
@@ -68,7 +71,6 @@ root(isDark)
 			align-items baseline
 			margin-bottom 2px
 			white-space nowrap
-			line-height 21px
 
 			> .name
 				display block
@@ -84,6 +86,20 @@ root(isDark)
 				&:hover
 					text-decoration underline
 
+			> .is-admin
+			> .is-bot
+			> .is-cat
+				margin 0 0.5em 0 0
+				padding 1px 5px
+				font-size 10px
+				color isDark ? #758188 : #aaa
+				border solid 1px isDark ? #57616f : #ddd
+				border-radius 3px
+
+				&.is-admin
+					border-color isDark ? #d42c41 : #f56a7b
+					color isDark ? #d42c41 : #f56a7b
+
 			> .username
 				margin 0 .5em 0 0
 				color isDark ? #606984 : #d1d8da

src/client/app/desktop/views/components/notes.note.vue

@@ -16,6 +16,7 @@
 		<div class="main">
 			<header>
 				<router-link class="name" :to="p.user | userPage" v-user-preview="p.user.id">{{ p.user | userName }}</router-link>
+				<span class="is-admin" v-if="p.user.isAdmin">admin</span>
 				<span class="is-bot" v-if="p.user.isBot">bot</span>
 				<span class="is-cat" v-if="p.user.isCat">cat</span>
 				<span class="username"><mk-acct :user="p.user"/></span>
@@ -431,6 +432,7 @@ root(isDark)
 					&:hover
 						text-decoration underline
 
+				> .is-admin
 				> .is-bot
 				> .is-cat
 					margin 0 .5em 0 0
@@ -440,6 +442,10 @@ root(isDark)
 					border solid 1px isDark ? #57616f : #ddd
 					border-radius 3px
 
+					&.is-admin
+						border-color isDark ? #d42c41 : #f56a7b
+						color isDark ? #d42c41 : #f56a7b
+
 				> .username
 					margin 0 .5em 0 0
 					overflow hidden

src/client/app/mobile/views/components/note.sub.vue

@@ -1,9 +1,13 @@
 <template>
-<div class="sub">
+<div class="sub" :class="{ smart: $store.state.device.postStyle == 'smart' }">
-	<mk-avatar class="avatar" :user="note.user"/>
+	<mk-avatar class="avatar" :user="note.user" v-if="$store.state.device.postStyle != 'smart'"/>
 	<div class="main">
 		<header>
+			<mk-avatar class="avatar" :user="note.user" v-if="$store.state.device.postStyle == 'smart'"/>
 			<router-link class="name" :to="note.user | userPage">{{ note.user | userName }}</router-link>
+			<span class="is-admin" v-if="note.user.isAdmin">admin</span>
+			<span class="is-bot" v-if="note.user.isBot">bot</span>
+			<span class="is-cat" v-if="note.user.isCat">cat</span>
 			<span class="username"><mk-acct :user="note.user"/></span>
 			<div class="info">
 				<span class="mobile" v-if="note.viaMobile">%fa:mobile-alt%</span>
@@ -42,6 +46,13 @@ root(isDark)
 	@media (min-width 600px)
 		padding 24px 32px
 
+	&.smart
+		> .main
+			width 100%
+
+			> header
+				align-items center
+
 	&:after
 		content ""
 		display block
@@ -73,6 +84,13 @@ root(isDark)
 			margin-bottom 2px
 			white-space nowrap
 
+			> .avatar
+				flex-shrink 0
+				margin-right 8px
+				width 18px
+				height 18px
+				border-radius 100%
+
 			> .name
 				display block
 				margin 0 0.5em 0 0
@@ -88,6 +106,20 @@ root(isDark)
 				&:hover
 					text-decoration underline
 
+			> .is-admin
+			> .is-bot
+			> .is-cat
+				margin 0 0.5em 0 0
+				padding 1px 5px
+				font-size 10px
+				color isDark ? #758188 : #aaa
+				border solid 1px isDark ? #57616f : #ddd
+				border-radius 3px
+
+				&.is-admin
+					border-color isDark ? #d42c41 : #f56a7b
+					color isDark ? #d42c41 : #f56a7b
+
 			> .username
 				text-align left
 				margin 0

src/client/app/mobile/views/components/note.vue

@@ -17,6 +17,7 @@
 			<header>
 				<mk-avatar class="avatar" :user="p.user" v-if="$store.state.device.postStyle == 'smart'"/>
 				<router-link class="name" :to="p.user | userPage">{{ p.user | userName }}</router-link>
+				<span class="is-admin" v-if="p.user.isAdmin">admin</span>
 				<span class="is-bot" v-if="p.user.isBot">bot</span>
 				<span class="is-cat" v-if="p.user.isCat">cat</span>
 				<span class="username"><mk-acct :user="p.user"/></span>
@@ -289,6 +290,7 @@ root(isDark)
 			padding 16px 32px
 
 		.avatar
+			flex-shrink 0
 			display inline-block
 			width 20px
 			height 20px
@@ -387,6 +389,7 @@ root(isDark)
 					&:hover
 						text-decoration underline
 
+				> .is-admin
 				> .is-bot
 				> .is-cat
 					margin 0 0.5em 0 0
@@ -396,6 +399,10 @@ root(isDark)
 					border solid 1px isDark ? #57616f : #ddd
 					border-radius 3px
 
+					&.is-admin
+						border-color isDark ? #d42c41 : #f56a7b
+						color isDark ? #d42c41 : #f56a7b
+
 				> .username
 					margin 0 0.5em 0 0
 					overflow hidden

src/client/app/mobile/views/pages/settings/settings.profile.vue

@@ -49,10 +49,6 @@
 					:md-active.sync="uploading"
 					md-content="%18n:!@uploading%"/>
 
-			<div>
-				<md-switch v-model="isBot">%i18n:@is-bot%</md-switch>
-			</div>
-
 			<div>
 				<md-switch v-model="isCat">%i18n:@is-cat%</md-switch>
 			</div>