Hazelnoot
40975719ec
Merge branch 'misskey-develop' into merge/2025-03-24
...
# Conflicts:
# package.json
# packages/backend/src/core/entities/NotificationEntityService.ts
# packages/backend/src/types.ts
# packages/frontend/src/pages/admin/modlog.ModLog.vue
# packages/misskey-js/src/consts.ts
# packages/misskey-js/src/entities.ts
2025-03-25 16:17:34 -04:00
Hazelnoot
d8908ef2d8
merge upstream
2025-03-25 16:14:53 -04:00
syuilo
fc576ebc64
fix(backend): 承認したチャットルームへの招待の通知が存在するとエラーになる問題を修正
2025-03-25 18:34:25 +09:00
syuilo
304d0eb83b
enhance: チャットルームに招待されたときの通知を追加
2025-03-25 15:25:43 +09:00
syuilo
f1f24e39d2
Feat: Chat ( #15686 )
...
* wip
* wip
* wip
* wip
* wip
* wip
* Update types.ts
* Create 1742203321812-chat.js
* wip
* wip
* Update room.vue
* Update home.vue
* Update home.vue
* Update ja-JP.yml
* Update index.d.ts
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* Update CHANGELOG.md
* wip
* Update home.vue
* clean up
* Update misskey-js.api.md
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* lint fixes
* lint
* Update UserEntityService.ts
* search
* wip
* 🎨
* wip
* Update home.ownedRooms.vue
* wip
* Update CHANGELOG.md
* Update style.scss
* wip
* improve performance
* improve performance
* Update timeline.test.ts
2025-03-24 21:32:46 +09:00
Hazelnoot
a35c2f214b
convert Authorized Fetch to a setting and add support for hybrid mode (essential metadata only)
2025-03-16 10:07:57 -04:00
Marie
40599190f7
add: libretranslate
2025-03-06 01:03:02 +01:00
syuilo
616cccf251
enhance(backend): refine system account ( #15530 )
...
* wip
* wip
* wip
* Update SystemAccountService.ts
* Update 1740121393164-system-accounts.js
* Update DeleteAccountService.ts
* wip
* wip
* wip
* wip
* Update 1740121393164-system-accounts.js
* Update RepositoryModule.ts
* wip
* wip
* wip
* Update ApRendererService.ts
* wip
* wip
* Update SystemAccountService.ts
* fix tests
* fix tests
* fix tests
* fix tests
* fix tests
* fix tests
* add print logs
* ログが長すぎて出てないかもしれない
* fix migration
* refactor
* fix fed-tests
* Update RelayService.ts
* merge
* Update user.test.ts
* chore: emit log
* fix: tweak sleep duration
* fix: exit 1
* fix: wait for misskey processes to become healthy
* fix: longer sleep for user deletion
* fix: make sleep longer again
* デッドロック解消の試み
https://github.com/misskey-dev/misskey/issues/15005
* Revert "デッドロック解消の試み"
This reverts commit 266141f66fb584371bbb56ef7eba04e14bcff94d.
* wip
* Update SystemAccountService.ts
---------
Co-authored-by: おさむのひと <46447427+samunohito@users.noreply.github.com>
Co-authored-by: zyoshoka <107108195+zyoshoka@users.noreply.github.com>
2025-03-02 20:06:20 +09:00
Hazelnoot
14a81b4f85
merge: Add "reject quotes" settings ( !901 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/901
Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
2025-03-01 03:33:06 +00:00
Hazelnoot
cba9fcd4f2
make hideNote public
2025-02-25 20:46:36 -05:00
syuilo
2b6638e160
feat: google analytics ( #15451 )
...
* wip backend
* wip frontend
* build misskey-js
* implement control panel
* fix
* introduce analytics wrapper
* spdx
* Update analytics.ts
* Update common.ts
* wip
* wip
* wip
* wip
* wip
* Update CHANGELOG.md
---------
Co-authored-by: kakkokari-gtyih <67428053+kakkokari-gtyih@users.noreply.github.com>
2025-02-25 11:51:23 +00:00
Hazelnoot
f39f47aade
include rejectQuotes on all packed User entities
2025-02-20 21:12:12 -05:00
Hazelnoot
292d3b9229
add "reject quotes" toggle at user and instance level
...
+ improve, cleanup, and de-duplicate quote resolution
+ add warning message when quote cannot be loaded
+ add "process error" framework to display warnings when a note cannot be correctly loaded from another instance
2025-02-20 09:57:48 -05:00
Hazelnoot
c5933f369e
move mandatoryCW from admin-user to PackedUserLite (public field)
2025-02-16 19:20:41 -05:00
Hazelnoot
2d7918a9b7
merge: Merge upstream 2025.2.0 ( !886 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/886
Approved-by: Marie <github@yuugi.dev>
Approved-by: Amber Null <puppygirlhornyposting@gmail.com>
2025-02-16 21:42:35 +00:00
dakkar
e5c41444e6
merge: fill myReaction in more cases - may fix #944 ( !907 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/907
Closes #944
Approved-by: Charlotte <timo.herngreen@gmail.com>
Approved-by: Hazelnoot <acomputerdog@gmail.com>
2025-02-16 13:39:27 +00:00
dakkar
949664147e
fill myReaction in more cases - may fix !944
...
* first of all, fetch from the buffer all the notes we may
need (including replied-to ones)
* then, distinguish between "we know there's no myReaction" and "we
don't know if there's any myReaction"
* finally, look at both a note and the note it's replying to
2025-02-16 11:41:32 +00:00
syuilo
ffd8cf07e6
update deps ( #15311 )
...
* wip
* bump misskey-dev/eslint-plugin
* lint fixes (backend)
* lint fixes (frontend)
* lint fixes (frontend-embed)
* rollback nsfwjs to 4.2.0
ref: infinitered/nsfwjs#904
* rollback openapi-typescript to v6
v7でOpenAPIのバリデーションが入るようになった関係でスコープ外での変更が避けられないため一時的に戻した
* lint fixes (misskey-js)
* temporarily disable errored lint rule (frontend-shared)
* fix lint
* temporarily ignore errored file for lint (frontend-shared)
* rollback simplewebauthn/server to 12.0.0
v13 contains breaking changes that require some decision making
* lint fixes (frontend-shared)
* build misskey-js with types
* fix(backend): migrate simplewebauthn/server to v12
* fix(misskey-js/autogen): ignore indent rules to generate consistent output
* attempt to fix test
changes due to capricorn86/happy-dom#1617 (XMLSerializer now produces valid XML)
* attempt to fix test
changes due to capricorn86/happy-dom#1617 (XMLSerializer now produces valid XML)
* fix test
* fix test
* fix test
* Apply suggestions from code review
Co-authored-by: anatawa12 <anatawa12@icloud.com>
* bump summaly to v5.2.0
* update tabler-icons to v3.30.0-based
---------
Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
Co-authored-by: anatawa12 <anatawa12@icloud.com>
2025-02-15 10:24:22 +09:00
Hazelnoot
feb80ee992
Merge branch 'develop' into merge/2024-02-03
2025-02-11 10:52:52 -05:00
Hazelnoot
5a1d1394d4
add memo and isInstanceMuted to UserRelation API entity
2025-02-08 13:17:47 -05:00
Hazelnoot
f36029f795
Merge branch 'develop' into merge/2024-02-03
...
# Conflicts:
# locales/index.d.ts
# packages/backend/src/core/entities/UserEntityService.ts
# packages/frontend/src/_dev_boot_.ts
# packages/misskey-js/src/autogen/types.ts
# sharkey-locales/en-US.yml
2025-02-07 11:57:44 -05:00
Hazelnoot
c8f8a61a00
add MiUserProfile.defaultCWPriority property and API
2025-02-05 14:22:50 -05:00
Hazelnoot
74407bc8ee
add MiUserProfile.defaultCW property and API
2025-02-05 14:22:50 -05:00
Hazelnoot
baff0605e0
fix import order in UserEntityService.ts
2025-02-04 09:16:35 -05:00
Hazelnoot
a8e4ad28b3
remove unused DI parameter
2025-02-04 09:15:14 -05:00
Hazelnoot
ce8374bdc9
remove spurious newline
2025-02-04 09:13:49 -05:00
Hazelnoot
a4e86758c1
merge upstream 2025-02-03
2025-02-03 14:36:09 -05:00
Kinetix
993532bc1f
Adding robots.txt override via admin control panel
...
This is a requested low priority feature in #418 - I created the changes
to follow similarly to how the Instance Description is handled.
2025-01-28 15:57:45 -08:00
おさむのひと
f9ad127aaf
feat: 新カスタム絵文字管理画面(β)の追加 ( #13473 )
...
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* wip
* fix
* fix
* fix
* fix size
* fix register logs
* fix img autosize
* fix row selection
* support delete
* fix border rendering
* fix display:none
* tweak comments
* support choose pc file and drive file
* support directory drag-drop
* fix
* fix comment
* support context menu on data area
* fix autogen
* wip イベント整理
* イベントの整理
* refactor grid
* fix cell re-render bugs
* fix row remove
* fix comment
* fix validation
* fix utils
* list maximum
* add mimetype check
* fix
* fix number cell focus
* fix over 100 file drop
* remove log
* fix patchData
* fix performance
* fix
* support update and delete
* support remote import
* fix layout
* heightやめる
* fix performance
* add list v2 endpoint
* support pagination
* fix api call
* fix no clickable input text
* fix limit
* fix paging
* fix
* fix
* support search
* tweak logs
* tweak cell selection
* fix range select
* block delete
* add comment
* fix
* support import log
* fix dialog
* refactor
* add confirm dialog
* fix name
* fix autogen
* wip
* support image change and highlight row
* add columns
* wip
* support sort
* add role name
* add index to emoji
* refine context menu setting
* support role select
* remove unused buttons
* fix url
* fix MkRoleSelectDialog.vue
* add route
* refine remote page
* enter key search
* fix paste bugs
* fix copy/paste
* fix keyEvent
* fix copy/paste and delete
* fix comment
* fix MkRoleSelectDialog.vue and storybook scenario
* fix MkRoleSelectDialog.vue and storybook scenario
* add MkGrid.stories.impl.ts
* fix
* [wip] add custom-emojis-manager2.stories.impl.ts
* [wip] add custom-emojis-manager2.stories.impl.ts
* wip
* 課題はまだ残っているが、ひとまず完了
* fix validation and register roles
* fix upload
* optimize import
* patch from dev
* i18n
* revert excess fixes
* separate sort order component
* add SPDX
* revert excess fixes
* fix pre test
* fix bugs
* add type column
* fix types
* fix CHANGELOG.md
* fix lit
* lint
* tweak style
* refactor
* fix ci
* autogen
* Update types.ts
* CSS Module化
* fix log
* 縦スクロールを無効化
* MkStickyContainer化
* regenerate locales index.d.ts
* fix
* fix
* テスト
* ランダム値によるUI変更の抑制
* テスト
* tableタグやめる
* fix last-child css
* fix overflow css
* fix endpoint.ts
* tweak css
* 最新への追従とレイアウト微調整
* ソートキーの指定方法を他と合わせた
* fix focus
* fix layout
* v2エンドポイントのルールに対応
* 表示条件などを微調整
* fix MkDataCell.vue
* fix error code
* fix error
* add comment to MkModal.vue
* Update index.d.ts
* fix CHANGELOG.md
* fix color theme
* fix CHANGELOG.md
* fix CHANGELOG.md
* fix center
* fix: テーブルにフォーカスがあり、通常状態であるときはキーイベントの伝搬を止める
* fix: ロール選択用のダイアログにてコンディショナルロールを×ボタンで除外できなかったのを修正
* fix remote list folder
* sticky footers
* chore: fix ci error(just single line-break diff)
* fix loading
* fix like
* comma to space
* fix ci
* fix ci
* removed align-center
---------
Co-authored-by: osamu <46447427+sam-osamu@users.noreply.github.com>
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
Co-authored-by: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com>
2025-01-20 11:35:37 +00:00
かっこかり
5445b023e5
enhance: 連合モードにあわせてフロントエンドを変化させるように ( #15112 )
...
* enhance(backend): metaにfederation modeに関する情報を公開
* enhance(frontend): 登録画面の注意書きを追加
* enhance(frontend): aboutページ・サーバー情報
* enhance(frontend): サーバー統計
* enhance(frontend): みつけるページ
* enhance(frontend): 検索
* enhance(frontend): ユーザー選択
* enhance(frontend): 設定画面
* enhance(frontend): ウィジェット
* enhance(frontend): リモートで開くオプション
* Update Changelog
* enhance(frontend): ステータスバー
* i18n
---------
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
2025-01-14 11:08:54 +00:00
taichan
d7835313c3
fix(backend): ロックダウンされた期間指定のノートがStreaming経由でLTLに出現するのを修正 ( #15200 )
...
* fix(backend): skipHideなときにもロックダウンされたノートのprivate化をするように
* fix linting
* Update packages/backend/src/core/entities/NoteEntityService.ts
* Fix: type error
* Remove unneeded await
* Fix: typo
* Remove skipTreatVisibillity
2025-01-08 05:33:08 +00:00
piuvas
e5312da6fe
improve readability and conciseness
2024-12-25 14:19:05 -03:00
piuvas
9828562e57
testing w/ reactions and stuff
2024-12-23 21:03:04 -03:00
dakkar
e2352839e4
merge: upstream changes for 2024.11 ( !742 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/742
Closes #645 and #646
Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
2024-12-15 17:27:12 +00:00
JeDaYoshi
535e0c69ce
Fix notifications breaking due to deleted role being assigned
2024-12-13 16:49:19 -04:00
dakkar
b266a5f9f6
Merge branch 'develop' into feature/2024.10
2024-12-12 17:38:29 +00:00
Hazelnoot
fe37aa2ce8
Add "enable RSS" user privacy toggle
2024-12-12 08:11:55 -05:00
dakkar
6d4ae93592
Merge branch 'develop' into feature/2024.10
2024-12-12 13:04:51 +00:00
Marie
1d3c825398
upd: add notification for when scheduled note gets posted
2024-12-09 05:33:19 +01:00
Marie
170093f2a2
chore: remove from note required type
2024-12-09 05:33:08 +01:00
Marie
fc9d777dc3
upd: add notification for failures, add reasons for failure, apply suggestions
2024-12-09 05:32:51 +01:00
dakkar
eb25238a8e
Merge branch 'develop' into feature/2024.10
2024-11-28 11:17:27 +00:00
Julia
52976588a7
merge: Bump develop version ( !789 )
...
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/789
2024-11-28 06:15:32 +00:00
dakkar
6c13dc04f2
Merge branch 'develop' into feature/2024.10
2024-11-23 10:41:33 +00:00
tess
ebdfb2feb7
Comply with type for Packed<'Note'>
2024-11-22 21:57:04 +01:00
dakkar
bc816cb166
Merge tag '2024.11.0' into feature/2024.10
2024-11-22 12:29:04 +00:00
dakkar
d069d78c21
Merge branch 'develop' into feature/2024.10
2024-11-22 10:42:58 +00:00
Hazelnoot
4b503f88e1
normalize naming of isPackedPureRenote and PackedPureRenote
2024-11-20 22:27:52 -05:00
Hazelnoot
faf1b3559a
fix note hiding when renote and target have different visibility settings
2024-11-20 22:27:50 -05:00
Julia Johannesen
cc4e99fdde
fix: Try using CacheService to avoid excess db lookups
...
This isn't perfect, theoretically if some massive number of users
blocked the user making this request the set lookup could take a long
amount of time, but eh, it works, and that scenario is highly unlikely.
2024-11-20 19:17:25 -05:00