Commit Graph

1026 Commits

Author SHA1 Message Date
naskya 1c0d4546f7 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 2117977d88
fix: when count is actually 0 2023-03-19 00:13:30 -07:00
cutestnekoaqua 025f149440
pass auth to metadata 2023-03-18 13:06:49 +01:00
cutestnekoaqua 04c1b395b4
fix: intermediarily convert ids 2023-03-18 12:23:03 +01:00
cutestnekoaqua 624d3c399f
add 404 as replacements 2023-03-18 12:09:43 +01:00
cutestnekoaqua 7a500ed836
chore: update megalodon 2023-03-18 11:52:18 +01:00
fruye 1239db9ac8 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 36281ec413 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 fcbee6d3f5 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 111bf8b77d webhook mastodon fixes 2023-03-14 17:18:30 +01:00
Luna e198a34cd0 Small fix to Masto ID conversion code 2023-03-13 00:44:38 -04:00
Luna 7236aa4a3a Sorta kinda handle client_credentials auth flow 2023-03-11 23:19:17 -05:00
Luna c81d6ecc1e
Proxy object IDs for Mastodon API to prevent Calckey ID format incompatibilities 2023-03-11 16:02:35 -05:00
Luna e2ebe83238
Convert limit parameter to int for certain Mastodon account endpoints 2023-03-11 16:02:35 -05:00
Luna b7ffa05848
Enable multipart for masto oauth endpoints to fix Ivory 2023-03-11 16:02:35 -05:00
Kaity A a432661e3c Expand caption limit to 1500 characters 2023-03-05 16:51:44 +10:00
Kaity A 5433603440 Set movedToUri & alsoKnownAs null when undefined 2023-03-04 08:24:22 +00:00
cutestnekoaqua 980d447561
parse full multipart data to media endpoints 2023-03-01 15:53:40 +01:00
cutestnekoaqua c74f4942d3
fix import 2023-03-01 15:07:35 +01:00
cutestnekoaqua 548381734a
some quick fixes 2023-03-01 15:04:01 +01:00
Cleo John 7ffd99497c fix errors 2023-02-28 17:38:48 +01:00
Cleo John 05acb51da2 more mastodon work 2023-02-28 17:23:04 +01:00
Masaya Suzuki ea5725b986
Check redis connection
---------

Co-authored-by: tamaina <tamaina@hotmail.co.jp>
2023-02-23 22:04:47 -08:00
CutestNekoAqua 19d84a73ac aa 2023-02-23 17:38:18 +01:00
CutestNekoAqua 0be450d95f meow? 2023-02-23 17:20:34 +01:00
CutestNekoAqua 41d696c6ca maybe buffer? 2023-02-23 17:13:35 +01:00
CutestNekoAqua 91df15209a this is the sign I need a break 2023-02-23 17:07:49 +01:00
CutestNekoAqua 1728419130 move file upload to new router 2023-02-23 17:02:02 +01:00
CutestNekoAqua cc44cc9da7 oh ich hab verkackt 2023-02-23 16:57:21 +01:00
CutestNekoAqua 2dbbd1d39d use multer upload instead 2023-02-23 16:55:38 +01:00
CutestNekoAqua 2c6368afc4 update thingy? 2023-02-23 16:42:57 +01:00
CutestNekoAqua 8dd610a6a1 lol 2023-02-23 16:34:16 +01:00
CutestNekoAqua 37d6039c1e fixed what ever calc did here, masto app didnt 2023-02-23 16:32:21 +01:00
CutestNekoAqua 3281b194e4 ?? 2023-02-23 16:26:33 +01:00
CutestNekoAqua 726e469e23 await the instance meta 2023-02-23 16:12:53 +01:00
CutestNekoAqua bb27ce997e import config 2023-02-23 15:58:54 +01:00
CutestNekoAqua 42a0c1b4a1 import multer 2023-02-23 15:55:28 +01:00
CutestNekoAqua d0a3c2c2b7 remove not needed middleware handlers 2023-02-23 15:46:12 +01:00
CutestNekoAqua f5537af8a1 aaa 2023-02-23 00:31:14 +01:00
CutestNekoAqua 684f2e883a fix mastodon api stats 2023-02-22 09:44:47 +01:00
ThatOneCalculator de17a10bb6
fix: 🐛 Don't show image previews if NSFW
Closes #9636
2023-02-18 12:02:25 -08:00
ThatOneCalculator 8f2ae33511
Masto API meta 2023-02-18 11:58:02 -08:00
ThatOneCalculator 2d59e363c0
feat: Show time for users 2023-02-18 11:33:25 -08:00
CutestNekoAqua 0c73344966 fix oopsie 2023-02-18 17:24:58 +01:00
CutestNekoAqua d418fee933 debug print users 2023-02-18 17:22:43 +01:00
CutestNekoAqua 22ce676cf9 make relationshiops work 2023-02-18 17:14:16 +01:00
daikei 09ad8b9621 Merge branch 'develop' into develop 2023-02-17 21:12:04 +00:00
ThatOneCalculator 7a88a0dedd
chore: formatting 2023-02-17 13:01:14 -08:00
ThatOneCalculator d5508535b9
chore: remove hard-to-see gradient 2023-02-17 00:16:35 -08:00
ThatOneCalculator 9469e4d399
perf: emoji lib performance fix 2023-02-17 00:01:22 -08:00