graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-26 23:53:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

disable account migration

Browse source
This commit is contained in:
syuilo 2023-04-08 20:51:36 +09:00
parent 50a9b29c48
commit 2321214c98
4 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -21,7 +21,6 @@
### General ### General
- チャンネルをお気に入りに登録できるように - チャンネルをお気に入りに登録できるように
- チャンネルにノートをピン留めできるように - チャンネルにノートをピン留めできるように
- アカウントの引っ越し（フォロワー引き継ぎ）に対応
### Client ### Client
- 投稿フォームのデザインを改善 - 投稿フォームのデザインを改善

2
packages/backend/src/core/activitypub/ApInboxService.ts
View file

@ -140,7 +140,7 @@ export class ApInboxService {
} else if (isFlag(activity)) { } else if (isFlag(activity)) {
await this.flag(actor, activity); await this.flag(actor, activity);
} else if (isMove(activity)) { } else if (isMove(activity)) {
await this.move(actor, activity); //await this.move(actor, activity);
} else { } else {
this.logger.warn(`unrecognized activity type: ${activity.type}`); this.logger.warn(`unrecognized activity type: ${activity.type}`);
} }

4
packages/backend/src/server/api/endpoints.ts
View file

@ -551,8 +551,8 @@ const eps = [
['i/unpin', ep___i_unpin], ['i/unpin', ep___i_unpin],
['i/update-email', ep___i_updateEmail], ['i/update-email', ep___i_updateEmail],
['i/update', ep___i_update], ['i/update', ep___i_update],
['i/move', ep___i_move], //['i/move', ep___i_move],
['i/known-as', ep___i_knownAs], //['i/known-as', ep___i_knownAs],
['i/webhooks/create', ep___i_webhooks_create], ['i/webhooks/create', ep___i_webhooks_create],
['i/webhooks/list', ep___i_webhooks_list], ['i/webhooks/list', ep___i_webhooks_list],
['i/webhooks/show', ep___i_webhooks_show], ['i/webhooks/show', ep___i_webhooks_show],

4
packages/frontend/src/pages/settings/index.vue
View file

@ -164,12 +164,12 @@ const menuDef = computed(() => [{
text: i18n.ts.importAndExport, text: i18n.ts.importAndExport,
to: '/settings/import-export', to: '/settings/import-export',
active: currentPage?.route.name === 'import-export', active: currentPage?.route.name === 'import-export',
}, { }, /*{
icon: 'ti ti-plane', icon: 'ti ti-plane',
text: i18n.ts.accountMigration, text: i18n.ts.accountMigration,
to: '/settings/migration', to: '/settings/migration',
active: currentPage?.route.name === 'migration', active: currentPage?.route.name === 'migration',
}, { },*/ {
icon: 'ti ti-dots', icon: 'ti ti-dots',
text: i18n.ts.other, text: i18n.ts.other,
to: '/settings/other', to: '/settings/other',