mirror/iceshrimp
1
0
Fork 0
mirror of https://iceshrimp.dev/iceshrimp/iceshrimp synced 2024-12-21 01:58:10 +09:00
Code Issues Actions Packages Projects Releases Wiki Activity
24,234 Commits 15 Branches 30 Tags 1.3 GiB
5047898fa6
Commit Graph

1236 Commits

Author SHA1 Message Date
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
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
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
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
ecc0dd9a9b Use original (Misskey's) implementation for hard mutes as muted reason isn't needed 2023-05-05 05:48:31 +09: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
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
d09fc8be2b Refactor hard word mutes 2023-05-04 13:17:37 +09:00
Namekuji
03d9642d4b don't update if renoted by bot 2023-05-03 16:16:34 -04: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
2d0ace0685 chore: formatting 2023-05-01 20:32:18 -07:00
Namekuji
b067e8abfd fix db migration 2023-05-01 18:11:56 -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
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
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
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
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
Kaity A
6a509637d5 Implement inbound note edit federation 2023-05-01 02:29:50 +10:00
Namekuji
cec5813ab2 can overlap with blocked hosts 2023-04-30 09:04:29 -04:00
Namekuji
f2a8d1f680 add toggler 2023-04-30 09:01:42 -04:00
Namekuji
c35f03832d format 2023-04-30 08:08:45 -04:00
Namekuji
ada759a9e5 rename and comment 2023-04-30 07:58:03 -04:00
Namekuji
ce60660128 instance silence 2023-04-30 07:27:55 -04:00
Kaity A
f9a72e1ea6 Add Libre Translate support 2023-04-30 11:09:51 +10:00
ThatOneCalculator
6eba097e09 new logos 2023-04-29 15:32:33 -07:00
ThatOneCalculator
1dbcbe9dbb chore: upgrade megalodon 2023-04-29 13:28:24 -07:00
fruye
05b2f9b89d fix: Declare /api/v1/accounts/relationships before /api/v1/accounts/:id 
Previously the 'relationships' part was considered to be an account id
and was handled by completely different API endpoint.
 2023-04-28 20:03:06 +02:00
Kainoa Kanter
b8875beefa Revert "[Fix] Properly replace koa-fix-trailing-slashes with inhouse script (#9870)" 
This reverts commit 2cdaad588c82508734d04c2169503782dfe8556a.
 2023-04-27 16:32:37 -07:00
Kainoa Kanter
fd91a878c1 Revert "Merge pull request '[feat] Replace Koa-FavICO with a smaller router' (#9853) from daikei/calckey:modularize-favico into develop" 
This reverts commit 4f6cae76434d927920ae8eac5fad6b72336f29ac, reversing
changes made to 64a737d001ca9781ae8bb6995cad69219cba3831.
 2023-04-27 16:25:13 -07:00
fruye
14e59f2401 fix: Get list titles from Form data when creating and updating lists 
This change will actually make it possible for Mastodon clients to
create and rename lists, as they send the title in a Form data instead
of a query string.

https://docs.joinmastodon.org/methods/lists/#form-data-parameters
 2023-04-27 22:42:10 +02:00
fruye
67b0e9e2dc fix: Make statusModel created_at fields be ISO 8601 strings 
This makes the 'Reactions to this post' status (seen when viewing
a status context) send the correct data type for `created_at` fields.

https://docs.joinmastodon.org/entities/Account/#created_at
https://docs.joinmastodon.org/entities/Status/#created_at
 2023-04-27 21:54:51 +02:00
ThatOneCalculator
7d48709b40 fix: style email with inline styles 2023-04-26 20:21:30 -07:00
ThatOneCalculator
3c5fbb7b0b try to fix email style... 2023-04-26 20:04:58 -07:00
ThatOneCalculator
e4ca9590bd fix? 2023-04-26 19:58:26 -07:00
ThatOneCalculator
36aef5a063 fix: add route 2023-04-26 19:51:25 -07:00
ThatOneCalculator
ab61c62f54 feat: ✨ frontend interface for post-account creation email verification 2023-04-26 19:44:38 -07:00
ThatOneCalculator
3aa5b8237d Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-04-26 14:20:02 -07:00
ThatOneCalculator
5d182895f0 Revert "chore: update summaly" 
This reverts commit b60a3b509e6131ce8d29d7304dfa200c4b493e35.
 2023-04-26 14:19:55 -07:00
Namekuji
dda66daedd feat: reserved usernames (#9917) 
This PR adds a feature to prevent users from creating a new account with a reserved username such as root, admin, system, proxy, info, etc...

Reserved usernames can be configured via the config file.

The administrator can create an account with a reserved username via the first setup screen or the control panel.

The existing account of reserved usernames will not be affected.

Co-authored-by: Namekuji <nmkj@mx.kazuno.co>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9917
Co-authored-by: Namekuji <nmkj@noreply.codeberg.org>
Co-committed-by: Namekuji <nmkj@noreply.codeberg.org>
 2023-04-26 20:06:18 +00:00
ThatOneCalculator
af4a2f2313 see if this works 2023-04-25 18:21:15 -07:00
ThatOneCalculator
f6d1fa8519 throw different error if following is null 2023-04-25 08:31:05 -07:00
ThatOneCalculator
2b033a813f revert messaging room 2023-04-24 15:45:34 -07:00
naskya
fdb4575f15 fix: boost muting in the recommended timeline (#9906) 
Closes: #9905
Co-authored-by: naskya <m@naskya.net>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9906
Co-authored-by: naskya <naskya@noreply.codeberg.org>
Co-committed-by: naskya <naskya@noreply.codeberg.org>
 2023-04-24 19:47:56 +00:00
ThatOneCalculator
49e0399881 chore: up pakcages 2023-04-23 15:34:50 -07:00
fruye
2ef30e0152 feat: Implement reading Announcements from MastoAPI 2023-04-23 22:17:02 +02:00
naskya
36b88c7286 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
ThatOneCalculator
f1fa00f962 chore: update summaly 2023-04-19 21:28:43 -07:00
ThatOneCalculator
dbc25ce574 email styling 2023-04-19 21:26:49 -07:00
ThatOneCalculator
45b3e5635d reaction settings auto reload 2023-04-19 20:46:37 -07:00
daikei
ebb93328d5 [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
79d9b1bf13 Revert "[Fix] remove-trailing-slashes with inhouse script (#9869)" 
This reverts commit 07db141fc0f1d0c55a930378f3adc81f23dbda44.
 2023-04-17 01:22:31 -07:00
ThatOneCalculator
4a7a79c3d5 Revert "formatting" 
This reverts commit b32e1b56fa0acda38a91f2851aea398204d02417.
 2023-04-17 01:22:25 -07:00
ThatOneCalculator
e006d96aac formatting 2023-04-17 01:03:56 -07:00
daikei
1df7458d4e [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
24c23c6474 chore: formatting 2023-04-14 15:35:18 -07:00
daikei
2aa0fa37cf remove koa-favicon 2023-04-14 16:20:27 +00:00
daikei
74a43b7478 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
ThatOneCalculator
224fdf4dc5 chore: up swc 2023-04-13 09:43:13 -07:00
naskya
58b3950680 Allow to mute my own boosts 2023-04-12 15:52:46 +09:00
Kainoa Kanter
5f6358c4bd 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
1affde0a8c chore: formatting 2023-04-07 22:46:10 -07:00
Namekuji
f2cf92aea1 fetch person again 2023-04-08 01:44:50 -04:00
naskya
0ef179e35f 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
Kainoa Kanter
799ac84ee3 Revert "Revert "Incorporate calckey-js into calckey repository (#9820)"" 
This reverts commit 8033492c7c4827fbff05782d08ae65bc3440c080.
 2023-04-07 17:44:27 -07:00
Kainoa Kanter
a5c4d0a7bd Revert "Incorporate calckey-js into calckey repository (#9820)" 
This reverts commit 37c0423da6bce9b86b8f4f9a5b78f640166dd3d5.
 2023-04-07 17:35:10 -07:00
Kainoa Kanter
0c17baa47f 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
Namekuji
a5468a8204 fix move inbox 2023-04-07 17:48:25 -04:00
Kaity A
21905514d4 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
177e9a50b2 fix id of move activity 2023-04-07 06:39:29 -04:00
Kainoa Kanter
dac3b02a3f days for featured 2023-04-06 22:48:07 -07:00
Kainoa Kanter
37d82c3b75 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
d92cfb8cdf formatting 2023-04-06 18:56:46 -07:00
amy bones
3819e921cc 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