Compare commits
9 Commits
11.0.0-alp
...
11.0.0-alp
Author | SHA1 | Date | |
---|---|---|---|
![]() |
8d0c31bcda | ||
![]() |
0b99293d4c | ||
![]() |
802153ff9b | ||
![]() |
ec73e2d237 | ||
![]() |
c32b020535 | ||
![]() |
c4441804e2 | ||
![]() |
6c9d80d4e8 | ||
![]() |
a231f8d26c | ||
![]() |
08da258b63 |
@@ -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>
|
||||||
|
|
||||||
[](https://misskey.xyz/)
|
[](https://misskey.xyz/)
|
||||||
================================================================
|
================================================================
|
||||||
|
@@ -1088,7 +1088,7 @@ desktop/views/components/taskmanager.vue:
|
|||||||
desktop/views/components/timeline.vue:
|
desktop/views/components/timeline.vue:
|
||||||
home: "ホーム"
|
home: "ホーム"
|
||||||
local: "ローカル"
|
local: "ローカル"
|
||||||
hybrid: "ソーシャル"
|
social: "ソーシャル"
|
||||||
global: "グローバル"
|
global: "グローバル"
|
||||||
mentions: "あなた宛て"
|
mentions: "あなた宛て"
|
||||||
messages: "ダイレクト投稿"
|
messages: "ダイレクト投稿"
|
||||||
@@ -1665,7 +1665,7 @@ mobile/views/pages/following.vue:
|
|||||||
mobile/views/pages/home.vue:
|
mobile/views/pages/home.vue:
|
||||||
home: "ホーム"
|
home: "ホーム"
|
||||||
local: "ローカル"
|
local: "ローカル"
|
||||||
hybrid: "ソーシャル"
|
social: "ソーシャル"
|
||||||
global: "グローバル"
|
global: "グローバル"
|
||||||
mentions: "あなた宛て"
|
mentions: "あなた宛て"
|
||||||
messages: "ダイレクト投稿"
|
messages: "ダイレクト投稿"
|
||||||
@@ -1735,7 +1735,7 @@ deck:
|
|||||||
widgets: "ウィジェット"
|
widgets: "ウィジェット"
|
||||||
home: "ホーム"
|
home: "ホーム"
|
||||||
local: "ローカル"
|
local: "ローカル"
|
||||||
hybrid: "ソーシャル"
|
social: "ソーシャル"
|
||||||
hashtag: "ハッシュタグ"
|
hashtag: "ハッシュタグ"
|
||||||
global: "グローバル"
|
global: "グローバル"
|
||||||
mentions: "あなた宛て"
|
mentions: "あなた宛て"
|
||||||
|
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "misskey",
|
"name": "misskey",
|
||||||
"author": "syuilo <i@syuilo.com>",
|
"author": "syuilo <i@syuilo.com>",
|
||||||
"version": "11.0.0-alpha.2",
|
"version": "11.0.0-alpha.4",
|
||||||
"codename": "daybreak",
|
"codename": "daybreak",
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
|
@@ -4,7 +4,7 @@
|
|||||||
<div class="stream" v-if="!fetching && images.length > 0">
|
<div class="stream" v-if="!fetching && images.length > 0">
|
||||||
<a v-for="(image, i) in images" :key="i"
|
<a v-for="(image, i) in images" :key="i"
|
||||||
class="img"
|
class="img"
|
||||||
:style="`background-image: url(${thumbnail(image.media)})`"
|
:style="`background-image: url(${thumbnail(image.file)})`"
|
||||||
:href="image.note | notePage"
|
:href="image.note | notePage"
|
||||||
></a>
|
></a>
|
||||||
</div>
|
</div>
|
||||||
@@ -40,11 +40,11 @@ export default Vue.extend({
|
|||||||
untilDate: new Date().getTime() + 1000 * 86400 * 365
|
untilDate: new Date().getTime() + 1000 * 86400 * 365
|
||||||
}).then(notes => {
|
}).then(notes => {
|
||||||
for (const note of notes) {
|
for (const note of notes) {
|
||||||
for (const media of note.media) {
|
for (const file of note.files) {
|
||||||
if (this.images.length < 9) {
|
if (this.images.length < 9) {
|
||||||
this.images.push({
|
this.images.push({
|
||||||
note,
|
note,
|
||||||
media
|
file
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -169,6 +169,8 @@ export class NoteRepository extends Repository<Note> {
|
|||||||
visibility: note.visibility,
|
visibility: note.visibility,
|
||||||
visibleUserIds: note.visibleUserIds,
|
visibleUserIds: note.visibleUserIds,
|
||||||
viaMobile: note.viaMobile,
|
viaMobile: note.viaMobile,
|
||||||
|
renoteCount: note.renoteCount,
|
||||||
|
repliesCount: note.repliesCount,
|
||||||
reactions: note.reactions,
|
reactions: note.reactions,
|
||||||
emojis: reactionEmojis.length > 0 ? Emojis.find({
|
emojis: reactionEmojis.length > 0 ? Emojis.find({
|
||||||
name: In(reactionEmojis),
|
name: In(reactionEmojis),
|
||||||
@@ -186,7 +188,7 @@ export class NoteRepository extends Repository<Note> {
|
|||||||
}) : null,
|
}) : null,
|
||||||
|
|
||||||
renote: note.renoteId ? this.pack(note.renoteId, meId, {
|
renote: note.renoteId ? this.pack(note.renoteId, meId, {
|
||||||
detail: false
|
detail: true
|
||||||
}) : null,
|
}) : null,
|
||||||
|
|
||||||
poll: note.hasPoll ? populatePoll() : null,
|
poll: note.hasPoll ? populatePoll() : null,
|
||||||
|
@@ -12,7 +12,7 @@ import { Emoji } from '../../../models/entities/emoji';
|
|||||||
import { Poll } from '../../../models/entities/poll';
|
import { Poll } from '../../../models/entities/poll';
|
||||||
|
|
||||||
export default async function renderNote(note: Note, dive = true): Promise<any> {
|
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) })
|
? DriveFiles.find({ id: In(note.fileIds) })
|
||||||
: Promise.resolve([]);
|
: Promise.resolve([]);
|
||||||
|
|
||||||
|
@@ -69,8 +69,8 @@ export default define(meta, async (ps, me) => {
|
|||||||
if (isUsername) {
|
if (isUsername) {
|
||||||
users = await Users.createQueryBuilder('user')
|
users = await Users.createQueryBuilder('user')
|
||||||
.where('user.host IS NULL')
|
.where('user.host IS NULL')
|
||||||
.where('user.isSuspended = FALSE')
|
.andWhere('user.isSuspended = FALSE')
|
||||||
.where('user.usernameLower like :username', { username: ps.query.replace('@', '').toLowerCase() + '%' })
|
.andWhere('user.usernameLower like :username', { username: ps.query.replace('@', '').toLowerCase() + '%' })
|
||||||
.take(ps.limit)
|
.take(ps.limit)
|
||||||
.skip(ps.offset)
|
.skip(ps.offset)
|
||||||
.getMany();
|
.getMany();
|
||||||
@@ -78,8 +78,8 @@ export default define(meta, async (ps, me) => {
|
|||||||
if (users.length < ps.limit && !ps.localOnly) {
|
if (users.length < ps.limit && !ps.localOnly) {
|
||||||
const otherUsers = await Users.createQueryBuilder('user')
|
const otherUsers = await Users.createQueryBuilder('user')
|
||||||
.where('user.host IS NOT NULL')
|
.where('user.host IS NOT NULL')
|
||||||
.where('user.isSuspended = FALSE')
|
.andWhere('user.isSuspended = FALSE')
|
||||||
.where('user.usernameLower like :username', { username: ps.query.replace('@', '').toLowerCase() + '%' })
|
.andWhere('user.usernameLower like :username', { username: ps.query.replace('@', '').toLowerCase() + '%' })
|
||||||
.take(ps.limit - users.length)
|
.take(ps.limit - users.length)
|
||||||
.getMany();
|
.getMany();
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user