forked from mirror/misskey
Merge branch 'master' of aya.github:syuilo/misskey
This commit is contained in:
commit
65a3c7dae4
@ -4,7 +4,7 @@ Misskey's Translation
|
|||||||
If you find an untranslated part on Misskey:
|
If you find an untranslated part on Misskey:
|
||||||
--------------------------------------------
|
--------------------------------------------
|
||||||
|
|
||||||
1. Look for untranslated parts in the miskey's source code.
|
1. Look for untranslated parts in the misskey's source code.
|
||||||
- For instance, if you find an untranslated part in: `src/client/app/mobile/views/pages/home.vue`.
|
- For instance, if you find an untranslated part in: `src/client/app/mobile/views/pages/home.vue`.
|
||||||
|
|
||||||
2. Replace the untranslated portion with a character string of the form `%i18n:@foo%`.
|
2. Replace the untranslated portion with a character string of the form `%i18n:@foo%`.
|
||||||
|
@ -105,7 +105,7 @@
|
|||||||
"eventemitter3": "3.1.0",
|
"eventemitter3": "3.1.0",
|
||||||
"exif-js": "2.3.0",
|
"exif-js": "2.3.0",
|
||||||
"file-loader": "1.1.11",
|
"file-loader": "1.1.11",
|
||||||
"file-type": "8.0.0",
|
"file-type": "8.1.0",
|
||||||
"fuckadblock": "3.2.1",
|
"fuckadblock": "3.2.1",
|
||||||
"gm": "1.23.1",
|
"gm": "1.23.1",
|
||||||
"gulp": "3.9.1",
|
"gulp": "3.9.1",
|
||||||
@ -122,7 +122,7 @@
|
|||||||
"gulp-typescript": "4.0.2",
|
"gulp-typescript": "4.0.2",
|
||||||
"gulp-uglify": "3.0.0",
|
"gulp-uglify": "3.0.0",
|
||||||
"gulp-util": "3.0.8",
|
"gulp-util": "3.0.8",
|
||||||
"hard-source-webpack-plugin": "0.10.1",
|
"hard-source-webpack-plugin": "0.11.0",
|
||||||
"highlight.js": "9.12.0",
|
"highlight.js": "9.12.0",
|
||||||
"html-minifier": "3.5.18",
|
"html-minifier": "3.5.18",
|
||||||
"http-signature": "1.2.0",
|
"http-signature": "1.2.0",
|
||||||
@ -153,7 +153,7 @@
|
|||||||
"monk": "6.0.6",
|
"monk": "6.0.6",
|
||||||
"ms": "2.1.1",
|
"ms": "2.1.1",
|
||||||
"nan": "2.10.0",
|
"nan": "2.10.0",
|
||||||
"node-sass": "4.9.1",
|
"node-sass": "4.9.2",
|
||||||
"node-sass-json-importer": "3.3.1",
|
"node-sass-json-importer": "3.3.1",
|
||||||
"nprogress": "0.2.0",
|
"nprogress": "0.2.0",
|
||||||
"object-assign-deep": "0.4.0",
|
"object-assign-deep": "0.4.0",
|
||||||
|
@ -5,7 +5,7 @@ import accept from '../../../../services/following/requests/accept';
|
|||||||
import { IFollow } from '../../type';
|
import { IFollow } from '../../type';
|
||||||
|
|
||||||
export default async (actor: IRemoteUser, activity: IFollow): Promise<void> => {
|
export default async (actor: IRemoteUser, activity: IFollow): Promise<void> => {
|
||||||
const id = typeof activity.object == 'string' ? activity.object : activity.object.id;
|
const id = typeof activity.actor == 'string' ? activity.actor : activity.actor.id;
|
||||||
|
|
||||||
if (!id.startsWith(config.url + '/')) {
|
if (!id.startsWith(config.url + '/')) {
|
||||||
return null;
|
return null;
|
||||||
|
@ -5,7 +5,7 @@ import reject from '../../../../services/following/requests/reject';
|
|||||||
import { IFollow } from '../../type';
|
import { IFollow } from '../../type';
|
||||||
|
|
||||||
export default async (actor: IRemoteUser, activity: IFollow): Promise<void> => {
|
export default async (actor: IRemoteUser, activity: IFollow): Promise<void> => {
|
||||||
const id = typeof activity.object == 'string' ? activity.object : activity.object.id;
|
const id = typeof activity.actor == 'string' ? activity.actor : activity.actor.id;
|
||||||
|
|
||||||
if (!id.startsWith(config.url + '/')) {
|
if (!id.startsWith(config.url + '/')) {
|
||||||
return null;
|
return null;
|
||||||
|
@ -31,7 +31,7 @@ export default async (actor: IRemoteUser, activity: IFollow): Promise<void> => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
if (req) {
|
if (req) {
|
||||||
await cancelRequest(actor, followee);
|
await cancelRequest(followee, actor);
|
||||||
} else {
|
} else {
|
||||||
await unfollow(actor, followee);
|
await unfollow(actor, followee);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user