Commit Graph

8 Commits

Author SHA1 Message Date
kakkokari-gtyih daaa4457e9 Revert "Merge commit 'e41619775f0ab57d67d4f49637768417730d68c0' into notes-embed"
This reverts commit a5fd0e1153.
2023-09-21 13:39:57 +09:00
kakkokari-gtyih a5fd0e1153 Merge commit 'e41619775f0ab57d67d4f49637768417730d68c0' into notes-embed 2023-09-21 13:31:34 +09:00
kakkokari-gtyih 2addc38597 Revert "Merge branch 'develop' into notes-embed"
This reverts commit 0836b55dfa.
2023-09-21 13:12:12 +09:00
kakkokari-gtyih 32316b0bb5 Revert "Merge branch 'develop' into notes-embed"
This reverts commit f8a2aea7fa.
2023-09-21 13:11:06 +09:00
kakkokari-gtyih f8a2aea7fa Merge branch 'develop' into notes-embed 2023-09-21 13:07:18 +09:00
kakkokari-gtyih 0836b55dfa Merge branch 'develop' into notes-embed 2023-09-21 13:00:51 +09:00
syuilo a8e8b2e2cf fix migrations
Fix #8363
2022-03-01 00:07:03 +09:00
romaboo 054417354c
feat: user-level instance mute (#7712)
* Update ja-JP.yml

* Added settable config for muted instances

* added psql query for removal of muted notes

* Added filtering and trimming for instance mutes

* cleaned up filtering of bad instance mutes and added a refresh at the end for the list on the client

* Added notification & streaming timeline muting

* Updated changelog

* Added missing semicolon

* Apply japanese string suggestions from robflop

Co-authored-by: Robin B. <robflop98@outlook.com>

* Changed Ja-JP instance mute title string to one suggested by sousuke

Co-authored-by: sousuke0422 <sousuke20xx@gmail.com>

* Update ja-JP instanceMuteDescription based on sousuke's suggestion

Co-authored-by: sousuke0422 <sousuke20xx@gmail.com>

* added notification mute

* added notification and note children muting

* Fixed a bug where local notifications were getting filtered on cold start

* Fixed instance mute imports

* Fixed not saving/loading instance mutes

* removed en-US translations for instance mute

* moved instance mute migration to js

* changed settings index back to spaces

* removed destructuring assignment from notification stream in instance mute check call

Co-authored-by: tamaina <tamaina@hotmail.co.jp>

* added .note accessor for checking note data instead of notification data

* changed note to use Packed<'Note'> instead of any and removed usage of snake case

Co-authored-by: tamaina <tamaina@hotmail.co.jp>

* changed notification mute check to check specifically for notification host

* changed to using single quotes

* moved @click to the end for the linter

* revert unnecessary changes

* restored newlines

* whitespace removal

Co-authored-by: syuilo <syuilotan@yahoo.co.jp>
Co-authored-by: Robin B. <robflop98@outlook.com>
Co-authored-by: sousuke0422 <sousuke20xx@gmail.com>
Co-authored-by: puffaboo <emilis@jigglypuff.club>
Co-authored-by: tamaina <tamaina@hotmail.co.jp>
2021-12-09 21:38:56 +09:00