Compare commits
No commits in common. "a773fbfd40af63f4d8094e64cd234b5edfe0ea36" and "b63cdc2c5cfff921cc6ba51b5fd7f9b343018f39" have entirely different histories.
a773fbfd40
...
b63cdc2c5c
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "misskey",
|
"name": "misskey",
|
||||||
"version": "12.110.1+birb3-2",
|
"version": "12.110.1+birb3",
|
||||||
"codename": "indigo",
|
"codename": "indigo",
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
|
|
|
@ -1,11 +0,0 @@
|
||||||
export class largeFile1653167275806 {
|
|
||||||
name = 'largeFile1653167275806'
|
|
||||||
|
|
||||||
async up(queryRunner) {
|
|
||||||
await queryRunner.query(`ALTER TABLE "drive_file" ALTER COLUMN size TYPE bigint`);
|
|
||||||
}
|
|
||||||
|
|
||||||
async down(queryRunner) {
|
|
||||||
await queryRunner.query(`ALTER TABLE "drive_file" ALTER COLUMN size TYPE integer`);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -56,7 +56,7 @@ export class DriveFile {
|
||||||
})
|
})
|
||||||
public type: string;
|
public type: string;
|
||||||
|
|
||||||
@Column('bigint', {
|
@Column('integer', {
|
||||||
comment: 'The file size (bytes) of the DriveFile.',
|
comment: 'The file size (bytes) of the DriveFile.',
|
||||||
})
|
})
|
||||||
public size: number;
|
public size: number;
|
||||||
|
|
|
@ -60,10 +60,6 @@ export default async function renderNote(note: Note, dive = true, isTalk = false
|
||||||
let to: string[] = [];
|
let to: string[] = [];
|
||||||
let cc: string[] = [];
|
let cc: string[] = [];
|
||||||
|
|
||||||
if (note.channelId) {
|
|
||||||
to = [{ type: 'Group', name: note.channelId }];
|
|
||||||
cc = [`${attributedTo}/followers`, 'https://www.w3.org/ns/activitystreams#Public'].concat(mentions);
|
|
||||||
} else {
|
|
||||||
if (note.visibility === 'public') {
|
if (note.visibility === 'public') {
|
||||||
to = ['https://www.w3.org/ns/activitystreams#Public'];
|
to = ['https://www.w3.org/ns/activitystreams#Public'];
|
||||||
cc = [`${attributedTo}/followers`].concat(mentions);
|
cc = [`${attributedTo}/followers`].concat(mentions);
|
||||||
|
@ -76,8 +72,6 @@ export default async function renderNote(note: Note, dive = true, isTalk = false
|
||||||
} else {
|
} else {
|
||||||
to = mentions;
|
to = mentions;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
const mentionedUsers = note.mentions.length > 0 ? await Users.findBy({
|
const mentionedUsers = note.mentions.length > 0 ? await Users.findBy({
|
||||||
id: In(note.mentions),
|
id: In(note.mentions),
|
||||||
|
|
|
@ -148,9 +148,10 @@ export default async (user: { id: User['id']; username: User['username']; host:
|
||||||
if (data.localOnly == null) data.localOnly = false;
|
if (data.localOnly == null) data.localOnly = false;
|
||||||
if (data.channel != null) data.visibility = 'public';
|
if (data.channel != null) data.visibility = 'public';
|
||||||
if (data.channel != null) data.visibleUsers = [];
|
if (data.channel != null) data.visibleUsers = [];
|
||||||
|
if (data.channel != null) data.localOnly = true;
|
||||||
|
|
||||||
// サイレンス
|
// サイレンス
|
||||||
if (user.isSilenced && data.visibility === 'public') {
|
if (user.isSilenced && data.visibility === 'public' && data.channel == null) {
|
||||||
data.visibility = 'home';
|
data.visibility = 'home';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -175,12 +176,12 @@ export default async (user: { id: User['id']; username: User['username']; host:
|
||||||
}
|
}
|
||||||
|
|
||||||
// ローカルのみをRenoteしたらローカルのみにする
|
// ローカルのみをRenoteしたらローカルのみにする
|
||||||
if (data.renote && data.renote.localOnly) {
|
if (data.renote && data.renote.localOnly && data.channel == null) {
|
||||||
data.localOnly = true;
|
data.localOnly = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
// ローカルのみにリプライしたらローカルのみにする
|
// ローカルのみにリプライしたらローカルのみにする
|
||||||
if (data.reply && data.reply.localOnly) {
|
if (data.reply && data.reply.localOnly && data.channel == null) {
|
||||||
data.localOnly = true;
|
data.localOnly = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -255,6 +255,7 @@ if (props.reply && props.reply.text != null) {
|
||||||
|
|
||||||
if (props.channel) {
|
if (props.channel) {
|
||||||
visibility = 'public';
|
visibility = 'public';
|
||||||
|
localOnly = true; // TODO: チャンネルが連合するようになった折には消す
|
||||||
}
|
}
|
||||||
|
|
||||||
// 公開以外へのリプライ時は元の公開範囲を引き継ぐ
|
// 公開以外へのリプライ時は元の公開範囲を引き継ぐ
|
||||||
|
|
|
@ -554,6 +554,8 @@ export function upload(file: File, folder?: any, name?: string, keepOriginal: bo
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
const id = Math.random().toString();
|
const id = Math.random().toString();
|
||||||
|
|
||||||
|
const reader = new FileReader();
|
||||||
|
reader.onload = (e) => {
|
||||||
const ctx = reactive({
|
const ctx = reactive({
|
||||||
id: id,
|
id: id,
|
||||||
name: name || file.name || 'untitled',
|
name: name || file.name || 'untitled',
|
||||||
|
@ -564,6 +566,8 @@ export function upload(file: File, folder?: any, name?: string, keepOriginal: bo
|
||||||
|
|
||||||
uploads.value.push(ctx);
|
uploads.value.push(ctx);
|
||||||
|
|
||||||
|
console.log(keepOriginal);
|
||||||
|
|
||||||
const data = new FormData();
|
const data = new FormData();
|
||||||
data.append('i', $i.token);
|
data.append('i', $i.token);
|
||||||
data.append('force', 'true');
|
data.append('force', 'true');
|
||||||
|
@ -603,6 +607,8 @@ export function upload(file: File, folder?: any, name?: string, keepOriginal: bo
|
||||||
};
|
};
|
||||||
|
|
||||||
xhr.send(data);
|
xhr.send(data);
|
||||||
|
};
|
||||||
|
reader.readAsArrayBuffer(file);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -235,6 +235,7 @@ export default defineComponent({
|
||||||
|
|
||||||
if (this.channel) {
|
if (this.channel) {
|
||||||
this.visibility = 'public';
|
this.visibility = 'public';
|
||||||
|
this.localOnly = true; // TODO: チャンネルが連合するようになった折には消す
|
||||||
}
|
}
|
||||||
|
|
||||||
// 公開以外へのリプライ時は元の公開範囲を引き継ぐ
|
// 公開以外へのリプライ時は元の公開範囲を引き継ぐ
|
||||||
|
|
Loading…
Reference in New Issue