Commit graph

100 commits

Author SHA1 Message Date
tamaina
e17fca1fd6 Merge branch 'notification-read-api' into swn 2022-01-08 16:59:03 +09:00
tamaina
70fb72b139 Merge branch 'develop' into notification-read-api 2022-01-08 16:58:30 +09:00
syuilo
faef125b74 bye room 2022-01-07 17:06:47 +09:00
syuilo
9693b2166a clean up 2022-01-04 18:01:30 +09:00
tamaina
3fabe81b1f Merge branch 'notification-read-api' into swn 2022-01-04 13:37:02 +09:00
tamaina
728878aa3c Merge branch 'develop' into notification-read-api 2022-01-04 13:36:43 +09:00
tamaina
333ba491f1
enhance: 許可されていないファイルタイプでは、オブジェクトストレージのファイル名に拡張子を付与しないように (#8108)
* 許可されていないファイルタイプでは、オブジェクトストレージのファイル名に拡張子を付与しないように

* add comment
2022-01-03 07:35:02 +09:00
syuilo
f25777f2d2 refactor(server): use insert instead of save 2022-01-03 03:17:16 +09:00
syuilo
6be1db00d1 refactor(server): use insert instead of save 2022-01-03 02:20:30 +09:00
syuilo
4a64280a7c lint 2022-01-03 02:12:50 +09:00
tamaina
e9b184a807 Merge branch 'notification-read-api' into swn 2022-01-02 21:58:16 +09:00
tamaina
61ea668eac Merge branch 'develop' into notification-read-api 2022-01-02 21:57:55 +09:00
syuilo
92d9ce8117 update deps 2022-01-02 02:15:12 +09:00
tamaina
7f8e3b0dee Merge branch 'notification-read-api' into swn 2022-01-01 23:04:36 +09:00
tamaina
a70d9d2034 Merge branch 'develop' into notification-read-api 2022-01-01 23:01:21 +09:00
syuilo
158dd49b3d fix
d53795184c (r62707827)
2022-01-01 22:28:02 +09:00
syuilo
57d994db0c Revert "revert d53795184"
This reverts commit aedbab17cc.
2022-01-01 22:25:30 +09:00
tamaina
87c5c69c87
wip (#8101) 2022-01-01 18:00:53 +09:00
syuilo
aedbab17cc revert d53795184 2021-12-29 17:21:08 +09:00
syuilo
3e00ce0d88 fix(server): エクスポートした絵文字の拡張子がfalseになることがあるのを修正 2021-12-29 17:04:13 +09:00
tamaina
a444e6adab Merge branch 'notification-read-api' into swn 2021-12-29 16:15:07 +09:00
tamaina
5c495c0bcf Merge branch 'develop' into notification-read-api 2021-12-29 16:14:46 +09:00
Johann150
af022fd8b8
fix html blockquote conversion (#8069) 2021-12-29 04:15:28 +09:00
tamaina
9a78690222 Merge branch 'notification-read-api' into swn 2021-12-28 18:46:44 +09:00
tamaina
b65506d32e Merge branch 'develop' into notification-read-api 2021-12-28 18:46:29 +09:00
syuilo
154e418c34 Update const.ts 2021-12-26 12:10:33 +09:00
syuilo
cfd1888969 refactor 2021-12-26 12:08:22 +09:00
syuilo
d53795184c enhance(server): better content type detection 2021-12-26 01:43:51 +09:00
syuilo
3692c9eb64 refactor 2021-12-26 01:42:06 +09:00
tamaina
a456a63e34 Merge branch 'develop' into notification-read-api 2021-12-25 02:02:49 +09:00
tamaina
c77fe1f2cf
Truncate push notification message (#8089)
* Truncate push notification message

* fix
2021-12-25 02:01:35 +09:00
tamaina
06f6c66732 Merge branch 'truncate-push-notification' into swn 2021-12-25 01:38:21 +09:00
tamaina
ffef12ce1d Truncate push notification message 2021-12-25 01:37:15 +09:00
tamaina
1122f7281e
ノートページでRenoteである場合にnoindexを付加 (#8074) 2021-12-24 01:16:58 +09:00
tamaina
469434dd9a キャッシュ対策 2021-12-23 21:17:12 +09:00
tamaina
252169f879 Merge branch 'notification-read-api' into swn 2021-12-18 00:31:35 +09:00
tamaina
66c5111a29 Merge branch 'develop' into notification-read-api 2021-12-18 00:31:03 +09:00
syuilo
2f8e3559b5 update deps 2021-12-17 14:12:34 +09:00
syuilo
983599bdae Update 1639325650583-chart-v3.js 2021-12-14 23:13:09 +09:00
syuilo
0be4e10462 enhance(backend): improve chart engine 2021-12-14 18:12:37 +09:00
syuilo
ef485044ea Update export-custom-emojis.ts 2021-12-12 06:24:13 +09:00
syuilo
c599a304c8 refactor 2021-12-12 06:21:48 +09:00
tamaina
b4954fe7c2 Merge branch 'notification-read-api' into swn 2021-12-11 00:57:22 +09:00
tamaina
56234f54fe Merge branch 'develop' into notification-read-api 2021-12-11 00:54:33 +09:00
syuilo
bd903cdbb5 feat: カスタム絵文字エクスポート 2021-12-10 18:24:26 +09:00
syuilo
20134a5367 feat: improve follow export 2021-12-10 01:22:35 +09:00
syuilo
c69b72e199 fix lint 2021-12-09 23:58:30 +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
syuilo
b9095995eb update deps 2021-12-09 21:31:36 +09:00
tamaina
4a8dfbdf2d Merge branch 'notification-read-api' into swn 2021-12-05 12:47:24 +09:00