etc/Sharkey
0
0
Fork 0
mirror of https://activitypub.software/TransFem-org/Sharkey synced 2024-12-22 00:10:14 +00:00
Code Issues Projects Releases Packages Wiki Activity
28964 commits 54 branches 924 tags 177 MiB
Commit graph

7273 commits

Author SHA1 Message Date
dakkar
6a3dc40c31 lint translations in embeds, too 2024-10-22 12:05:07 +01:00
dakkar
82674d8718 lint all uses of translations 2024-10-22 12:02:23 +01:00
Lhc_fl
6aaeda13b9
fix: should use invite limit cycle to calculate invite/limit 2024-10-22 18:48:24 +08:00
饺子w (Yumechi)
48d1539f3b
Merge commit from fork 
[ghsa-gq5q-c77c-v236](https://github.com/misskey-dev/misskey/security/advisories/ghsa-gq5q-c77c-v236)

Signed-off-by: eternal-flame-AD <yume@yumechi.jp>
 2024-10-22 18:17:56 +09:00
github-actions[bot]
8b6d321a76 Bump version to 2024.10.2-alpha.0 2024-10-22 08:45:08 +00:00
syuilo
952fec5665
feat: 過去のノートを非公開化/フォロワーのみ表示可能にできる機能 (#14814) 
* wip

* Update CHANGELOG.md

* wip

* wip

* wip

* Update privacy.vue

* wip
 2024-10-22 17:08:53 +09:00
Hazelnoot
bc45ff2103 add warning about incomplete remote data on following feed 2024-10-21 17:57:54 -04:00
Hazelnoot
04654b2f84 add "followers" tab to following feed 2024-10-21 17:55:06 -04:00
Hazelnoot
053b47d78a return error when calling following feed with both includeReplies and filesOnly 2024-10-21 17:55:06 -04:00
Hazelnoot
6430a191f7 fix duplicate users in the following feed 2024-10-21 17:55:06 -04:00
dakkar
d7a3ec9c5e re-add "copy link (origin)" that was dropped accidentally 
there are 2 nearly identical blocks of code that generate the menu for
logged-in users and for not-logged-in… I had missed the logged-in one
 2024-10-21 15:14:56 +01:00
dakkar
dfee4108f9 Revert "Experimental: dont mark backfetched notes as silent" 
This reverts commit 1410f8d501.
 2024-10-21 14:10:54 +01:00
syuilo
70b2a8f72e fix(frontend): /iのレスポンスに含まれないプロパティが消えずに残り続ける問題を修正 2024-10-21 19:59:20 +09:00
syuilo
c4f1ca2fd9 fix(frontend): MkSelectでmodelValueが更新されない限り値を更新しないように 2024-10-21 19:14:02 +09:00
dakkar
d103b76ab0 merge: chore: fix type errors in useNoteCapture (!701) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/701

Approved-by: Marie <github@yuugi.dev>
Approved-by: dakkar <dakkar@thenautilus.net>
 2024-10-21 08:04:34 +00:00
かっこかり
bc1fce9af6
fix(frontend): デッキのタイムラインカラムでwithSensitiveが利用できない問題を修正 (#14772) 
* fix(frontend): デッキのタイムラインカラムでwithSensitiveが利用できない問題を修正

* Update Changelog

* Update Changelog

* Update packages/frontend/src/ui/deck/tl-column.vue
 2024-10-21 13:22:21 +09:00
Yuba
2f9c04b23b
refs#10866 投稿ダイアログでEscキーが押されたときIME入力中ならダイアログは閉じない (#14787) 2024-10-21 12:51:45 +09:00
syuilo
5c79d8db20
feat: ノートの閲覧にログイン必須にする設定 (#14799) 
* wip

* wip

* wip

* Update packages/frontend/src/pages/note.vue

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

* wip

* Update WebhookTestService.ts

* Update privacy.vue

* wip

* rename

* Update locales/ja-JP.yml

Co-authored-by: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com>

* 🎨

* wip

---------

Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
Co-authored-by: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com>
 2024-10-21 12:49:29 +09:00
かっこかり
bc0c53b92b
fix(frontend): Captcha のエラーハンドリング (#14811) 
* fix(frontend): Captcha のエラーハンドリングを修正 (MisskeyIO#768)

(cherry picked from commit 88912d0f8c63a762fbb1d43e5c1abf4fd9fc05d4)

* Update Changelog

* typo

---------

Co-authored-by: riku6460 <17585784+riku6460@users.noreply.github.com>
 2024-10-21 11:44:57 +09:00
Lhc_fl
5e4ed13213
revert import sort 2024-10-21 09:03:14 +08:00
Lhc_fl
684be7d709
fix: fix type error of useNoteCapture 2024-10-21 01:38:03 +08:00
Lhc_fl
54addd0390
fix: fix type error of useNoteCapture 2024-10-21 01:35:40 +08:00
dakkar
4ccc0c4b1e merge: Optimizations to InternalStorageService (resolves #753) (!694) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/694

Closes #753

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
 2024-10-20 15:48:46 +00:00
Hazelnoot
90d8050df4 merge: Fix "Mark as Sensitive by default" locking files into a Sensitive state (!700) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/700

Closes #760

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Hazelnoot <acomputerdog@gmail.com>
 2024-10-20 12:17:17 +00:00
Marie
65ac5fef46
fix: default sensitive not letting users unmark files 2024-10-20 11:04:48 +02:00
かっこかり
d6caa4d9c4
fix(frontend): 通知の範囲指定が必要ない通知設定でも範囲指定がでている問題を修正 (#14798) 
* fix(frontend): 通知の範囲指定が必要ない通知設定でも範囲指定がでている問題を修正

* Update Changelog

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
 2024-10-20 17:29:41 +09:00
syuilo
041c9caf31 🎨 2024-10-20 16:38:27 +09:00
tetsuya-ki
1d106b3ae8
Enhance: ドライブでソートができるように (#14801) 
* Enhance: ドライブでソートができるように

* Update CHANGELOG.md
 2024-10-20 16:17:16 +09:00
Marie
5e49246c1e
upd: apply suggestion 2024-10-20 08:42:55 +02:00
Hazelnoot
fcd2c93a19 ensure that "thumbnail stored" / "web stored" messages only appear after success 2024-10-20 00:13:07 -04:00
Hazelnoot
7aee3c1617 fix comment typo in InternalStorageService.ts 2024-10-20 00:11:14 -04:00
Hazelnoot
b1d9314d6e pre-create the files directory to reduce IO operations 2024-10-20 00:10:11 -04:00
Hazelnoot
2deb64486b use async IO for InternalStorageService 2024-10-20 00:10:10 -04:00
Marie
8bf7495c92
upd: remove file on cleaner, fix load more not working 2024-10-20 01:58:35 +02:00
かっこかり
58419e1621
refactor(frontend): ページ内でdocument.titleを直接操作させない, タイポ修正 など (taiyme#288) (#14778) 
Co-authored-by: taiy <53635909+taiyme@users.noreply.github.com>
 2024-10-19 21:45:25 +09:00
かっこかり
2250e521e4
refactor(frontend): getBgColorを共通化 (#14782) 
* refactor: getBgColor関数の切り出し + fix types (taiyme#291)

* move thing

* revert unnecesary changes

---------

Co-authored-by: taiy <53635909+taiyme@users.noreply.github.com>
 2024-10-19 18:02:09 +09:00
かっこかり
a3a99467f0
enhance(frontend): Bull Dashboard に relationship queue を追加 (#14777) 
* spec(frontend): Bull Dashboard に relationship queue を追加 (MisskeyIO#751)

(cherry picked from commit a8bbccbefa67ca0f2c1ec0880da88dfc7517b6a0)

* Update Changelog

* Update Changelog

---------

Co-authored-by: riku6460 <17585784+riku6460@users.noreply.github.com>
 2024-10-19 17:25:11 +09:00
dakkar
2a4c91efcc Merge branch 'develop' into feature/2024.9.0 2024-10-18 22:09:11 +01:00
Marie
290bfd2075 merge: Allow logged in users to refresh polls (!686) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/686

Closes #743

Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: dakkar <dakkar@thenautilus.net>
 2024-10-18 21:03:07 +00:00
dakkar
52e291af67 Merge branch 'develop' into feature/2024.9.0 2024-10-18 22:00:07 +01:00
Marie
ed064b2193
upd: remove type username to confirm dialog 
resolves # 759
 2024-10-18 01:09:46 +02:00
Marie
fea7889e0c
upd: add recommended checks 2024-10-17 21:56:43 +02:00
Marie
5152192e09
fix: add missing type 2024-10-17 20:22:16 +02:00
Marie
42530b5a39
upd: add additional check from delete endpoint 2024-10-17 20:15:20 +02:00
Marie
360a127ad7
chore: indent 2024-10-17 20:14:25 +02:00
Marie
1d9cb4fad9
upd: add decline endpoint and free up username on decline 2024-10-17 20:11:10 +02:00
dakkar
786677b079 merge: Feat: Implement clickable notifications (!685) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/685

Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: dakkar <dakkar@thenautilus.net>
 2024-10-17 15:56:05 +00:00
Hazelnoot
fbe6b31878 fix eslint errors in all projects due to over-including files 2024-10-16 10:30:38 -04:00
Hazelnoot
6c30c94b92 fix eslint errors in frontend / frontend-embed 2024-10-16 09:55:29 -04:00
Hazelnoot
2c8af72168 fix formatting in boot.js 2024-10-16 09:15:03 -04:00
Hazelnoot
0c2e113e8e update fast-xml-parser to patch security issue (DoS) 2024-10-15 22:03:42 -04:00
Hazelnoot
af3bb7346e update axios and ws to patch security issue (unexploitable in our case) 2024-10-15 22:00:39 -04:00
Hazelnoot
1f53df66d4 update katex to patch security issue (DoS + 2 more unexploitable) 2024-10-15 21:51:11 -04:00
Hazelnoot
5f3cb09eb1 fix lint errors in SkFormula.vue 2024-10-15 21:50:05 -04:00
Hazelnoot
1a9f2f84b3 fix linting and type checks in all packages 2024-10-15 21:41:36 -04:00
Hazelnoot
b20e671452 disable linting in megalodon, as it's 3rd party code 2024-10-15 21:41:23 -04:00
Hazelnoot
45ac7e50bc fix locales versioning in service worker 2024-10-15 21:40:20 -04:00
Hazelnoot
b5a1c54d65 fix lint errors in backend unit tests 2024-10-15 21:40:20 -04:00
Hazelnoot
7431866d86 fix locales versioning in backend client 2024-10-15 21:40:20 -04:00
Hazelnoot
9b06347882 fix TS errors in NoteCreateService / NoteEditService 2024-10-15 21:31:34 -04:00
Hazelnoot
de61781c4a fix TS errors in vite config files 2024-10-15 21:23:03 -04:00
Hazelnoot
7e220d6e31 fix lint error in const.ts 2024-10-15 21:22:46 -04:00
Hazelnoot
c5f1279d4b fix lint / TS errors in create-notification.ts 2024-10-15 21:22:23 -04:00
Marie
4128b38724 chore: update misskey-js 2024-10-15 18:21:09 -04:00
Marie
dedb24fe74 chore: change permission kind 2024-10-15 18:21:09 -04:00
Marie
6b56163931 upd: change condition 2024-10-15 18:21:08 -04:00
Marie
61cb46b171 upd: hide refresh if logged out and if local, change blocked error message 2024-10-15 18:21:08 -04:00
Marie
00bb958874 chore: change string to locale 2024-10-15 18:21:08 -04:00
Marie
dd58a4aa92 upd: add ability to refresh poll 2024-10-15 18:21:08 -04:00
Hazelnoot
8a34d8e9d2 Merge branch 'develop' into feature/2024.9.0 
# Conflicts:
#	locales/en-US.yml
#	locales/ja-JP.yml
#	packages/backend/src/core/NoteCreateService.ts
#	packages/backend/src/core/NoteDeleteService.ts
#	packages/backend/src/core/NoteEditService.ts
#	packages/frontend-shared/js/config.ts
#	packages/frontend/src/boot/common.ts
#	packages/frontend/src/pages/following-feed.vue
#	packages/misskey-js/src/autogen/endpoint.ts
 2024-10-15 18:09:11 -04:00
Hazelnoot
68b90df00b merge: Refresh locales after any change, not just a version update (resolves #732) (!692) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/692

Closes #732

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
 2024-10-15 21:50:56 +00:00
Marie
7647aa637a merge: Improvements and tweaks to latest note handling (resolves #744) (!688) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/688

Closes #744

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
 2024-10-15 21:50:32 +00:00
Hazelnoot
de9b99c937 merge: Add filter options to following feed (resolves #726) (!671) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/671

Closes #726

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
 2024-10-15 21:50:26 +00:00
Hazelnoot
e781be3c72 add unit tests for SkLatestNote.areEquivalent 2024-10-15 14:17:19 -04:00
Hazelnoot
e19193c9d0 unify logic of SkLatestNote.areEquivalent and SkLatestNote.keyFor 2024-10-15 14:17:19 -04:00
Hazelnoot
5dc700938d update latest_note for edits 2024-10-15 14:17:19 -04:00
Hazelnoot
93cf2f9045 factor out latest_note logic into LatestNoteService 2024-10-15 14:17:19 -04:00
Hazelnoot
c55af9c3b3 update latest note in background (don't await the result) 2024-10-15 14:17:19 -04:00
Hazelnoot
fa687ecb33 fix is-renote tests 2024-10-15 14:16:46 -04:00
Hazelnoot
d3792ab201 fix test failures 2024-10-15 14:16:46 -04:00
Hazelnoot
9b1bae653d add "show bots" toggle to following feed 2024-10-15 14:16:46 -04:00
Hazelnoot
24fd35e03d revert accidental change to postgres.ts 2024-10-15 14:16:46 -04:00
Hazelnoot
e3c79b0c83 fix typos in track-latest-note-type migration 2024-10-15 14:16:46 -04:00
Hazel K
fb7ac68ece match following endpoint default values with frontend defaults 2024-10-15 14:16:46 -04:00
Hazel K
499e8895c5 save filters for following feed 2024-10-15 14:16:46 -04:00
Hazel K
463b9ac59d add filters for following feed 2024-10-15 14:16:46 -04:00
Hazel K
56e7d7e0b1 remove un-necessary assignment to query 2024-10-15 14:16:46 -04:00
Hazel K
9d3292e6e9 add type columns to SkLatestNote 2024-10-15 14:16:46 -04:00
Hazel K
fea993f6b2 correct name of SkLatestNote 2024-10-15 14:16:46 -04:00
Hazelnoot
86a693b182 factor out tuple logic into from-tuple.ts 2024-10-15 14:03:57 -04:00
Hazelnoot
4e592fb1c9 federate Flag.object as an array to fix Pleroma compatibility 2024-10-15 13:54:28 -04:00
Hazelnoot
5c1d16947c fix import order in common.ts 2024-10-15 12:28:40 -04:00
Hazelnoot
652cc8602c refresh locales after any change, not just a version update 2024-10-15 12:23:18 -04:00
github-actions[bot]
d2e8dc4fe3 Release: 2024.10.1 2024-10-15 04:53:43 +00:00
zyoshoka
b990ae6b23
test(backend): add federation test (#14582) 
* test(backend): add federation test

* fix(ci): install pnpm

* fix(ci): cd

* fix(ci): build entire project

* fix(ci): skip frontend build

* fix(ci): pull submodule when checkout

* chore: show log for debugging

* Revert "chore: show log for debugging"

This reverts commit a930964b8d6ba550c23bce1e7fb45d92eab49ef9.

* fix(ci): build entire project

* chore: omit unused globals

* refactor: use strictEqual and simplify some asserts

* test: follow requests

* refactor: add resolveRemoteNote function

* refactor: refine resolveRemoteUser function

* refactor: cache admin credentials

* refactor: simplify assertion with excluded fields

* refactor: use assert

* test: note

* chore: labeler detect federation

* test: blocking

* test: move

* fix: use appropriate TLD

* chore: shorter purge interval

* fix(ci): change TLD

* refactor: delete trivial comment

* test(user): isCat

* chore: use jest

* chore: omit logs

* chore: add memo

* fix(ci): omit unnecessary build

* test: pinning Note

* fix: build daemon in container

* style: indent

* test(streaming): timeline

* chore: rename

* fix: delete role after test

* refactor: resolve users by uri

* fix: delete antenna after test

* test: api timeline

* test: Note deletion

* refactor: sleep function

* test: notification

* style: indent

* refactor: type-safe host

* docs: update description

* refactor: resolve function params

* fix(block): wrong test name

* fix: invalid type

* fix: longer timeout for fire testing

* test(timeline): hashtag

* test(note): vote delivery

* fix: wrong description

* fix: hashtag channel param type

* refactor: wrap basic cases

* test(timeline): add homeTimeline tests

* fix(timeline): correct wrong case and description

* test(notification): add tests for Note

* refactor(user): wrap profile consistency with describe

* chore(note): add issue link

* test(timeline): add test

* test(user): suspension

* test: emoji

* refactor: fetch admin first

* perf: faster tests

* test(drive): sensitive flag

* test(emoji): add tests

* chore: ignore .config/docker.env

* chore: hard-coded tester IP address

* test(emoji): custom emoji are surrounded by zero width space

* refactor: client and username as property

* test(notification): mute

* fix(notification): correct description

* test(block): mention

* refactor(emoji): addCustomEmoji function

* fix: typo

* test(note): add reaction tests

* test(timeline): Note deletion

* fix: unnecessary ts-expect-error

* refactor: unnecessary fetch mocking

* chore: add TODO comments

* test(user): deletion

* chore: enable --frozen-lockfile

* fix(ci): copying configs

* docs: update CONTRIBUTING.md

* docs: fix typo

* chore: set default sleep duration

* fix(notification): omit flaky tests

* fix(notification): correct type

* test(notification): add api endpoint tests

* chore: remove redundant mute test

* refactor: use param client

* fix: start timer after trigger

* refactor: remove unnecessary any

* chore: shorter timeout for checking if fired

* fix(block): remove outdated comment

* refactor: shorten remote user variable name

* refactor(block): use existing function

* refactor: file upload

* docs: update description

* test(user): ffVisibility

* fix: `/api/signin` -> `/api/signin-flow`

* test: abuse report

* refactor: use existing type

* refactor: extract duplicate configs to template file

* fix: typo

* fix: avoid conflict

* refactor: change container dependency

* perf: start misskey parallelly

* fix: remove dependency

* chore(backend): add typecheck

* test: add check for #14728

* chore: enable eslint check

* perf: don't start linked services when test

* test(note): remote note deletion for moderation

* chore: define config template

* chore: write setup script

* refactor: omit unnecessary conditional

* refactor: clarify scope

* refactor: omit type assertion

* refactor: omit logs

* style

* refactor: redundant promise

* refactor: unnecessary imports

* refactor: use readable error code

* refactor: cache set in signin function

* refactor: optimize import
 2024-10-15 13:37:00 +09:00
syuilo
3cea890eba fix(frontend): blinkアニメーションが動作していないのを修正 2024-10-15 13:01:06 +09:00
syuilo
b5de525548 add note 2024-10-15 10:32:00 +09:00
syuilo
5005cc8ae3 add note 2024-10-14 21:00:20 +09:00
syuilo
f13c3909a0 refactor(backend): remove unnecessary any 2024-10-14 17:54:27 +09:00
syuilo
77ebabb3dc Revert "refactor" 
This reverts commit 7fd8ef344b.
 2024-10-14 17:51:47 +09:00
syuilo
7fd8ef344b refactor 2024-10-14 17:43:44 +09:00
syuilo
b0a251d231 🎨 2024-10-14 15:35:44 +09:00
github-actions[bot]
04e74aa28c Bump version to 2024.10.1-beta.6 2024-10-14 04:19:47 +00:00
syuilo
3b361a9d0b perf(frontend): make skipNoteRender on by default 2024-10-14 12:37:18 +09:00
syuilo
c46d6d8edd perf(frontend-embed): improve note rendering performance 2024-10-14 12:34:03 +09:00
syuilo
64bbce4cf4 perf(frontend): improve notification rendering performance 2024-10-14 12:32:59 +09:00
github-actions[bot]
ddca6bdc01 Bump version to 2024.10.1-beta.5 2024-10-14 02:34:17 +00:00
かっこかり
8b7290d6b0
enhance(backend): 個人宛のお知らせはわかったを押すとアーカイブするように (#14762) 
* enhance(backend): 個人宛のお知らせはわかったを押すとアーカイブするように

* Update Changelog

* enhance(frontend): アーカイブ済みのものを読み込めるように

* Update Changelog

* fix changelog

* 🎨
 2024-10-14 11:23:26 +09:00
syuilo
2190092de6 perf(frontend): ノートのレンダリングをスキップできるように 2024-10-14 11:22:02 +09:00
syuilo
064d6ca56f fix(backend): RBT有効時、リノートのリアクションが反映されない問題を修正 2024-10-14 09:11:03 +09:00
かっこかり
d0bb0b51f5
fix(frontend): タイムラインで、広告がない際にも広告のwrapperが出てしまうのを修正 (#14763) 2024-10-14 03:06:10 +09:00
かっこかり
088e05ea66
fix(frontend): 使用されているexposeを復活させる (#14764) 2024-10-14 02:54:01 +09:00
Hazelnoot
2cd41228d8 Merge branch 'develop' into feature/2024.9.0 2024-10-13 11:35:10 -04:00
github-actions[bot]
fb23b24f5c Bump version to 2024.10.1-beta.4 2024-10-13 11:43:27 +00:00
おさむのひと
33b34ad7b8
feat: 運営のアクティビティが一定期間ない場合は通知＋招待制に移行した際に通知 (#14757) 
* feat: 運営のアクティビティが一定期間ない場合は通知＋招待制に移行した際に通知

* fix misskey-js.api.md

* Revert "feat: 運営のアクティビティが一定期間ない場合は通知＋招待制に移行した際に通知"

This reverts commit 3ab953bdf87f28411a1a10bce787a23d238cda80.

* 通知をやめてユーザ単位でのお知らせ機能に変更

* テスト用実装を戻す

* Update packages/backend/src/queue/processors/CheckModeratorsActivityProcessorService.ts

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>

* fix remove empty then

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
 2024-10-13 20:32:12 +09:00
syuilo
5229f5de4d refactor(backend): remove unnecessary .then 2024-10-13 20:32:02 +09:00
syuilo
ff47fef572
feat: リモートサーバーのサーバー情報を収集しないオプション (#14634) 
* wip

* wip

* Update FetchInstanceMetadataService.ts

* Update FetchInstanceMetadataService.ts

* Update types.ts
 2024-10-13 20:22:16 +09:00
かっこかり
45d42b8641
feat: ユーザーの名前に禁止ワードを設定できるように (#14756) 
* wip

* 🎨

* Enhance: モデレーター以上は制限の影響を受けないように

* refactor

* better error handling

* fix

* Revert "better error handling"

This reverts commit 5670b29cfa18a3894d0c2abfe0e5ef862e3b9ffa.

* error handling

* エラーが出ないのを修正

* translation

* Update Changelog

* status code

* ✌️

* モデレーター以上は影響ないことを明記

* 🎨

* update changelog

* spdx

* Update update.ts

* refactor

* eliminate `screen name`

* remove untracked file

---------

Co-authored-by: KanariKanaru <93921745+kanarikanaru@users.noreply.github.com>
 2024-10-13 20:21:25 +09:00
Hazelnoot
bd2cdd9363 restore missing hasPendingReceivedFollowRequest in navbar 2024-10-13 01:09:49 -04:00
Lhc_fl
edce54ad0f add new i18n pendingFollowRequests 2024-10-13 01:04:41 -04:00
Lhc_fl
19a1f3111b fix default followreq tab 2024-10-13 01:04:41 -04:00
Lhc_fl
0c03f9ead0 fix default followreq tab 2024-10-13 01:04:40 -04:00
Lhc_fl
0e6ba9ccd4 ux: should not show follow requests tab when have no pending sent follow req 2024-10-13 01:04:40 -04:00
Lhc_fl
1eacf0772c FEAT: Allow users to view pending follow requests they sent 
This commit implements the `following/requests/sent` interface firstly
implemented on Firefish, and provides a UI interface to view the pending
follow requests users sent.
 2024-10-13 01:04:40 -04:00
Marie
45974a53f8 merge: try to avoid insert races in FederatedInstanceService (!683) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/683

Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
 2024-10-13 00:17:16 +00:00
Marie
fdfb0faab0 merge: Add missing rejectReports field to show-instance API response (!679) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/679

Approved-by: Marie <github@yuugi.dev>
Approved-by: Tess K <me@thvxl.se>
 2024-10-13 00:13:26 +00:00
CenTdemeern1
808963189e Autogen seems to have generated this file 
This doesn't seem related so I'm putting it in its own commit so it can be dropped easily if needed
 2024-10-13 01:03:29 +02:00
CenTdemeern1
5085c39440 Implement clickable notifications 
I'm not sure about the get function pattern here as it doesn't include a value to base reactivity on; I might be too used to Svelte though and maybe that's fine
 2024-10-13 01:03:29 +02:00
Hazelnoot
3093707469 merge: Prevent usernames from overflowing the reactions hover-list (resolves #737) (!682) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/682

Closes #737

Approved-by: Marie <github@yuugi.dev>
Approved-by: Tess K <me@thvxl.se>
 2024-10-12 21:46:04 +00:00
dakkar
a44d58781f Merge branch 'develop' into feature/2024.9.0 2024-10-12 20:00:40 +01:00
dakkar
80fdb595a6 fix editing notes 2024-10-12 19:45:47 +01:00
dakkar
14e21d00b9 honour prefers-reduced-motion in embeds 2024-10-12 19:45:35 +01:00
dakkar
bf6ca8efdc also ignore stale *failed* responses - #741 
since `misskeyApi` doesn't pass us the request, we close over a copy
of the username we requested, to make sure it still matches the
current username value
 2024-10-12 18:23:20 +01:00
dakkar
5af38db74b ignore stale users/show responses - fixes #741 
* person starts typing "abcd"
* request for user "abcd" is sent to server
* person continues typing "ef"
* request for user "abcdef" is sent to server
* response for user "abcdef" arrives, icon for user "abcdef" is shown
* response for user "abcd" arrives, icon for user "abcd" was shown –
  with this commit, this response is ignored instead

This is not just "showing the wrong avatar", btw: `MkSignin` uses the
`user` variable to decide whether to use 2FA, so having the wrong data
in user can make a login attempt fail.
 2024-10-12 18:16:06 +01:00
Marie
464fb22710 fix: accidental double backslash in DEFAULT_INFO_IMAGE_URL 2024-10-12 11:41:20 +00:00
dakkar
06bd29f209 try to avoid insert races in FederatedInstanceService 
Despite the cache, different processes can race to insert a row for
the same remote host.

This is particularly apparent in our unit tests, with
`test/unit/activitypub.ts` randomly failing.

This is a (somewhat clumsy) attempt at working around that race: trap
the "duplicate key value" error, and fetch the record.

Tests pass, with or without values in the cache.
 2024-10-12 10:57:57 +01:00
dakkar
98f1f30e72 fix "federation allowed" check in our code 2024-10-12 09:35:45 +01:00
Hazelnoot
a1375c8ab7 prevent usernames from overflowing the reactions hover-list 2024-10-12 00:29:40 -04:00
syuilo
c4c69cd267 🎨 2024-10-12 11:28:58 +09:00
FineArchs
ee08e9f51e
refactor: MkStickyContainerで<style />を使う (#14755) 
* remove rootEL ref

* use css module

* use v-bind in css

* --MI prefix

* remove unused ref

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
 2024-10-12 11:20:55 +09:00
syuilo
85bb1ff1db 🎨 2024-10-12 11:18:26 +09:00
syuilo
824c51a19f fix(frontend): fix style 
Fix #14754
 2024-10-12 10:32:00 +09:00
syuilo
a87a18f40d Update about-misskey.vue 2024-10-12 10:11:55 +09:00
Marie
f68c0ac05d fix: broken error images 2024-10-11 22:06:37 +00:00
Hazelnoot
adbea34c11 generate missing type for UserLite.isSilenced 2024-10-11 14:10:13 -04:00
Hazelnoot
b27b398717 fix calculation of instance-info.isSuspended when instance is null 2024-10-11 14:07:31 -04:00
Hazelnoot
148bf98f21 Merge branch 'develop' into feature/2024.9.0 
# Conflicts:
#	packages/frontend/src/pages/instance-info.vue
 2024-10-11 14:06:21 -04:00
Marie
f3e6b43ea4 merge: New logo (!681) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/681

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
 2024-10-11 18:04:32 +00:00
Ruben
69483bb55b
new logo 2024-10-11 11:32:35 -05:00
Hazelnoot
7837852149 copy iAmModerator check to other instance-info controls 2024-10-11 11:25:10 -04:00
Hazelnoot
66a88c89b5 fix TypeScript and ESLint errors in instance-info.vue 2024-10-11 11:24:39 -04:00
Hazelnoot
a39f5c92b4 add missing rejectReports field to show-instance response 2024-10-11 10:21:32 -04:00
Hazelnoot
f496d4b88b re-implement suspension toggle to match other controls 2024-10-11 10:16:57 -04:00
Hazelnoot
87a12c020f convert "suspend deliver" button into a toggle 2024-10-11 09:52:59 -04:00
Hazelnoot
eb2ea85d40 merge: Minor improvements to relation badges on user profiles (!674) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/674

Approved-by: Marie <github@yuugi.dev>
Approved-by: dakkar <dakkar@thenautilus.net>
 2024-10-11 13:28:55 +00:00
かっこかり
2f09d69773
fix(backend): キューのエラーログを簡略化するように (#14748) 
* reduce federation log spam

* Don't record stack trace for unrecoverable errors.
* Avoid logging duplicate stace traces.

(cherry picked from commit ed0570110b)

* improve error summaries

(cherry picked from commit 20dd66f735)

* fix lint errors

(cherry picked from commit 83869e1c47)

* condense job info

(cherry picked from commit 786702e076)

* fix maxAttempts calculation

(cherry picked from commit b4d10aa8f8)

* condense error info

(cherry picked from commit f62cd8941c)

* normalize ID logging

(cherry picked from commit d8e1e4890d)

* further condense error details

(cherry picked from commit d867c2089b)

* collapse AbortErrors

(cherry picked from commit 5171ba7113)

* don't log job name unless it has one

(cherry picked from commit a5316c06ed)

* Update Changelog

* Record origin

---------

Co-authored-by: Hazel K <acomputerdog@gmail.com>
 2024-10-11 21:29:03 +09:00
github-actions[bot]
777804605e Bump version to 2024.10.1-beta.3 2024-10-11 12:13:47 +00:00
syuilo
af1cbc131f
wip (#14745) 2024-10-11 21:05:53 +09:00
syuilo
c397b42242 chore: add description 2024-10-11 21:01:50 +09:00
おさむのひと
a2cd6a7709
feat(backend): 7日間運営のアクティビティがないサーバを自動的に招待制にする (#14746) 
* feat(backend): 7日間運営のアクティビティがないサーバを自動的に招待制にする

* fix RoleService.

* fix

* fix

* fix

* add test and fix

* fix

* fix CHANGELOG.md

* fix test
 2024-10-11 20:59:36 +09:00
dakkar
fb9b6b1208 thank you linters 2024-10-11 12:20:08 +01:00
dakkar
3cec5f927e fix some linting in frontends 2024-10-11 11:24:49 +01:00
dakkar
2ecaa57cd5 fix nyaize test 2024-10-11 10:25:07 +01:00
dakkar
02d36c4518 Merge branch 'develop' into feature/2024.9.0 2024-10-11 10:10:16 +01:00
dakkar
a12815eabe fix some (all?) Misskey references 2024-10-11 09:59:21 +01:00
FineArchs
12bc671511
fix: admin/emoji/update で不正なエラーが発生する (#14750) 
* fix emoji updating bug

* update changelog

* type fix

* " -> '

* conprehensiveness check

* lint

* undefined -> null
 2024-10-11 17:17:45 +09:00
Marie
fefdd1c1e8 merge: Fix: Finding emoji that include capital letters (!676) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/676

Closes #522

Approved-by: Marie <github@yuugi.dev>
Approved-by: dakkar <dakkar@thenautilus.net>
 2024-10-10 20:11:03 +00:00
CenTdemeern1
5cebb4da54 fix: Finding emoji that include capital letters 
Custom emoji names and aliases that include capital letters can now be found in the emoji picker.
I kind of hate copy-pasting `.toLowerCase()` like this but apparently I'm not allowed to refactor Misskey code.
 2024-10-10 21:48:53 +02:00
Hazelnoot
ffff1dfc7d merge: Reduce federation log spam (maybe resolves #689) (!649) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/649

Closes #689

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
 2024-10-10 19:43:39 +00:00
Hazelnoot
a7076ed3e0 show "blocking you" indicator to instance staff only 2024-10-10 14:01:40 -04:00
Hazelnoot
523ad3d60c add "following" and "mutuals" relation badges 2024-10-10 14:01:40 -04:00
Hazelnoot
1b106d92e0 fix HTML semantics of relational info-badges 2024-10-10 14:01:40 -04:00
Hazelnoot
2be802131f merge: On user profiles, move pinned notes down with the other note tabs (resolves #555) (!651) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/651

Closes #555

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
 2024-10-10 16:33:39 +00:00
Marie
8e85487f64 merge: Add show bots toggle to hamburger menu (!664) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/664

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
 2024-10-10 16:31:20 +00:00
codingneko
1b278f5630 Remove show bots from client settings 2024-10-10 16:15:59 +00:00
dakkar
2da85e1163 (not related to the merge) fix instance name in severAllFollowRelations 2024-10-10 14:09:36 +01:00
dakkar
9ea618c4a5 fix some DI mistakes after the merge 2024-10-10 13:55:52 +01:00
dakkar
a2d47f686f replace icons in embeds 2024-10-10 13:50:20 +01:00
dakkar
7628fe9c46 show image comment as title in embeds 2024-10-10 13:48:40 +01:00
dakkar
e87b1d2b11 set isBlock for mfm render in embeds 2024-10-10 13:48:39 +01:00
dakkar
abb93f1d79 use sfm for embeds 2024-10-10 13:48:39 +01:00
dakkar
faa7b26344 maybe update embed mfm to our changes 2024-10-10 13:48:39 +01:00
syuilo
1ad3148533 clean up 2024-10-10 17:35:10 +09:00
github-actions[bot]
132c4ba6ce Bump version to 2024.10.1-beta.2 2024-10-10 07:24:24 +00:00
syuilo
4c84842f3d 🎨 2024-10-10 16:14:32 +09:00
syuilo
54849bde6c clean up 2024-10-10 16:14:11 +09:00
かっこかり
b668d161a9
refactor(frontend): prefix css variables (UI) (#14739) 
* refactor(frontend): prefix css variables

* `MI_UI` -> `MI`

* fix

* `stickyBottom`

* stickyTop
 2024-10-10 16:12:16 +09:00
github-actions[bot]
21e51567e7 Bump version to 2024.10.1-beta.1 2024-10-10 05:56:04 +00:00
github-actions[bot]
ebae39cba5 Bump version to 2024.10.1-alpha.0 2024-10-10 05:17:00 +00:00
かっこかり
a624546812
fix(frontend): ユーザー登録完了時にサインインAPIを別途使用していたのを修正 (#14738) 
* fix(frontend): ユーザー登録完了時にサインインAPIを別途使用していたのを修正

* emitされるオブジェクトの型を変更したことに伴う修正

* Update Changelog
 2024-10-10 14:05:20 +09:00
Marie
7bd971c036
upd: add option to disable external url warning 2024-10-10 02:00:41 +02:00
dakkar
ebe5f678f6 fix imports in channels bubble-timeline 2024-10-09 17:57:58 +01:00
dakkar
dec81d32d3 fix type in channel.ts 2024-10-09 17:56:40 +01:00
dakkar
671d71b3ba probably use correct icons in embeds 2024-10-09 17:24:33 +01:00
dakkar
43bdae4cc4 use injected meta in search-by-tag 2024-10-09 17:19:50 +01:00
dakkar
3b3bd68645 use injected meta in MastodonApiServerService 2024-10-09 17:18:38 +01:00
dakkar
9200d35f57 use injected meta in stream bubble-timeline 2024-10-09 17:17:27 +01:00
dakkar
7b7bc8b7b3 use injected meta in claim-achievement.ts 2024-10-09 17:15:27 +01:00
dakkar
96e77f8d39 use injected meta in like.ts 
also, add extra errors copied from reactions/create.ts
 2024-10-09 17:15:04 +01:00
dakkar
81376bcd1b use injected meta in SigninApiService 2024-10-09 17:10:02 +01:00
dakkar
ee439f9c7f remove MetaService from ActivityPubServerService 2024-10-09 17:07:43 +01:00
dakkar
f449e8ffe6 use injected meta is ApRendererService 2024-10-09 17:05:59 +01:00
dakkar
c31ee21485 fix meta in SignupService 2024-10-09 17:04:31 +01:00
dakkar
e6a78d8027 use injected meta in SponsorsService 2024-10-09 17:03:46 +01:00
dakkar
b04568f378 use injected meta in bubble-timeline 2024-10-09 17:00:38 +01:00
dakkar
ad33886bbb always use this.meta in SignupApiService 2024-10-09 16:53:46 +01:00
dakkar
afbed7f605 check redisForReactions at startup 2024-10-09 16:49:49 +01:00
dakkar
11e3c95026 replace isBlockedHost with isFederationAllowedHost 2024-10-09 16:39:24 +01:00
dakkar
60c6267d7a replace new icons with ours 2024-10-09 16:24:10 +01:00
dakkar
0a7075044a fix deleteAndEdit danger class 2024-10-09 16:10:03 +01:00
dakkar
10aab285d1 fix import 2024-10-09 16:07:37 +01:00
dakkar
50120371f7 fix import 2024-10-09 16:07:30 +01:00
dakkar
5856858f49 try to fix icons 2024-10-09 15:52:42 +01:00
dakkar
73abf3204e fix following-feed imports 2024-10-09 15:52:42 +01:00
dakkar
c5ff081557 fix MkUrlWarningDialog imports 2024-10-09 15:52:42 +01:00
dakkar
7519f98462 copy changes from MkNoteDetailed to SkNoteDetailed 2024-10-09 15:52:42 +01:00
dakkar
3fca2ba2f6 copy changes from MkNote to SkNote 2024-10-09 15:52:42 +01:00
dakkar
1a656e8eb5 copy changes from NoteCreateService to NoteEditService 2024-10-09 15:40:00 +01:00
dakkar
b4c53687b4 oops, missed a closing tag 2024-10-09 15:27:05 +01:00
dakkar
f00576bce6 Merge remote-tracking branch 'misskey/master' into feature/2024.9.0 2024-10-09 15:17:22 +01:00
dakkar
2d6f1ed464 Merge branch 'merge-requests/668' into feature/2024.9.0 2024-10-09 10:41:22 +01:00
syuilo
4a356f1ba7
refactor(frontend): prefix css variables (#14725) 
* wip

* Update index.d.ts

* remove unnecessary codes
 2024-10-09 18:08:14 +09:00
github-actions[bot]
6de7c27522 Release: 2024.10.0 2024-10-09 05:17:26 +00:00
syuilo
c13545f965 🎨 2024-10-09 11:58:51 +09:00
syuilo
dd39c5e059
Update packages/frontend/src/components/MkAbuseReport.vue 
Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
 2024-10-09 09:47:28 +09:00
Marie
72a0f16b38 merge: Show instance sponsors if OC is set as donation url (!642) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/642

Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: Julia <julia@insertdomain.name>
 2024-10-08 18:07:58 +00:00
Hazel K
a5316c06ed don't log job name unless it has one 2024-10-08 11:01:24 -04:00
Hazel K
5171ba7113 collapse AbortErrors 2024-10-08 10:43:58 -04:00
Hazel K
d867c2089b further condense error details 2024-10-08 10:43:51 -04:00
Hazel K
d8e1e4890d normalize ID logging 2024-10-08 10:33:48 -04:00
Hazel K
f62cd8941c condense error info 2024-10-08 10:33:34 -04:00
Hazel K
b4d10aa8f8 fix maxAttempts calculation 2024-10-08 10:29:03 -04:00
Hazel K
786702e076 condense job info 2024-10-08 10:27:55 -04:00
Hazel K
83869e1c47 fix lint errors 2024-10-08 10:14:33 -04:00
Hazel K
20dd66f735 improve error summaries 2024-10-08 10:14:26 -04:00
Hazel K
ed0570110b reduce federation log spam 
* Don't record stack trace for unrecoverable errors.
* Avoid logging duplicate stace traces.
 2024-10-08 09:30:08 -04:00
syuilo
d0213962bf
Update packages/backend/src/core/entities/FlashEntityService.ts 
Co-authored-by: zyoshoka <107108195+zyoshoka@users.noreply.github.com>
 2024-10-08 18:59:10 +09:00
piuvas
672c4f746c
inform users about sharkey specific localization 2024-10-08 00:33:16 -03:00
syuilo
c14eba3e6d
Update packages/frontend/src/store.ts 
Co-authored-by: anatawa12 <anatawa12@icloud.com>
 2024-10-08 10:40:41 +09:00
Hazel K
eb5a2b023e count CW for character limit 2024-10-07 19:25:03 -04:00
Hazelnoot
a90b4d487a merge: Increase character hard limits (resolves #686 and #696) (!647) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/647

Closes #686 and #696

Approved-by: Marie <github@yuugi.dev>
Approved-by: dakkar <dakkar@thenautilus.net>
 2024-10-07 23:20:14 +00:00
Hazel K
5f435f7250 restore sorting of pinned notes 2024-10-07 16:26:30 -04:00
Hazel K
c783ccf8cb sort pinned notes by date 2024-10-07 16:20:40 -04:00
Hazel K
35114df6d4 always default to latest notes instead of pins 2024-10-07 16:20:40 -04:00
Hazel K
3003affe6a fix extra gap above user notes 2024-10-07 16:20:40 -04:00
Hazel K
60ec877d3c on user profiles, move pinned notes down with the other notes 2024-10-07 16:20:40 -04:00
codingneko
3defc831c3 Fix formatting issues 2024-10-07 21:51:55 +02:00
Marie
ba5eec2129 merge: Prevent deletion or suspension of system accounts (resolves #625) (!666) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/666

Closes #625

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
 2024-10-07 19:34:26 +00:00
Marie
f7e9ffb99a merge: Display instance follow/following relationships in instance view (partial implementation of 648) (!665) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/665

Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
 2024-10-07 19:30:48 +00:00
Hazel K
cd9bce3072 prevent login and password reset for system accounts 2024-10-07 14:58:39 -04:00
Hazel K
126a2fcf15 Merge branch 'develop' into hazelnoot/625-protect-system-accounts 2024-10-07 14:10:45 -04:00
Hazel K
39214431f4 check for host 2024-10-07 11:45:58 -04:00
Hazel K
9137ae1eef update autogen types 2024-10-07 11:21:52 -04:00
Hazel K
6cfadb1f61 add prefix to components 2024-10-07 11:21:37 -04:00
Hazel K
12de9fcb18 fix error display 2024-10-07 11:18:08 -04:00
PrivateGER
46e53e294e
Parameterize followee as well 2024-10-07 16:47:15 +02:00
Hazel K
0da7f9b3f6 Merge branch 'develop' into hazelnoot/following-timeline 2024-10-07 10:45:16 -04:00
Hazel K
adc7b91e3b fix UI hiding on admin-user.vue 2024-10-07 10:41:41 -04:00
Hazel K
c77e90d98a update autogen types 2024-10-07 10:41:18 -04:00
Hazel K
844dfaaf5d model missing "approved" property in show-user response 2024-10-07 10:40:44 -04:00
PrivateGER
1c3495ef59
Make including followers in response a parameter 2024-10-07 16:23:24 +02:00
Hazel K
a790fef261 prevent deletion or suspension of system accounts 2024-10-07 10:02:55 -04:00
PrivateGER
bfd812720e Move styling to MkA elements 2024-10-07 12:46:28 +02:00
PrivateGER
80cbf00eac Add following and follower relationship view 2024-10-07 12:30:49 +02:00
PrivateGER
a292e46f84 Pack other side of relation into response as well 2024-10-07 11:56:18 +02:00
codingneko
347dc25bb8 Add show bots toggle 2024-10-07 03:12:29 +02:00
github-actions[bot]
3a11d5ede6 Bump version to 2024.10.0-beta.6 2024-10-07 00:54:00 +00:00
FineArchs
ed89b4bd94
refactor: 拡張機能インストールのページの一部をコンポーネントとして分離 (#14654) 
* create MkExtensionInstaller.vue

* annotation

* add fallbacks

* storybook

* update annotations

* Update MkExtensionInstaller.vue

* use additonalInfo slot
 2024-10-07 09:46:04 +09:00
syuilo
8b2780c730
Update packages/frontend/src/store.ts 
Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
 2024-10-07 09:42:35 +09:00
かっこかり
d2f1d45ea3
fix(frontend): クライアント上での時間ベースの実績獲得動作が実績獲得後も発動している問題を修正 (#14717) 
* Check if time-based achievements are unlocked before initializing them in main-boot

(cherry picked from commit c0702fd92f)

* Update Changelog

---------

Co-authored-by: Evan Paterakis <evan@geopjr.dev>
 2024-10-07 09:07:02 +09:00
PrivateGER
fadae347ff Merge branch 'develop' of https://activitypub.software/TransFem-org/Sharkey into feat/instance-admin-ui 2024-10-06 23:13:10 +02:00
Marie
28bfd87537 merge: Add option to reject reports from an instance (Resolves #579, #715, #716) (!662) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/662

Closes #579, #715, and #716

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
 2024-10-06 19:39:38 +00:00
PrivateGER
f028795483 Move text into translation files 2024-10-06 20:31:41 +02:00
Hazelnoot
42dbe999e1 merge: Change the recent external url warning popup to the one from Cherrypick/MisskeyIO (!648) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/648

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Hazelnoot <acomputerdog@gmail.com>
 2024-10-06 17:56:36 +00:00
PrivateGER
941a200f35 Move button into button group 2024-10-06 19:53:10 +02:00
Marie
939f07fa55
upd: fix returns 2024-10-06 19:08:32 +02:00
Hazel K
047563bdde Merge branch 'develop' into hazelnoot/579-reject-reports 
# Conflicts:
#	packages/frontend/src/pages/instance-info.vue
 2024-10-06 12:26:25 -04:00
Hazel K
60d0e3df7b preserve refresh button on mobile UI 2024-10-06 12:20:06 -04:00
Hazel K
01fb606fee fix weird left-alignment 2024-10-06 12:18:15 -04:00
Hazel K
d016ef7675 fix display size reactivity 2024-10-06 12:02:56 -04:00
Marie
6d7c7357ab merge: Warn when a domain is implicitly blocked because a base domain is blocked (resolves #564) (!661) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/661

Closes #564

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
 2024-10-06 15:54:46 +00:00
Hazelnoot
702bb9e5e0 merge: Set visitor dashboard's menu button z-index to 50 (!656) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/656

Approved-by: Marie <github@yuugi.dev>
Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: dakkar <dakkar@thenautilus.net>
 2024-10-06 15:44:57 +00:00
Hazel K
4ca27692ac Merge branch 'develop' into hazelnoot/following-timeline 2024-10-06 11:16:43 -04:00
Hazel K
eec4a5082d fix OpenAPI definition for admin/meta.silencedHosts 2024-10-06 11:03:28 -04:00
Hazel K
605c22b55e add lockout for isMediaSilenced 2024-10-06 10:58:27 -04:00
Hazel K
008ac89672 fix translation string 2024-10-06 10:58:06 -04:00
Hazel K
9b11aead5a Merge branch 'develop' into hazelnoot/564-warn-when-base-domain-is-blocked 2024-10-06 10:48:20 -04:00
Hazel K
2bc9ce93b8 add missing import 2024-10-06 10:47:55 -04:00
Hazelnoot
ad4054f4e4 merge: Dont mark backfetched notes as silent (!655) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/655

Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: dakkar <dakkar@thenautilus.net>
 2024-10-06 13:56:44 +00:00
Marie
5f7730bd5c merge: Show yes/no options instead of ok/cancel when pasting long text (resolves #584) (!658) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/658

Closes #584

Approved-by: Marie <github@yuugi.dev>
Approved-by: dakkar <dakkar@thenautilus.net>
 2024-10-06 10:51:22 +00:00
Marie
88f3f0c7eb merge: Indicate that a user is blocked / muted (resolves #557) (!659) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/659

Closes #557

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
 2024-10-06 10:48:48 +00:00
Marie
17617b6355 merge: Include Mastodon's "indexable" property on federated user profiles (resolves #713) (!660) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/660

Closes #713

Approved-by: Marie <github@yuugi.dev>
Approved-by: dakkar <dakkar@thenautilus.net>
 2024-10-06 10:47:14 +00:00
Marie
f77eb34225 merge: Check if time-based achievements are unlocked before initializing them in main-boot (!657) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/657

Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
 2024-10-06 10:38:51 +00:00
Hazel K
7dd296017b fix modlog and translations for "Mark as NSFW" 2024-10-05 22:43:34 -04:00
Hazel K
61124699da fix lint errors 2024-10-05 22:21:00 -04:00
Hazel K
4da0d4be71 add option to reject reports from an instance 2024-10-05 22:01:55 -04:00
Hazel K
b23d650a15 warn when a domain is hard-blocked by a base domain 2024-10-05 20:42:31 -04:00
Hazel K
c315f9ccf5 include Mastodon's "indexable" property on federated user profiles 2024-10-05 19:48:35 -04:00
Hazel K
e622ab7cc7 indicate if a user is blocked / muted by the current user 2024-10-05 19:13:09 -04:00
Hazel K
c635992616 restore primary highlighting 2024-10-05 18:47:50 -04:00