Commit Graph

3215 Commits

Author SHA1 Message Date
Free
29818a067b Notes refactoring (?) + new CW design (#9888)
Moved a lot of the duplicated code in the different note components into the SubNoteContent component

I've also replaced the detailed note stuff with just the MkNote component

Co-authored-by: Freeplay <Freeplay@duck.com>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9888
Co-authored-by: Free <freeplay@duck.com>
Co-committed-by: Free <freeplay@duck.com>
2023-04-23 00:21:38 +00:00
tinaxd
4974088061
fix: ドライブアップロードで413が返ってきたときにエラーメッセージを表示 (#10680) 2023-04-22 17:19:52 -07:00
naskya
00b45ad726 security: validate image url (#9882)
It looks like url validations are added in f7564d87b0, but I found another validation commit not applied in Calckey, so I cherry-picked 0da0cc80b9 from [Misskey](https://github.com/misskey-dev/misskey).

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
Co-authored-by: naskya <m@naskya.net>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9882
Co-authored-by: naskya <naskya@noreply.codeberg.org>
Co-committed-by: naskya <naskya@noreply.codeberg.org>
2023-04-21 01:50:47 +00:00
naskya
e0d76ef8ef feat: make it toggleable whether to disable emojis in notifications (#9880)
I talked about feature #9865 on my fedi account and received a comment like, "I don't care about emoji reactions in my timelines, but I do care what reactions I get!"

Adding too many options is bad, but I agreed that making it toggleable whether to disable emojis in notifications is helpful, so I added this feature. This allows you to check emoji reactions to your posts in notifications while using the simple UI. I'd say this provides an experience that neither Mastodon nor Misskey has.

The new setting item shows up only when you disable emoji reactions.

Co-authored-by: naskya <m@naskya.net>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9880
Co-authored-by: naskya <naskya@noreply.codeberg.org>
Co-committed-by: naskya <naskya@noreply.codeberg.org>
2023-04-20 07:57:36 +00:00
ThatOneCalculator
b60a3b509e
chore: update summaly 2023-04-19 21:28:43 -07:00
ThatOneCalculator
89d2a83d7a
email styling 2023-04-19 21:26:49 -07:00
ThatOneCalculator
a1f723a18e
chore: formatting 2023-04-19 21:06:05 -07:00
ThatOneCalculator
08930c6de2
fix header tabs 2023-04-19 21:05:41 -07:00
ThatOneCalculator
e3e3ee8bb0
why was the order reversed? 2023-04-19 21:02:12 -07:00
ThatOneCalculator
f584c460e3
fix tag on explore 2023-04-19 21:00:01 -07:00
ThatOneCalculator
c6f0047aed
reaction settings auto reload 2023-04-19 20:46:37 -07:00
naskya
0a173a3c1c feat: add an option to disable emoji reactions (#9878)
Closes: #9865
Co-authored-by: naskya <m@naskya.net>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9878
Co-authored-by: naskya <naskya@noreply.codeberg.org>
Co-committed-by: naskya <naskya@noreply.codeberg.org>
2023-04-20 02:53:28 +00:00
naskya
70e4b36bd3
Fix the search bar bug on iOS 2023-04-20 04:21:28 +09:00
ThatOneCalculator
1ddb15909d
gallery styling 2023-04-18 11:58:04 -07:00
ThatOneCalculator
d6a4ecb495
Revert "update locales for calckey"
This reverts commit 8ab6a4c442.
2023-04-17 15:37:05 -07:00
daikei
2cdaad588c [Fix] Properly replace koa-fix-trailing-slashes with inhouse script (#9870)
This follows up #9869, with an awaited ``next()``, fixing the script.

> I'm looking to remove another 5kb package, replacing it with an in-house script. The commit i'm proposing translates the entire job of koa-remove-trailing-slashes into a 206 byte script that gets the job done well.

(just to show the code does work)
![](https://s3.kitsunes.club/storage/41c7854d-d01e-4f4c-94dd-8b651e2d7367.gif)

Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9870
Co-authored-by: daikei <daikei@noreply.codeberg.org>
Co-committed-by: daikei <daikei@noreply.codeberg.org>
2023-04-17 22:36:22 +00:00
ThatOneCalculator
8ab6a4c442
update locales for calckey 2023-04-17 03:07:07 -07:00
ThatOneCalculator
48ff0254b1
chore: formatting 2023-04-17 01:47:53 -07:00
ThatOneCalculator
c0fe351bed
Revert "[Fix] remove-trailing-slashes with inhouse script (#9869)"
This reverts commit 07db141fc0.
2023-04-17 01:22:31 -07:00
ThatOneCalculator
1ed5ff7caf
Revert "formatting"
This reverts commit b32e1b56fa.
2023-04-17 01:22:25 -07:00
ThatOneCalculator
b32e1b56fa
formatting 2023-04-17 01:03:56 -07:00
daikei
07db141fc0 [Fix] remove-trailing-slashes with inhouse script (#9869)
I'm looking to remove another 5kb package, replacing it with an in-house script. The commit i'm proposing translates the entire job of `koa-remove-trailing-slashes` into a 206 byte script that gets the job done well.

Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9869
Co-authored-by: daikei <daikei@noreply.codeberg.org>
Co-committed-by: daikei <daikei@noreply.codeberg.org>
2023-04-17 08:02:29 +00:00
ThatOneCalculator
ca5d9377a1
MkNumber for data in MkUserInfo 2023-04-16 19:26:57 -07:00
ThatOneCalculator
d2a1c947a4
style announcement image 2023-04-16 19:04:28 -07:00
ThatOneCalculator
8a80dd0438
move hover to entire ticker 2023-04-16 17:52:14 -07:00
ThatOneCalculator
57a4360165
remove duplicate styles 2023-04-16 17:51:34 -07:00
ThatOneCalculator
dfd20a3a22
capitalize string 2023-04-16 17:50:05 -07:00
ThatOneCalculator
2a8b9dc92a
feat: software name on hover icon in instance ticker 2023-04-16 17:35:10 -07:00
Kaity A
011b482e98 Add continuation for thread reply level (#9821)
I think this will solve the continuation issue in threads where the reply level reaches 12 deep in the conversation thread, without getting to indent depth 5.

Co-authored-by: Kaity A <kaity@theallans.com.au>
Co-authored-by: Kaity A <supakaity@blahaj.zone>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9821
Co-authored-by: Kaity A <supakaity@noreply.codeberg.org>
Co-committed-by: Kaity A <supakaity@noreply.codeberg.org>
2023-04-15 21:56:17 +00:00
ThatOneCalculator
0a3259993b
Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-04-15 13:16:17 -07:00
ThatOneCalculator
1ecc91b0d3
read messages with dialog 2023-04-15 13:16:13 -07:00
naskya
f7602be0e7 fix: disable "Search" keyword (#9856)
Related: #9816 #9830
I was so careless that I didn't know "Search" was also a keyword. I disabled that and fixed a minor bug.

Co-authored-by: naskya <m@naskya.net>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9856
Co-authored-by: naskya <naskya@noreply.codeberg.org>
Co-committed-by: naskya <naskya@noreply.codeberg.org>
2023-04-15 17:53:17 +00:00
naskya
dde2679875
feat: rename workspaces 2023-04-16 01:05:18 +09:00
ThatOneCalculator
1824b27e16
chore: formatting 2023-04-14 15:35:18 -07:00
Kainoa Kanter
4f6cae7643 Merge pull request '[feat] Replace Koa-FavICO with a smaller router' (#9853) from daikei/calckey:modularize-favico into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9853
2023-04-14 22:33:49 +00:00
naskya
429b926fcf
change regex priority 2023-04-15 01:41:49 +09:00
naskya
f531ed2ab2
fix a bug 2023-04-15 01:37:53 +09:00
daikei
c959d4185c remove koa-favicon 2023-04-14 16:20:27 +00:00
daikei
1b9a776220 replace koa-favicon with a small patch of code
This should remove a needless dependency and replace it with a tiny, simple koa router
2023-04-14 16:18:50 +00:00
naskya
a2e56314fe
prevent crashes due to timezone === null 2023-04-15 01:01:36 +09:00
naskya
4d0245f1a5
allow acute accent 2023-04-15 01:00:43 +09:00
naskya
afa8f06ef6
improve city search 2023-04-15 00:40:13 +09:00
ThatOneCalculator
9501e8a882
only show index posts action if admin 2023-04-13 20:11:39 -07:00
ThatOneCalculator
25f45f8b4b
fix: 🔒 don't show notes with CW on welcome screen
Closes #9849
2023-04-13 19:46:52 -07:00
ThatOneCalculator
4125e3704e
Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-04-13 09:43:22 -07:00
ThatOneCalculator
4694e30573
chore: up swc 2023-04-13 09:43:13 -07:00
naskya
d5ce896bd2
Change boost button labels 2023-04-13 11:58:42 +09:00
naskya
daf07089b4 chore: update mfm-js version (#9844)
This resolves #9757.

Co-authored-by: naskya <m@naskya.net>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9844
Co-authored-by: naskya <naskya@noreply.codeberg.org>
Co-committed-by: naskya <naskya@noreply.codeberg.org>
2023-04-13 00:33:53 +00:00
ThatOneCalculator
8f7c136f48
Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-04-12 17:19:17 -07:00
ThatOneCalculator
7f9d3f9d54
chore: formatting 2023-04-12 17:19:14 -07:00
naskya
e8566b95aa
correct position 2023-04-12 20:24:54 +09:00
naskya
46864916d9
Allow to mute my own boosts 2023-04-12 15:52:46 +09:00
ThatOneCalculator
07b9e17665
fix lookup instance 2023-04-11 10:32:51 -07:00
ThatOneCalculator
6b359071be
feat: lookup post action 2023-04-11 10:12:17 -07:00
ThatOneCalculator
b6d2b15948
feat: index posts action 2023-04-11 10:07:03 -07:00
ThatOneCalculator
0979ba6b8f
Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-04-11 10:03:31 -07:00
ThatOneCalculator
c5b0b07027
feat: admin lookup files/instance 2023-04-11 10:03:25 -07:00
naskya
c3431b928a Partially disable search MFM (#9830)
Honestly, this workaround is pure garbage when this can be achieved by deleting a small piece of code from mfm-js, but this closes #9816 anyway 😅

Co-authored-by: naskya <m@naskya.net>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9830
Co-authored-by: naskya <naskya@noreply.codeberg.org>
Co-committed-by: naskya <naskya@noreply.codeberg.org>
2023-04-10 05:42:17 +00:00
Kainoa Kanter
63c35871b2 fix chat metadata 2023-04-08 00:18:37 -07:00
Kainoa Kanter
8491a757bc fix 2023-04-08 00:10:16 -07:00
Kainoa Kanter
ee83b5b1a3 Merge branch 'develop' of https://codeberg.org/calckey/calckey into develop 2023-04-07 23:56:06 -07:00
Kainoa Kanter
0717454d49 feat: mark all as read action in chat 2023-04-07 23:56:02 -07:00
Kainoa Kanter
594ee74324 feat: messaging room banner 2023-04-07 23:55:42 -07:00
Kainoa Kanter
306fcb63d4 Merge pull request 'fix: retrieve remote user again when migrating' (#9826) from nmkj/calckey:fix-alsoknownas into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9826
2023-04-08 06:15:27 +00:00
Kainoa Kanter
4a1a954386 move hidden hashtag menu 2023-04-07 22:54:25 -07:00
Kainoa Kanter
e6c1090cdc back button 2023-04-07 22:46:41 -07:00
Kainoa Kanter
437a6e29a5 chore: formatting 2023-04-07 22:46:10 -07:00
Namekuji
67dbb2318a fetch person again 2023-04-08 01:44:50 -04:00
naskya
a624aeebe3 feat: per-user boost muting (#9825)
Cherry-picked from FoundKey/c414f24a2c ([commit](c414f24a2c))

This allows us to hide specified users' boosts from the timelines (the boosts will still be visible on their user page).

Co-authored-by: Hélène <pleroma-dev@helene.moe>
Co-authored-by: naskya <m@naskya.net>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9825
Co-authored-by: naskya <naskya@noreply.codeberg.org>
Co-committed-by: naskya <naskya@noreply.codeberg.org>
2023-04-08 05:44:36 +00:00
amy bones
cb68498fcb
feat: add hidden hashtags management page
This simply adds a basic admin UI to blocklist some hashtags from displaying in
the trending widget. The facility existed already in the backend, but there was
no UI to manipulate the list save for executing raw SQL or API calls.
2023-04-07 18:57:52 -07:00
Kainoa Kanter
ec807fc1bd hotfix: fix crash 2023-04-07 17:58:29 -07:00
Kainoa Kanter
621be91cdb Revert "Revert "Incorporate calckey-js into calckey repository (#9820)""
This reverts commit 8033492c7c.
2023-04-07 17:44:27 -07:00
Kainoa Kanter
8033492c7c Revert "Incorporate calckey-js into calckey repository (#9820)"
This reverts commit 37c0423da6.
2023-04-07 17:35:10 -07:00
Kainoa Kanter
4fb7f4634f fix: typo 2023-04-07 17:25:24 -07:00
Kainoa Kanter
49c44771e5 Merge pull request 'fix: followers transfer via account migration' (#9822) from nmkj/calckey:fix-move into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9822
2023-04-08 00:06:08 +00:00
Kainoa Kanter
6bf1cbc0ef fix: format script; chore: format 2023-04-07 17:01:42 -07:00
Kainoa Kanter
aeb0839da9 chore: rome formatting 2023-04-07 16:47:04 -07:00
Namekuji
62a439c693 fix move inbox 2023-04-07 17:48:25 -04:00
Kaity A
37c0423da6 Incorporate calckey-js into calckey repository (#9820)
Closes #9712.

Co-authored-by: Kaity A <kaity@theallans.com.au>
Co-authored-by: Ken Allan <ken@norganna.com>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9820
Co-authored-by: Kaity A <supakaity@noreply.codeberg.org>
Co-committed-by: Kaity A <supakaity@noreply.codeberg.org>
2023-04-07 14:25:22 +00:00
Namekuji
b03479c7b4 fix id of move activity 2023-04-07 06:39:29 -04:00
Kainoa Kanter
3b9d9cb635 menu opts 2023-04-06 23:02:07 -07:00
Kainoa Kanter
0f6e7056b7 days for featured 2023-04-06 22:48:07 -07:00
Kainoa Kanter
df7c71b1b4 refactor 2023-04-06 22:28:44 -07:00
Kainoa Kanter
c2097f9244 feat: blur muted text 2023-04-06 22:11:10 -07:00
Kainoa Kanter
1d57a0da15 Merge pull request 'feat: give reason for soft word mutes' (#9815) from amybones/calckey:feat_soft_mute_reasons into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9815
2023-04-07 05:07:24 +00:00
Kainoa Kanter
7fb130b06e formatting 2023-04-06 18:56:46 -07:00
amy bones
15b1109947
feat: give reason for soft mutes
Bad UX when a post is muted and it just says "Some chick said something". Now
provide some context too to help people decide if they want to view something
potentially triggering.
2023-04-05 21:28:26 -07:00
Nya Candy
73b778de2a fix(client): userpage ui (#9179)
* fix(unverified): clip pages ui

* fix(unverified): user page width

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2023-04-05 15:45:16 -07:00
ThatOneCalculator
2d7f227de7
Revert "mkv13 media list"
This reverts commit c2ac53c66b.
2023-04-04 23:58:55 -07:00
ThatOneCalculator
881acf9e26
typo 2023-04-04 22:59:41 -07:00
ThatOneCalculator
ba67fa6ed6
oops 2023-04-04 22:55:36 -07:00
ThatOneCalculator
0135dcc016
chore: back button in more places 2023-04-04 22:52:41 -07:00
ThatOneCalculator
0b72aa748b
chore: back button in control panel 2023-04-04 22:49:17 -07:00
ThatOneCalculator
48d00217c9
final fix? 2023-04-04 22:41:57 -07:00
ThatOneCalculator
f78cdb9c60
import i18n 2023-04-04 22:22:35 -07:00
ThatOneCalculator
3f48a9926b
more fix 2023-04-04 22:12:55 -07:00
ThatOneCalculator
bcd5779a9d
fix 2023-04-04 22:03:24 -07:00
ThatOneCalculator
9879bbe38e
display back button in note 2023-04-04 21:59:35 -07:00
ThatOneCalculator
c88627fc88
back button in settings 2023-04-04 21:59:11 -07:00
ThatOneCalculator
3b5b90879c
dont change state 2023-04-04 21:53:17 -07:00