Commit graph

3428 commits

Author SHA1 Message Date
MeiMei
a23b4a4b36 (partially) cherry-picked from misskey/10e526b
fix: Escape SQL LIKE

* SQL LIKE escape

* CHANGELOG
2023-05-07 09:16:46 +09:00
naskya
b3fff542ba Modify backend for Calckey 2023-05-07 09:13:37 +09:00
Kaity A
99f15e3e1d Add support for CW boosting 2023-05-07 09:26:24 +10:00
naskya
2a26c417f7 Use phosphor icons 2023-05-07 08:08:07 +09:00
naskya
0fb14f8f43 format 2023-05-07 08:05:18 +09:00
たーびん
61df9d4752 feat: チャンネルの検索用ページとAPIの追加
* add channel search

* move  channel search to channel list page

---------

Co-authored-by: tamaina <tamaina@hotmail.co.jp>
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
Co-authored-by: atsuchan <83960488+atsu1125@users.noreply.github.com>
Co-authored-by: Masaya Suzuki <15100604+massongit@users.noreply.github.com>
Co-authored-by: Kagami Sascha Rosylight <saschanaz@outlook.com>
Co-authored-by: taiy <53635909+taiyme@users.noreply.github.com>
Co-authored-by: xianon <xianon@hotmail.co.jp>
Co-authored-by: kabo2468 <28654659+kabo2468@users.noreply.github.com>
Co-authored-by: YS <47836716+yszkst@users.noreply.github.com>
Co-authored-by: Khsmty <me@khsmty.com>
Co-authored-by: Soni L <EnderMoneyMod@gmail.com>
Co-authored-by: mei23 <m@m544.net>
Co-authored-by: daima3629 <52790780+daima3629@users.noreply.github.com>
Co-authored-by: Windymelt <1113940+windymelt@users.noreply.github.com>
2023-05-07 08:00:30 +09:00
trollo
3ccf069d82 fix: hidden post federation 2023-05-06 18:27:42 +02:00
Kainoa Kanter
49d6d207da Merge pull request 'fix tiny text on mobile' (#10037) from Freeplay/calckey:notes into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10037
2023-05-06 03:28:21 +00:00
ThatOneCalculator
a406a33cea chore: formatting 2023-05-05 18:37:13 -07:00
ThatOneCalculator
b06fe943c1 patrons as span, not div 2023-05-05 18:32:00 -07:00
Froggo
999d6074d1 Remove clutter from repost dialog by removing repost icon for non-default visibility (#10015)
The repost dialog is pretty cluttered, and the extra repeat icon next to the visibility icon seems to be a source of the clutter. This PR removes those icons next to the visibility icon, making it so that only the icon correlating to the visibility will show.

Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10015
Co-authored-by: Froggo <froggo@noreply.codeberg.org>
Co-committed-by: Froggo <froggo@noreply.codeberg.org>
2023-05-06 00:43:34 +00:00
ThatOneCalculator
c8ec5f324d chore: format 2023-05-05 13:29:39 -07:00
ThatOneCalculator
55a80ee6f0 Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-05-05 13:28:39 -07:00
ThatOneCalculator
5cc0ecf215 re-enable post imports 2023-05-05 13:27:52 -07:00
naskya
0a591563ca Merge branch 'develop' into fix/word-mutes 2023-05-05 19:05:32 +00:00
ThatOneCalculator
d494d18a9e fix: only show signupsDisabled if signups disabled 2023-05-05 12:04:13 -07:00
naskya
4bb2751460 Merge branch 'develop' into fix/word-mutes 2023-05-05 14:01:14 +00:00
April John
0bbd8c10ef fix: dont stream hidden posts over websocket 2023-05-05 15:53:05 +02:00
April John
feebae8a3d hide hidden posts in websocket streams 2023-05-05 15:50:50 +02:00
April John
13b5a0052e Feat: new internal post visibility "hidden" 2023-05-05 15:16:10 +02:00
April John
0be60ac6c4 Fix: properly handle timeline db errors 2023-05-05 14:30:08 +02:00
naskya
1b0fc8f2fc Remove the code snippets which didn't work 2023-05-05 16:58:42 +09:00
naskya
0e80f59dc6 I believe I finally solved the boost hard mute issue (took 3 hours) 2023-05-05 15:32:47 +09:00
naskya
e32e02b135 Merge branch 'develop' into fix/word-mutes 2023-05-05 06:31:16 +00:00
ThatOneCalculator
c6b27428aa spaces 2023-05-04 23:19:32 -07:00
naskya
a14a41b27c oops 2023-05-05 12:49:34 +09:00
naskya
59a53d8f64 Fix regex hard mutes 2023-05-05 12:36:17 +09:00
naskya
9bb79161af Fix non-ASCII word soft mutes 2023-05-05 12:23:44 +09:00
naskya
433b492a2b Fix dirty duplicated code 2023-05-05 10:38:56 +09:00
naskya
6143af2be9 Merge branch 'fix/word-mutes' of https://codeberg.org/naskya/calckey into fix/word-mutes 2023-05-05 09:47:17 +09:00
naskya
ea95a9358e Show the correct username 2023-05-05 09:46:47 +09:00
naskya
456e7c33e0 Boosts should be prioritized 2023-05-05 08:17:45 +09:00
naskya
4124f00a34 Fix missing import 2023-05-05 08:14:16 +09:00
naskya
9e62df0c8f Fix channel bug 2023-05-05 07:47:03 +09:00
naskya
c99badde3e clean up 2023-05-05 06:16:23 +09:00
naskya
2297f1c57f Merge branch 'fix/word-mutes' of https://codeberg.org/naskya/calckey into fix/word-mutes 2023-05-05 05:48:55 +09:00
naskya
ecc0dd9a9b Use original (Misskey's) implementation for hard mutes as muted reason isn't needed 2023-05-05 05:48:31 +09:00
naskya
2487608fe8 Merge branch 'develop' into fix/word-mutes 2023-05-04 20:33:11 +00:00
naskya
7b58910de8 I was confused 2023-05-05 05:26:59 +09:00
naskya
467575801b Fix missing return, typo 2023-05-05 05:22:32 +09:00
naskya
f023992ab0 Fix missing arguments 2023-05-05 05:17:16 +09:00
ThatOneCalculator
2bbeced829 margin top 2023-05-04 10:24:31 -07:00
ThatOneCalculator
fb991fc12a move button outside form 2023-05-04 10:20:27 -07:00
ThatOneCalculator
e4adb96f52 fix: external link 2023-05-04 10:10:02 -07:00
ThatOneCalculator
2a8fd82cac Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-05-04 10:03:02 -07:00
ThatOneCalculator
0147a202e8 feat: show message if signups are disabled 2023-05-04 10:02:53 -07:00
Freeplay
60ebd938c7 fix tiny text on mobile 2023-05-04 08:30:28 -04:00
naskya
4e60fa7193 format 2023-05-04 14:41:18 +09:00
naskya
4207ff51e7 Merge branch 'develop' into fix/word-mutes 2023-05-04 05:36:29 +00:00
naskya
775eb75428 Differentiate soft mutes and hard mutes 2023-05-04 14:20:06 +09:00
naskya
39105d0c88 Refactor soft word mutes 2023-05-04 14:13:13 +09:00
naskya
d09fc8be2b Refactor hard word mutes 2023-05-04 13:17:37 +09:00
Kainoa Kanter
f029ac46a5 Merge pull request 'fix: Don't increment boost counts of non-person actors' (#10023) from nmkj/calckey:fix-boostcount into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10023
2023-05-03 21:57:48 +00:00
ThatOneCalculator
0a36c0f6be panos 2023-05-03 13:51:49 -07:00
Namekuji
03d9642d4b don't update if renoted by bot 2023-05-03 16:16:34 -04:00
ThatOneCalculator
d07a294f33 Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-05-02 15:15:05 -07:00
ThatOneCalculator
6c148e35a6 add catppuccin latte 2023-05-02 15:14:44 -07:00
ThatOneCalculator
81b2fa2075 Revert "chore: theme refactor"
This reverts commit 6953fceade5fe8a6e0cb83a10f977c0643663b91.
2023-05-02 15:14:12 -07:00
Kainoa Kanter
1818604053 Merge pull request 'notes' (#10008) from Freeplay/calckey:notes into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10008
2023-05-02 22:05:48 +00:00
ThatOneCalculator
af15d08bd6 fix: correctly display links to self instance URL
Closes #9270

Co-authored-by: GitHub <futchitwo>
2023-05-02 14:45:09 -07:00
Freeplay
a469c5e950 Add tooltips to visibility icons (#9598) 2023-05-02 15:07:46 -04:00
Freeplay
b92550ff57 fix translation box 2023-05-02 14:52:05 -04:00
Freeplay
533af79d4b Fix line color (#9997) 2023-05-02 14:50:22 -04:00
Kaity A
38a35bda27 Readd deepClone and move updated into note capture 2023-05-02 22:42:33 +10:00
Kaity A
3731ae82ee allow upstream note updates to propogate 2023-05-02 19:32:36 +10:00
Kaity A
469bee64b1 allow upstream note updates to propogate 2023-05-02 19:30:05 +10:00
Kaity A
5bfe6c0730 Merge remote-tracking branch 'origin/develop' into hk/edit-federation 2023-05-02 18:24:54 +10:00
Kaity A
a56c7fe1d8 update file sensitivity on note edit 2023-05-02 18:22:42 +10:00
Kaitlyn Allan
e58d1d7695 updates to include alt text editing 2023-05-02 17:47:16 +10:00
ThatOneCalculator
eec5c86cb3 disable post imports for now 2023-05-01 23:08:35 -07:00
ThatOneCalculator
f6428ca16b max import posts twice a month 2023-05-01 21:54:15 -07:00
ThatOneCalculator
59d9811e21 import correctly 2023-05-01 21:09:48 -07:00
ThatOneCalculator
04ce30ffb2 how in the world does this keep getting reversed 2023-05-01 20:54:02 -07:00
ThatOneCalculator
2d0ace0685 chore: formatting 2023-05-01 20:32:18 -07:00
Namekuji
b067e8abfd fix db migration 2023-05-01 18:11:56 -04:00
Freeplay
b7b7d6cce4 bring back Show More component 2023-05-01 17:02:43 -04:00
Kainoa Kanter
6a1ba9f07c Merge pull request 'Fix: 500 server error when attempting to fetch followers-only reply as guest' (#9983) from s1idewhist1e/calckey:issue/9075 into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9983
2023-05-01 19:38:16 +00:00
Kainoa Kanter
5983543132 Merge pull request 'Fix: email validation' (#9984) from s1idewhist1e/calckey:issue/9268 into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9984
2023-05-01 19:37:56 +00:00
Cleo
cb2fefef19 Fixing post visibility patch
Co-authored-by: Laura Hausmann <laura@hausmann.dev>
2023-05-01 15:42:27 +00:00
s1idewhist1e
b1bbc3ac8e fix email validation 2023-04-30 22:57:10 -07:00
s1idewhist1e
45ef53994c Wrap note fetching in a try/catch 2023-04-30 22:11:15 -07:00
Namekuji
7a23aa57e4 Merge branch 'develop' into instance-silence 2023-04-30 22:02:04 -04:00
Namekuji
5013111bee enforce follow-request from silenced users 2023-04-30 21:43:56 -04:00
Namekuji
faa5fc5dd4 suppress notification from silenced users and instances 2023-04-30 21:35:10 -04:00
ThatOneCalculator
d3f7b4c18a chore: theme refactor 2023-04-30 17:57:04 -07:00
ThatOneCalculator
1faa47f558 favicon 2023-04-30 17:14:04 -07:00
Namekuji
ec97ccd4c3 do not notify if the target is not following 2023-04-30 19:46:02 -04:00
Namekuji
5fc77586f2 format 2023-04-30 18:01:06 -04:00
Namekuji
8128ef5f01 add db migration 2023-04-30 18:00:19 -04:00
Namekuji
2072d41fcd Merge branch 'develop' into instance-silence 2023-04-30 17:52:05 -04:00
Namekuji
c8de7d818c add silenced colour 2023-04-30 17:45:45 -04:00
Namekuji
688d283986 fix params 2023-04-30 17:32:14 -04:00
Namekuji
7c08ea3232 fix meta fetch 2023-04-30 17:06:43 -04:00
ThatOneCalculator
1fb5635a4d chore: format 2023-04-30 13:27:27 -07:00
ThatOneCalculator
1eb19b6988 fix(ap): Use unique identifier for each follow request
Closes #9677

Co-authored-by: GitHub <hutchisr>
2023-04-30 13:26:51 -07:00
ThatOneCalculator
3191853c32 chore: up browser-image-resizer 2023-04-30 13:13:43 -07:00
Kainoa Kanter
4b3a2407c3 Merge pull request 'chore: update mfm-cheat-sheet' (#9967) from naskya/calckey:chore/mfm-cheat-sheet into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9967
2023-04-30 19:37:35 +00:00
Kainoa Kanter
ae7311a6a8 Merge pull request 'keyboard-accessability' (#9974) from Freeplay/calckey:keyboard-accessability into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9974
2023-04-30 19:36:17 +00:00
fruye
0cf2e71b2e Use numeric ids everywhere in mastodon API (#9970)
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9970
Co-authored-by: fruye <fruye@unix.dog>
Co-committed-by: fruye <fruye@unix.dog>
2023-04-30 19:34:52 +00:00
Kaity A
89716480e5 fix poll voting causing edit revisions. 2023-05-01 03:17:38 +10:00