161sh/trashposs
1
0
Fork 0
mirror of https://iceshrimp.dev/crimekillz/trashposs synced 2024-11-23 09:23:48 +01:00
Code Issues Packages Projects Releases Wiki Activity
23,396 Commits 10 Branches 25 Tags 445 MiB
64d6b987ab
Commit Graph

1076 Commits

Author SHA1 Message Date
naskya
94eb321431 feat: set license information for custom emojis (#9719) 
Closes: #9711 (please check this issue first)

I cherry-picked two commits ([1](8ae9d2eaa8), [2](ed51209172)) from [Misskey](https://github.com/misskey-dev/misskey) and made a few changes.
「ライセンス」should be written as "License" in the following screenshots, but it has not yet been translated.

It would be nice if we could include multiple lines of text, but I just ported what's been implemented so far in Misskey not to mess things up.

This is my first pull request (aside from typo correction). Feel free to point out any issues!

![](https://cdn.discordapp.com/attachments/823878222897741868/1086372711841935440/2023-03-18_042011.png)
![](https://cdn.discordapp.com/attachments/823878222897741868/1086373178214981853/01.png)
![](https://cdn.discordapp.com/attachments/823878222897741868/1086373336709341246/2023-03-18_042629.png)

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
Co-authored-by: naskya <m@naskya.net>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9719
Co-authored-by: naskya <naskya@noreply.codeberg.org>
Co-committed-by: naskya <naskya@noreply.codeberg.org>
 2023-03-19 07:22:28 +00:00
ThatOneCalculator
d8c0ba0795 fix: when count is actually 0 2023-03-19 00:13:30 -07:00
cutestnekoaqua
3122701186 pass auth to metadata 2023-03-18 13:06:49 +01:00
cutestnekoaqua
3e748cb401 fix: intermediarily convert ids 2023-03-18 12:23:03 +01:00
cutestnekoaqua
9c0416df65 add 404 as replacements 2023-03-18 12:09:43 +01:00
cutestnekoaqua
25896f0093 chore: update megalodon 2023-03-18 11:52:18 +01:00
fruye
3d7868c9dc fix: Parse mastoAPI limit argument in more places & Improve converting arguments to boolean (#9716) 
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9716
Authored-by: fruye <fruye@unix.dog>
Signed-off-by: Cleo John <waterdev@galaxycrow.de>
Co-authored-by: fruye <fruye@unix.dog>
Co-committed-by: fruye <fruye@unix.dog>
 2023-03-17 13:58:01 +00:00
s1idewhist1e
5eec5ac2ef feat: Make follower counts for remote users correct (#9705) 
#9293

Not sure if this is the right approach for this

Co-authored-by: s1idewhist1e <trombonedude05@gmail.com>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9705
Co-authored-by: s1idewhist1e <s1idewhist1e@noreply.codeberg.org>
Co-committed-by: s1idewhist1e <s1idewhist1e@noreply.codeberg.org>
 2023-03-17 01:16:31 +00:00
fruye
b62b1d43d6 fix: Run to boolean conversion in mastoAPI public and hashtag timelines 
The `only_media` query parameter in `/api/v1/timelines/public` and
`/api/v1/timelines/tag/:hashtag` was previously passed directly as-is to
the Misskey API, which made it pretty upset because it was receiving a
string named 'true' instead of the value 'true'.

Needed for pleromaFE to display a timeline.
 2023-03-15 23:09:19 +01:00
Cleo John
c1a6e342e9 webhook mastodon fixes 2023-03-14 17:18:30 +01:00
Luna
f02b1429e9 Small fix to Masto ID conversion code 2023-03-13 00:44:38 -04:00
Luna
75fd6d068d Sorta kinda handle client_credentials auth flow 2023-03-11 23:19:17 -05:00
Luna
2d7225a179 Proxy object IDs for Mastodon API to prevent Calckey ID format incompatibilities 2023-03-11 16:02:35 -05:00
Luna
07d45c6a70 Convert limit parameter to int for certain Mastodon account endpoints 2023-03-11 16:02:35 -05:00
Luna
bd15a1d8d6 Enable multipart for masto oauth endpoints to fix Ivory 2023-03-11 16:02:35 -05:00
Kaity A
be4d51fcad Expand caption limit to 1500 characters 2023-03-05 16:51:44 +10:00
Kaity A
55b2708009 Set movedToUri & alsoKnownAs null when undefined 2023-03-04 08:24:22 +00:00
cutestnekoaqua
a176e5b9aa parse full multipart data to media endpoints 2023-03-01 15:53:40 +01:00
cutestnekoaqua
83216f0b3b fix import 2023-03-01 15:07:35 +01:00
cutestnekoaqua
1c674fcf01 some quick fixes 2023-03-01 15:04:01 +01:00
Cleo John
447547b911 fix errors 2023-02-28 17:38:48 +01:00
Cleo John
83494b707d more mastodon work 2023-02-28 17:23:04 +01:00
Masaya Suzuki
00e42db681 Check redis connection 
---------

Co-authored-by: tamaina <tamaina@hotmail.co.jp>
 2023-02-23 22:04:47 -08:00
CutestNekoAqua
f013669e7b aa 2023-02-23 17:38:18 +01:00
CutestNekoAqua
066b4fa78d meow? 2023-02-23 17:20:34 +01:00
CutestNekoAqua
ac6cc1ea45 maybe buffer? 2023-02-23 17:13:35 +01:00
CutestNekoAqua
bab5577ee5 this is the sign I need a break 2023-02-23 17:07:49 +01:00
CutestNekoAqua
50687ef209 move file upload to new router 2023-02-23 17:02:02 +01:00
CutestNekoAqua
76a4228de3 oh ich hab verkackt 2023-02-23 16:57:21 +01:00
CutestNekoAqua
b712b67df3 use multer upload instead 2023-02-23 16:55:38 +01:00
CutestNekoAqua
6b97e42a7f update thingy? 2023-02-23 16:42:57 +01:00
CutestNekoAqua
678c3c2483 lol 2023-02-23 16:34:16 +01:00
CutestNekoAqua
506709d2eb fixed what ever calc did here, masto app didnt 2023-02-23 16:32:21 +01:00
CutestNekoAqua
273b86b9f4 ?? 2023-02-23 16:26:33 +01:00
CutestNekoAqua
b1d785b486 await the instance meta 2023-02-23 16:12:53 +01:00
CutestNekoAqua
83cc0c9828 import config 2023-02-23 15:58:54 +01:00
CutestNekoAqua
0ca238d680 import multer 2023-02-23 15:55:28 +01:00
CutestNekoAqua
75bd0baf99 remove not needed middleware handlers 2023-02-23 15:46:12 +01:00
CutestNekoAqua
e4a276a989 aaa 2023-02-23 00:31:14 +01:00
CutestNekoAqua
e2ad9a94ec fix mastodon api stats 2023-02-22 09:44:47 +01:00
ThatOneCalculator
aae1d293b5 fix: 🐛 Don't show image previews if NSFW 
Closes #9636
 2023-02-18 12:02:25 -08:00
ThatOneCalculator
706ebbd853 Masto API meta 2023-02-18 11:58:02 -08:00
ThatOneCalculator
c28e5fcad5 feat: ✨ Show time for users 2023-02-18 11:33:25 -08:00
CutestNekoAqua
a5633b9368 fix oopsie 2023-02-18 17:24:58 +01:00
CutestNekoAqua
cedf306f76 debug print users 2023-02-18 17:22:43 +01:00
CutestNekoAqua
28a31879f8 make relationshiops work 2023-02-18 17:14:16 +01:00
daikei
5ac063200e Merge branch 'develop' into develop 2023-02-17 21:12:04 +00:00
ThatOneCalculator
9d2ccab7f5 chore: formatting 2023-02-17 13:01:14 -08:00
ThatOneCalculator
301c03e97f chore: remove hard-to-see gradient 2023-02-17 00:16:35 -08:00
ThatOneCalculator
75c53f783a perf: ⚡ emoji lib performance fix 2023-02-17 00:01:22 -08:00
ThatOneCalculator
4453e847a4 fix: 🐛 pagination for "/api/channels/followed" 
Co-authored-by: takonomura <@takonomura@github.com>
 2023-02-15 10:31:10 -08:00
ThatOneCalculator
fc285bb645 fix: 💄 admin overview style 2023-02-13 20:21:42 -08:00
ThatOneCalculator
0e9f9063b4 attempt fix 2023-02-13 19:48:57 -08:00
cutestnekoaqua
a607673019 try again 2023-02-13 20:41:42 +01:00
cutestnekoaqua
c4683c0196 actually return value 2023-02-13 20:38:11 +01:00
cutestnekoaqua
b209a9e533 uwu 2023-02-13 20:36:13 +01:00
cutestnekoaqua
d83e2f2c7a mew 2023-02-13 20:28:23 +01:00
ThatOneCalculator
68c65044fd chore: formatting 2023-02-13 11:17:07 -08:00
cutestnekoaqua
57e307ae39 Revert "parse query stuff with bools" 
This reverts commit 4eb695f3c3acca0510036b13562207d35c7bf7fb.
 2023-02-13 19:39:14 +01:00
cutestnekoaqua
75b20908bd parse query stuff with bools 2023-02-13 19:34:41 +01:00
cutestnekoaqua
9bec89afe8 initial bool parsing in mastodon 2023-02-13 18:54:38 +01:00
cutestnekoaqua
03f7ba241a nya 2023-02-13 17:08:48 +01:00
cutestnekoaqua
adbde2ae94 meow 2023-02-13 17:02:51 +01:00
cutestnekoaqua
5cd23ca88f changes typings 2023-02-13 16:58:42 +01:00
cutestnekoaqua
d6c9a142ab change types 2023-02-13 16:58:18 +01:00
cutestnekoaqua
030d890286 add debug to error 2023-02-13 16:53:56 +01:00
cutestnekoaqua
5905d7e8c1 basic account lookup 2023-02-13 16:12:21 +01:00
cutestnekoaqua
fa960711ae feat: #9614 2023-02-13 15:12:21 +01:00
ThatOneCalculator
428dac79c8 fix: 🐛 first user gets admin 
Closes #9620

Co-authored-by: @Johann150
 2023-02-12 20:19:16 -08:00
ThatOneCalculator
428a830749 Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-02-12 12:07:15 -08:00
ThatOneCalculator
dd45c01b68 feat: ✨ remote featured notes 2023-02-12 12:07:07 -08:00
Kio-td
070ec13665 Merge branch 'develop' of https://codeberg.org/calckey/calckey into develop 2023-02-12 12:11:21 -05:00
Kaity A
4c12faacb1 invalidate local user cache on user update 2023-02-12 07:54:59 +00:00
ThatOneCalculator
99accc4502 fix: correct megalodon import 2023-02-11 17:23:30 -08:00
ThatOneCalculator
57aed1fed9 chore: formatting 2023-02-11 17:22:05 -08:00
Kaity A
2b030a0a8c Implementation of an instances wide antenna source. (#9604) 
This PR contains new source for antenna posts, which is a list of instance hostnames to process all posts from.

Using this mode, a user can filter for keywords on an instance wide basis.

This change includes a new antenna source called `instances` and a new database column in the `antenna` table called `instances` to store the instance names.

On the antenna editor, there's also an "Add an instance" finder dialog to allow users to search through the known instance hostnames.

Co-authored-by: Kaity A <supakaity@blahaj.zone>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9604
Co-authored-by: Kaity A <supakaity@noreply.codeberg.org>
Co-committed-by: Kaity A <supakaity@noreply.codeberg.org>
 2023-02-12 01:20:17 +00:00
Kaity A
7091f889ee Enable reply update/display in detailed view. (#9606) 
This PR establishes a new replied note stream update for subscribed notes, which gets fired off whenever a note receives a reply and the user is subscribed to the note for updates.

It specifically does not provide note details as part of the update, just the note id of the reply, so that they must go and retrieve the note and be subject to the proper permission and visibility checks.

The detailed note component has then been updated to watch for the replied notification so it can add new replies to the thread as they are created.

This allows both seeing new replies while on the page, and also to see your own replies appear after you post them without having to reload the page.

This PR relies on https://codeberg.org/calckey/calckey.js/pulls/2 to add the replied type to the calkey.js module.

Co-authored-by: Kaity A <supakaity@blahaj.zone>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9606
Co-authored-by: Kaity A <supakaity@noreply.codeberg.org>
Co-committed-by: Kaity A <supakaity@noreply.codeberg.org>
 2023-02-12 01:19:43 +00:00
Kainoa Kanter
e363940bcf Merge pull request 'fix: 🐛 100vh body background color' (#9608) from GeopJr/calckey:fix/100vh-body-bg-color into develop 
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9608
 2023-02-12 00:29:33 +00:00
ThatOneCalculator
2dff0cf8a0 Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-02-11 16:22:00 -08:00
ThatOneCalculator
6333016077 chore: calckey megalodon 2023-02-11 16:20:57 -08:00
cutestnekoaqua
8149145b75 is this too spec? 2023-02-12 00:35:39 +01:00
cutestnekoaqua
740e5e56ba oof 2023-02-12 00:33:52 +01:00
cutestnekoaqua
b2bb9ec178 eow 2023-02-12 00:29:52 +01:00
cutestnekoaqua
a97806eeaa simplify code 2023-02-12 00:25:51 +01:00
cutestnekoaqua
1acf0518b0 try this instead 2023-02-12 00:19:35 +01:00
cutestnekoaqua
d91358ce2f refine error msg 2023-02-12 00:14:03 +01:00
cutestnekoaqua
f5a9add712 add account lookup 2023-02-12 00:10:10 +01:00
cutestnekoaqua
0d836df218 remove unneeded next middleware 2023-02-11 23:50:58 +01:00
cutestnekoaqua
87c54e03d8 change name of Reactions bot 2023-02-11 23:46:35 +01:00
cutestnekoaqua
273ab91284 fix timelines 2023-02-11 23:12:14 +01:00
cutestnekoaqua
9189ef29ba meow 
Co-authored-by: cutls <web-pro@cutls.com>
 2023-02-11 22:50:20 +01:00
Evangelos Paterakis
b2b619ffa7 fix: 🐛 100vh body background color 2023-02-11 23:28:46 +02:00
ThatOneCalculator
1d89cc3e3d docs: 📝 custom assets 2023-02-11 13:16:45 -08:00
daikei
861fbcab41 Remove hardcoding of sounds (#9510) (#9607) 
Co-authored-by: Kio-td <kio.thedev@gmail.com>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9607
Co-authored-by: daikei <daikei@noreply.codeberg.org>
Co-committed-by: daikei <daikei@noreply.codeberg.org>
 2023-02-11 21:09:43 +00:00
daikei
13af804543 Discard notes made before Fedi's existence, or after today (#9605) 
This PR should kill #9531 - Safeguarding against posts that are made before 2007 (Identica being made in 2008, the 'first ever activitypub software' according to wikipedia.)

Personally, if gone unnoticed, I believe that notes from the past can be used as an attack vector to silently flood a database.

Co-authored-by: Kio-td <kio.thedev@gmail.com>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9605
Co-authored-by: daikei <daikei@noreply.codeberg.org>
Co-committed-by: daikei <daikei@noreply.codeberg.org>
 2023-02-11 21:05:31 +00:00
ThatOneCalculator
1e7f8c3ab8 chore: up calckey.js 2023-02-11 13:04:22 -08:00
daikei
7e7c47f143 Merge branch 'develop' into develop 2023-02-11 20:29:44 +00:00
GeopJr
ccba7fc9db feat: ✨ don't depend on an external service for urn:ietf:wg:oauth:2.0:oob (#9602) 
Co-authored-by: GeopJr <evan@geopjr.dev>
Co-committed-by: GeopJr <evan@geopjr.dev>
 2023-02-11 20:08:12 +00:00
Kio-td
7465e8461d Fix bad math 2023-02-11 07:18:56 -05:00
Kio-td
1a90496318 Merge branch 'develop' of https://codeberg.org/Daikei/calckey into develop 2023-02-11 06:26:31 -05:00