11.0.0-alpha.4

README.md

@@ -1,4 +1,4 @@
-<a href="https://ai.misskey.xyz/"><img src="https://github.com/syuilo/misskey/blob/develop/assets/ai-orig.png?raw=true" align="right" height="320px"/></a>
+<a href="https://xn--931a.moe/"><img src="https://github.com/syuilo/misskey/blob/develop/assets/ai-orig.png?raw=true" align="right" height="320px"/></a>
 
 [![Misskey](/assets/title.png)](https://misskey.xyz/)
 ================================================================

locales/ja-JP.yml

@@ -1088,7 +1088,7 @@ desktop/views/components/taskmanager.vue:
 desktop/views/components/timeline.vue:
   home: "ホーム"
   local: "ローカル"
-  hybrid: "ソーシャル"
+  social: "ソーシャル"
   global: "グローバル"
   mentions: "あなた宛て"
   messages: "ダイレクト投稿"
@@ -1665,7 +1665,7 @@ mobile/views/pages/following.vue:
 mobile/views/pages/home.vue:
   home: "ホーム"
   local: "ローカル"
-  hybrid: "ソーシャル"
+  social: "ソーシャル"
   global: "グローバル"
   mentions: "あなた宛て"
   messages: "ダイレクト投稿"
@@ -1735,7 +1735,7 @@ deck:
   widgets: "ウィジェット"
   home: "ホーム"
   local: "ローカル"
-  hybrid: "ソーシャル"
+  social: "ソーシャル"
   hashtag: "ハッシュタグ"
   global: "グローバル"
   mentions: "あなた宛て"

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "11.0.0-alpha.2",
+	"version": "11.0.0-alpha.4",
 	"codename": "daybreak",
 	"repository": {
 		"type": "git",

src/client/app/mobile/views/pages/user/home.photos.vue

@@ -4,7 +4,7 @@
 	<div class="stream" v-if="!fetching && images.length > 0">
 		<a v-for="(image, i) in images" :key="i"
 			class="img"
-			:style="`background-image: url(${thumbnail(image.media)})`"
+			:style="`background-image: url(${thumbnail(image.file)})`"
 			:href="image.note | notePage"
 		></a>
 	</div>
@@ -40,11 +40,11 @@ export default Vue.extend({
 			untilDate: new Date().getTime() + 1000 * 86400 * 365
 		}).then(notes => {
 			for (const note of notes) {
-				for (const media of note.media) {
+				for (const file of note.files) {
 					if (this.images.length < 9) {
 						this.images.push({
 							note,
-							media
+							file
 						});
 					}
 				}

src/models/repositories/note.ts

@@ -169,6 +169,8 @@ export class NoteRepository extends Repository<Note> {
 			visibility: note.visibility,
 			visibleUserIds: note.visibleUserIds,
 			viaMobile: note.viaMobile,
+			renoteCount: note.renoteCount,
+			repliesCount: note.repliesCount,
 			reactions: note.reactions,
 			emojis: reactionEmojis.length > 0 ? Emojis.find({
 				name: In(reactionEmojis),
@@ -186,7 +188,7 @@ export class NoteRepository extends Repository<Note> {
 				}) : null,
 
 				renote: note.renoteId ? this.pack(note.renoteId, meId, {
-					detail: false
+					detail: true
 				}) : null,
 
 				poll: note.hasPoll ? populatePoll() : null,

src/remote/activitypub/renderer/note.ts

@@ -12,7 +12,7 @@ import { Emoji } from '../../../models/entities/emoji';
 import { Poll } from '../../../models/entities/poll';
 
 export default async function renderNote(note: Note, dive = true): Promise<any> {
-	const promisedFiles: Promise<DriveFile[]> = note.fileIds.length > 1
+	const promisedFiles: Promise<DriveFile[]> = note.fileIds.length > 0
 		? DriveFiles.find({ id: In(note.fileIds) })
 		: Promise.resolve([]);
 

src/server/api/endpoints/users/search.ts

@@ -69,8 +69,8 @@ export default define(meta, async (ps, me) => {
 	if (isUsername) {
 		users = await Users.createQueryBuilder('user')
 			.where('user.host IS NULL')
-			.where('user.isSuspended = FALSE')
-			.where('user.usernameLower like :username', { username: ps.query.replace('@', '').toLowerCase() + '%' })
+			.andWhere('user.isSuspended = FALSE')
+			.andWhere('user.usernameLower like :username', { username: ps.query.replace('@', '').toLowerCase() + '%' })
 			.take(ps.limit)
 			.skip(ps.offset)
 			.getMany();
@@ -78,8 +78,8 @@ export default define(meta, async (ps, me) => {
 		if (users.length < ps.limit && !ps.localOnly) {
 			const otherUsers = await Users.createQueryBuilder('user')
 				.where('user.host IS NOT NULL')
-				.where('user.isSuspended = FALSE')
-				.where('user.usernameLower like :username', { username: ps.query.replace('@', '').toLowerCase() + '%' })
+				.andWhere('user.isSuspended = FALSE')
+				.andWhere('user.usernameLower like :username', { username: ps.query.replace('@', '').toLowerCase() + '%' })
 				.take(ps.limit - users.length)
 				.getMany();