Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity
25399 commits 49 branches 1047 tags 307 MiB
Commit graph

264 commits

Author SHA1 Message Date
mattyatea 6a06ec1347 2023.12.2-PrisMisskey.2 
bug fix
 2024-01-03 01:32:22 +09:00
mattyatea 4cdf048a7c アイコンデコレーションのカテゴリ 2024-01-03 01:25:54 +09:00
mattyatea 8cb7ba0c16 Merge remote-tracking branch 'misskey-original/develop' into develop 
# Conflicts:
#	package.json
#	packages/frontend/src/components/MkPostForm.vue
 2023-12-30 09:11:09 +09:00
MomentQYC 7948018e6a
feat: Add support for TrueMail (#12850) 
Co-authored-by: MarryDream <2190758465@qq.com>
 2023-12-29 18:23:29 +09:00
mattyatea 09fbfee252 Merge remote-tracking branch 'misskey-original/develop' into develop 
# Conflicts:
#	packages/backend/src/core/EmailService.ts
#	packages/frontend/src/components/MkSignupDialog.form.vue
 2023-12-23 23:16:48 +09:00
GrapeApple0 5b5a537f56
feat: 登録を拒否するメールアドレスのドメインを手動で設定できるように (#12740) 
* feat: 使い捨てアドレスのドメインを手動で設定できるように

* Update CHANGELOG.md

* disposableEmailDomains -> bannedEmailDomains

* isBlockedHostを使うように
 2023-12-23 12:06:22 +09:00
mattyatea 2a9ddf2bc8 多分動くと思うからリリースしようぜ 2023-12-23 10:44:01 +09:00
mattyatea 68b48bc16f Merge remote-tracking branch 'misskey-mattyatea/emoji-request' into develop 
# Conflicts:
#	CHANGELOG.md
#	locales/index.d.ts
#	locales/ja-JP.yml
#	packages/backend/src/core/CustomEmojiService.ts
#	packages/backend/src/models/RepositoryModule.ts
#	packages/backend/src/server/api/EndpointsModule.ts
#	packages/backend/src/server/api/endpoints.ts
#	packages/backend/src/server/api/endpoints/admin/emoji/update.ts
#	packages/frontend/src/components/MkCustomEmojiEditLocal.vue
#	packages/frontend/src/components/MkCustomEmojiEditRemote.vue
#	packages/frontend/src/components/MkEmojiEditDialog.vue
#	packages/frontend/src/pages/about.emojis.vue
#	packages/frontend/src/pages/admin/roles.editor.vue
#	packages/frontend/src/pages/custom-emojis-manager.vue
#	packages/frontend/src/pages/emojis.emoji.vue
 2023-12-23 09:30:48 +09:00
mattyatea 487b3089a0 Merge remote-tracking branch 'misskey-original/develop' into develop 
# Conflicts:
#	README.md
#	packages/frontend/src/components/MkMenu.vue
#	packages/frontend/src/components/MkNote.vue
#	packages/frontend/src/components/MkNoteSimple.vue
#	packages/frontend/src/components/MkPostForm.vue
#	packages/frontend/src/components/MkSignupDialog.form.vue
#	packages/frontend/src/pages/custom-emojis-manager.vue
#	packages/frontend/src/pages/settings/general.vue
#	packages/frontend/src/pages/timeline.vue
#	packages/frontend/src/pages/user/home.vue
#	packages/frontend/src/widgets/WidgetInstanceInfo.vue
 2023-12-23 09:14:17 +09:00
GrapeApple0 79ca93cefb
enhance: api.jsonのレスポンスの内容を実際の内容に合わせる (#12723) 
* Create packedAdSchema

* admin/emoji/add

* admin/get-user-ips

* admin/roles/users

* admin/get-index-stats

* admin/accounts/find-by-email

* fix type of admin/ad/list

* federation/stats

* endpoints

* get-online-users-count

* i/2fa/register-key

* i/2fa/key-done

* i/2fa/register

* i/apps

* i/authorized-apps

* i/registry/get-all

* i/registry/get

* i/registry/get-detail

* i/registry/key-with-type

* i/registry/scopes-with-domain

* i/update-email

* i/move

* i/webhooks/create

* fix miss type

* i/webhooks/show

* i/webhooks/list

* flash/create

* roles/users

* server-info

* test

* users/lists/get-memberships

* users/achievements

* fetch-rss

* fetch-external-resources
 2023-12-21 16:57:05 +09:00
syuilo 15b0d2aff2
enhance: ロールにアサインされたときの通知 (#12607) 
* wip

* Update misskey-js.api.md

* Update CHANGELOG.md

* Update RoleService.ts

* Update locales/ja-JP.yml

Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>

* Update UserListService.ts

* Update misskey-js.api.md

* fix (#12724)

---------

Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
Co-authored-by: おさむのひと <46447427+samunohito@users.noreply.github.com>
 2023-12-21 10:39:11 +09:00
zawa-ch 4e2d802967
enhance: “つながりの公開範囲”がフォロー・フォロワー個別設定できるように (#12702) 
* Enhance: “つながりの公開範囲”がフォロー・フォロワー個別設定できるように (#12072)

* refactor: crowdin 編集部分のコミットを打ち消し

https://github.com/misskey-dev/misskey/pull/12702#issuecomment-1859417158

* refactor: オブジェクトの名前修正

https://github.com/misskey-dev/misskey/pull/12702#issuecomment-1859417158

* fix: 設定項目の説明を削除

名称が具体的になって必要なくなったため
https://github.com/misskey-dev/misskey/pull/12702#discussion_r1429932463
 2023-12-18 20:59:20 +09:00
shiosyakeyakini 3e256eee2c
Fix(backend): JSONSchemaに不足しているパラメータを追加 (#12680) 
* Fix(backend): JSONSchemaに不足しているパラメータを追加

* nullable:falseに修正

---------

Co-authored-by: sorairo <sorairo@shiosyakeyakini.info>
 2023-12-16 09:00:32 +09:00
mattyatea 7313e13397 Merge remote-tracking branch 'misskey-original/develop' into develop 
# Conflicts:
#	packages/frontend/src/components/MkEmojiPicker.vue
#	packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
#	packages/frontend/src/pages/timeline.vue
 2023-12-14 21:08:18 +09:00
syuilo 417852779f enhance: アイコンデコレーションの位置を微調整できるように 2023-12-14 20:58:08 +09:00
syuilo 5472f4b934 enhance: アイコンデコレーションを複数設定できるように 2023-12-13 16:56:19 +09:00
mattyatea 8c4a08c383 Merge remote-tracking branch 'misskey-original/develop' into develop 
# Conflicts:
#	locales/index.d.ts
#	locales/ja-JP.yml
#	package.json
#	packages/backend/src/server/api/endpoints/admin/emoji/copy.ts
#	packages/backend/src/server/api/endpoints/admin/meta.ts
#	packages/backend/src/server/api/endpoints/channels/timeline.ts
#	packages/backend/src/server/api/endpoints/notes/featured.ts
#	packages/frontend/src/components/MkButton.vue
#	packages/frontend/src/components/MkClickerGame.vue
#	packages/frontend/src/components/MkDialog.vue
#	packages/frontend/src/components/MkDrive.vue
#	packages/frontend/src/components/MkEmojiEditDialog.vue
#	packages/frontend/src/components/MkEmojiPicker.section.vue
#	packages/frontend/src/components/MkEmojiPicker.vue
#	packages/frontend/src/components/MkFollowButton.vue
#	packages/frontend/src/components/MkInstanceTicker.vue
#	packages/frontend/src/components/MkLaunchPad.vue
#	packages/frontend/src/components/MkMenu.vue
#	packages/frontend/src/components/MkNote.vue
#	packages/frontend/src/components/MkNoteSimple.vue
#	packages/frontend/src/components/MkPostForm.vue
#	packages/frontend/src/components/MkRadio.vue
#	packages/frontend/src/components/MkSignupDialog.form.vue
#	packages/frontend/src/components/MkSwitch.vue
#	packages/frontend/src/custom-emojis.ts
#	packages/frontend/src/pages/about.emojis.vue
#	packages/frontend/src/pages/about.vue
#	packages/frontend/src/pages/admin/index.vue
#	packages/frontend/src/pages/admin/other-settings.vue
#	packages/frontend/src/pages/custom-emojis-manager.vue
#	packages/frontend/src/pages/settings/general.vue
#	packages/frontend/src/pages/settings/mute-block.vue
#	packages/frontend/src/pages/timeline.vue
#	packages/frontend/src/pages/user/home.vue
#	packages/frontend/src/pages/user/index.files.vue
#	packages/frontend/src/scripts/get-note-menu.ts
#	packages/frontend/src/store.ts
#	packages/frontend/src/ui/_common_/stream-indicator.vue
#	packages/frontend/src/ui/classic.sidebar.vue
#	packages/frontend/src/ui/universal.vue
#	packages/frontend/src/ui/universal.widgets.vue
#	packages/frontend/vite.config.ts
#	packages/misskey-js/etc/misskey-js.api.md
#	packages/misskey-js/src/api.types.ts
#	packages/misskey-js/src/entities.ts
#	packages/misskey-js/src/streaming.types.ts
 2023-12-13 07:08:57 +09:00
yupix e42c91dee7
feat: Roleに関するSchemaを追加 (#12572) 
* feat: Roleに関連するschemaを追加

* feat: 新しいRoleSchemaを使うように

* chore: misskey.jsのデータを更新

* chore: misskey-js.api.mdを更新
 2023-12-06 15:47:57 +09:00
yupix 33034b0e02
feat: ユーザースキーマの改善 (#12568) 
* chore: notifyにenumを設定

* feat: securityKeysListの型を明確に

* feat: notificationRecieveConfigにpropertiesを定義

* chore: misskey.jsのmodelを更新

* fix: as constをつけ忘れている
 2023-12-04 16:53:31 +09:00
おさむのひと e17d741f4b
enhance(misskey-js) misskey-jsのストリーミングAPI定義をバックエンドに追従 (#12552) 
* (enhance) misskey-jsのストリーミングAPI定義をバックエンドに追従

* fix ci

* fix ci
 2023-12-03 12:45:18 +09:00
mattyatea b7f9ad1944 Merge remote-tracking branch 'misskey-mattyatea/schedule-note' into develop 
# Conflicts:
#	locales/index.d.ts
#	locales/ja-JP.yml
#	packages/backend/src/core/RoleService.ts
#	packages/frontend/src/components/MkNoteHeader.vue
#	packages/frontend/src/components/MkPostForm.vue
#	packages/frontend/src/const.ts
#	packages/frontend/src/navbar.ts
#	packages/frontend/src/pages/admin/roles.editor.vue
#	packages/frontend/src/pages/admin/roles.vue
 2023-12-02 00:50:04 +09:00
mattyatea 1802c5da5f Merge remote-tracking branch 'misskey-original/develop' into develop 
# Conflicts:
#	package.json
#	packages/frontend/src/components/MkPostForm.vue
#	packages/frontend/src/navbar.ts
 2023-12-02 00:47:40 +09:00
かっこかり b05d71fabf
feat(frontend): 今日誕生日のフォロー中のユーザーを一覧表示できるウィジェットを追加 (#12450) 
* (add) 今日誕生日のフォロイー一覧表示

* Update Changelog

* Update Changelog

* 実装漏れ

* create index

* (fix) index
 2023-11-30 14:49:26 +09:00
yupix 3b3b908ccd
fix: packedNoteSchemaにclippedCountが抜けている (#12499) 2023-11-29 08:08:06 +09:00
かっこかり 1a54663956
Merge branch 'develop' into schedule-note 2023-11-27 21:21:25 +09:00
mattyatea 359a4a83a0 bug fix 2023-11-24 22:46:54 +09:00
mattyatea ff79746100 Merge remote-tracking branch 'misskey-original/develop' into develop 
# Conflicts:
#	packages/backend/src/models/json-schema/user.ts
#	packages/frontend/src/components/MkNote.vue
#	packages/frontend/src/components/MkReactionsViewer.reaction.vue
#	packages/frontend/src/pages/settings/mute-block.word-mute.vue
#	packages/misskey-js/etc/misskey-js.api.md
 2023-11-24 22:44:42 +09:00
anatawa12 864827f788
Hard mute (#12376) 
* feat(backend,misskey-js): hard mute storage in backend

* fix(backend,misskey-js): mute word record type

* chore(frontend): generalize XWordMute

* feat(frontend): configure hard mute

* feat(frontend): hard mute notes on the timelines

* lint(backend,frontend): fix lint failure

* chore(misskey-js): update api.md

* fix(backend): test failure

* chore(frontend): check word mute for reply

* chore: limit hard mute count
 2023-11-23 18:56:20 +09:00
かっこかり 8d28c2f9d7
Merge branch 'develop' into schedule-note 2023-11-23 15:52:52 +09:00
おさむのひと b5be0e5780
note.tsのchannelを正しい形にしたことにより表出化した型チェックエラーを修正 (#12395) 
Co-authored-by: osamu <46447427+sam-osamu@users.noreply.github.com>
 2023-11-21 15:12:05 +09:00
おさむのひと 8bd9077f77
json-schema配下の最新化 (#12312) 
* user.ts、page.ts、drive-folder.tsを各EntityServiceの戻り値をもとに最新化

* 再確認

* fix error

* note以外の残りのファイルを対応

* fix CHANGELOG.md

* fix CHANGELOG.md

* fix user.ts

* fix user.ts

* コメント対応

* fix note.ts

---------

Co-authored-by: osamu <46447427+sam-osamu@users.noreply.github.com>
 2023-11-21 11:13:56 +09:00
かっこかり b58d266ccd
Merge branch 'develop' into schedule-note 2023-11-20 09:31:54 +09:00
mattyatea e3d8346e21 Merge remote-tracking branch 'misskey-original/develop' into develop 2023-11-19 17:56:14 +09:00
Nafu Satsuki 0a73973a7c メールアドレスの認証にverifymail.ioを使えるようにする。 2023-11-18 21:01:53 +09:00
かっこかり 3413b394e9
Merge branch 'develop' into schedule-note 2023-11-18 00:21:56 +09:00
mattyatea 7bc183cbb7 Merge remote-tracking branch 'misskey-original/develop' into develop 
# Conflicts:
#	packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
#	packages/frontend/src/scripts/mfm-tags.ts
 2023-11-17 13:28:42 +09:00
syuilo 9d78a1a8b3 enhance(backend): make ftt db fallback configurable 2023-11-16 10:20:57 +09:00
mattyatea 36292549c5
Merge remote-tracking branch 'mi-dev/develop' into emoji-req 2023-11-15 14:24:41 +09:00
mattyatea d439dd66f9 Merge remote-tracking branch 'misskey-original/develop' into develop 
# Conflicts:
#	package.json
#	packages/frontend/src/components/MkNotifications.vue
#	packages/frontend/src/components/MkPostForm.vue
#	packages/frontend/src/components/MkTimeline.vue
#	packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
#	packages/frontend/src/pages/user/home.vue
#	packages/frontend/src/ui/_common_/navbar.vue
#	packages/frontend/src/ui/_common_/stream-indicator.vue
 2023-11-15 13:32:09 +09:00
mattyatea 271c872c97
expiresAt to scheduledAt 
Signed-off-by: mattyatea <mattyacocacora0@gmail.com>
 2023-11-14 17:27:52 +09:00
かっこかり ca5bb20cc1
Merge branch 'develop' into schedule-note 2023-11-11 16:45:58 +09:00
atsuchan 50430e310a
Fix: latestRequestReceivedAt (#12270) 2023-11-11 14:51:29 +09:00
kakkokari-gtyih a0e9ebfb83 NoteSchedule -> ScheduledNote 2023-11-09 21:34:18 +09:00
kakkokari-gtyih 3439a29c14 (refactor) better types 2023-11-09 21:20:33 +09:00
mattyatea 540f531b6d
予約投稿の一覧表示、削除をできるようにした 
dbに投稿内容を保存するようにした

Signed-off-by: mattyatea <mattyacocacora0@gmail.com>
 2023-11-09 16:09:51 +09:00
mattyatea 387faf55cf
dbに保存するようにした 
Signed-off-by: mattyatea <mattyacocacora0@gmail.com>
 2023-11-08 15:33:46 +09:00
mattyatea e133a6b6a4
いちおう動くようにはなった 
Signed-off-by: mattyatea <mattyacocacora0@gmail.com>
 2023-11-06 18:15:29 +09:00
mattyatea da40b4df17 Merge remote-tracking branch 'misskey-original/develop' into develop 
# Conflicts:
#	package.json
#	packages/frontend/src/components/MkNoteDetailed.vue
#	packages/frontend/src/components/global/MkCustomEmoji.vue
#	packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
#	packages/frontend/src/pages/settings/general.vue
#	packages/frontend/src/pages/user/home.vue
#	packages/frontend/src/scripts/nyaize.ts
 2023-11-05 21:25:11 +09:00
syuilo c2ddb649f8 enhance: 非通知なお知らせを作成できるように 2023-11-05 09:04:38 +09:00
mattyatea cb1005811d Merge remote-tracking branch 'misskey-original/develop' into develop 
# Conflicts:
#	locales/en-US.yml
#	locales/index.d.ts
#	locales/ja-JP.yml
#	package.json
#	packages/backend/src/server/api/endpoints/notes/create.ts
#	packages/frontend/src/components/MkDrive.file.vue
#	packages/frontend/src/components/MkNote.vue
#	packages/frontend/src/components/MkNoteHeader.vue
#	packages/frontend/src/components/MkPostForm.vue
#	packages/frontend/src/components/MkReactionsViewer.reaction.vue
#	packages/frontend/src/components/MkUserSetupDialog.vue
#	packages/frontend/src/pages/timeline.tutorial.vue
#	packages/frontend/src/pages/timeline.vue
#	packages/misskey-js/etc/misskey-js.api.md
 2023-11-04 01:24:44 +09:00