Kaity A
f0a0a657b9
Merge branch 'develop' of https://codeberg.org/calckey/calckey into feature/edits
2023-05-13 22:13:02 +10:00
Kainoa Kanter
8877598799
chore: formatting
2023-05-12 20:11:41 -07:00
Kainoa Kanter
2bc1142016
fix typo
2023-05-11 19:02:51 -07:00
Freeplay
e9fdd707af
Fix wallpaper support for all views
2023-05-11 20:38:54 -04:00
ThatOneCalculator
37fea1136b
calckey.org
2023-05-10 23:30:48 -07:00
syuilo
5ffef363f3
念のためnoimageaiもつける
2023-05-10 20:51:22 -07:00
syuilo
6bc07036ac
feat: 投稿したコンテンツのAIによる学習を軽減するオプションを追加
...
Co-authored-by: GitHub <syuilo>
2023-05-10 20:50:21 -07:00
ThatOneCalculator
3adcc107ff
call it "moderation notice"
2023-05-10 14:32:27 -07:00
ThatOneCalculator
860a26b10f
email padding
2023-05-10 14:29:43 -07:00
ThatOneCalculator
81c56d980e
improve emails
2023-05-10 14:27:46 -07:00
ThatOneCalculator
21ab26a7b3
Merge branch 'develop' of codeberg.org:calckey/calckey into develop
2023-05-10 14:06:55 -07:00
ThatOneCalculator
a11abdde60
feat: ✨ ability for moderators to send mod mail
2023-05-10 14:06:45 -07:00
April John
9118ca50d3
reintroduce async into post import
2023-05-10 22:26:31 +02:00
Essem
947e8932f2
Switch to adm-zip for emoji pack handling
...
Unzipper seems to corrupt files in certain cases on Node 18/19.
See https://github.com/ZJONSSON/node-unzipper/issues/271
2023-05-09 19:19:15 -05:00
ThatOneCalculator
186b8a9b16
Address #10076
2023-05-09 15:15:13 -07:00
April John
b10f9beef2
Revert "fix: run post import async"
...
This reverts commit 3bedd1b347
.
2023-05-08 22:48:12 +02:00
ThatOneCalculator
a929dc11de
example.com -> calckey.org
2023-05-08 13:39:39 -07:00
ThatOneCalculator
a7c523ee46
chore: formatting
2023-05-08 13:36:53 -07:00
April John
3bedd1b347
fix: run post import async
2023-05-08 22:30:40 +02:00
April John
ecf263bd91
import replies too
2023-05-08 22:09:42 +02:00
April John
ede47e45c8
try fetching replies
2023-05-08 22:09:42 +02:00
ThatOneCalculator
189e972e0d
chore: formatting
2023-05-08 13:01:06 -07:00
April John
0c742929a5
fix: dont stream hidden posts
2023-05-08 19:33:04 +02:00
April John
0b59937e9e
fix: Detach push notifications..
...
..from "isRead" check. Apps will handle that theself.
2023-05-08 11:36:32 +02:00
April John
8c6475961e
fix hidden post behavior
2023-05-08 11:23:30 +02:00
ThatOneCalculator
ba7418aa6d
Revert "fix: hidden post federation"
...
This reverts commit 8a51c73fe7
.
2023-05-07 18:01:36 -07:00
ThatOneCalculator
f2ffe07425
chore: formatting
2023-05-07 12:29:02 -07:00
ThatOneCalculator
a7b7e1c5d4
remove gfonts from redoc
2023-05-07 12:28:24 -07:00
ThatOneCalculator
988b530745
Revert "Merge pull request 'Add support for CW boosting' ( #10047 ) from supakaity/hajkey:hk/cw-boost into develop"
...
This reverts commit 5e86bafb24
, reversing
changes made to d1977fc320
.
2023-05-07 11:38:39 -07:00
April John
d0d49696e2
fix: make userId optional cause its not used and
...
should not be used lmao
2023-05-07 16:27:49 +02:00
Kaity A
5395b96428
Note editing
2023-05-07 20:27:25 +10:00
naskya
324ec9e095
format
2023-05-07 09:46:07 +09:00
MeiMei
9a3eb859bc
(partially) cherry-picked from misskey/10e526b
...
fix: Escape SQL LIKE
* SQL LIKE escape
* CHANGELOG
2023-05-07 09:16:46 +09:00
naskya
27d1d96c9d
Modify backend for Calckey
2023-05-07 09:13:37 +09:00
naskya
8a2135ba28
format
2023-05-07 08:05:18 +09:00
たーびん
54f6876c9c
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
8a51c73fe7
fix: hidden post federation
2023-05-06 18:27:42 +02:00
ThatOneCalculator
695cb87052
chore: format
2023-05-05 13:29:39 -07:00
ThatOneCalculator
fe499ccf9d
Merge branch 'develop' of codeberg.org:calckey/calckey into develop
2023-05-05 13:28:39 -07:00
ThatOneCalculator
8f85f2c58f
re-enable post imports
2023-05-05 13:27:52 -07:00
naskya
069c789a78
Merge branch 'develop' into fix/word-mutes
2023-05-05 14:01:14 +00:00
April John
dd777935cb
fix: dont stream hidden posts over websocket
2023-05-05 15:53:05 +02:00
April John
6b6e5dfcdf
hide hidden posts in websocket streams
2023-05-05 15:50:50 +02:00
April John
3800eb8980
Feat: new internal post visibility "hidden"
2023-05-05 15:16:10 +02:00
April John
5fd6690755
Fix: properly handle timeline db errors
2023-05-05 14:30:08 +02:00
naskya
db273318b8
Remove the code snippets which didn't work
2023-05-05 16:58:42 +09:00
naskya
52f521941c
I believe I finally solved the boost hard mute issue (took 3 hours)
2023-05-05 15:32:47 +09:00
naskya
86dc71b201
oops
2023-05-05 12:49:34 +09:00
naskya
95f04a1c3c
Fix regex hard mutes
2023-05-05 12:36:17 +09:00
naskya
edf47d390b
Fix channel bug
2023-05-05 07:47:03 +09:00
naskya
3b3da42763
clean up
2023-05-05 06:16:23 +09:00
naskya
7113735212
Use original (Misskey's) implementation for hard mutes as muted reason isn't needed
2023-05-05 05:48:31 +09:00
naskya
ffea68ad8d
I was confused
2023-05-05 05:26:59 +09:00
naskya
e46cac02e3
Fix missing return, typo
2023-05-05 05:22:32 +09:00
naskya
fc3296d64f
Fix missing arguments
2023-05-05 05:17:16 +09:00
naskya
ebfd07628e
format
2023-05-04 14:41:18 +09:00
naskya
137cef81b6
Merge branch 'develop' into fix/word-mutes
2023-05-04 05:36:29 +00:00
naskya
d9553e73af
Differentiate soft mutes and hard mutes
2023-05-04 14:20:06 +09:00
naskya
075e5a1c7a
Refactor hard word mutes
2023-05-04 13:17:37 +09:00
Namekuji
49e9fb9001
don't update if renoted by bot
2023-05-03 16:16:34 -04:00
Kaity A
a7c9400a42
Merge remote-tracking branch 'origin/develop' into hk/edit-federation
2023-05-02 18:24:54 +10:00
Kaity A
389c531b2c
update file sensitivity on note edit
2023-05-02 18:22:42 +10:00
Kaitlyn Allan
61dde4c0b0
updates to include alt text editing
2023-05-02 17:47:16 +10:00
ThatOneCalculator
169d61f0ad
disable post imports for now
2023-05-01 23:08:35 -07:00
ThatOneCalculator
bf262b972f
max import posts twice a month
2023-05-01 21:54:15 -07:00
ThatOneCalculator
ad969a28cc
chore: formatting
2023-05-01 20:32:18 -07:00
Namekuji
aaa8083740
fix db migration
2023-05-01 18:11:56 -04:00
Kainoa Kanter
93309db051
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
8d1251b977
fix email validation
2023-04-30 22:57:10 -07:00
s1idewhist1e
6f32efd898
Wrap note fetching in a try/catch
2023-04-30 22:11:15 -07:00
Namekuji
93dc237835
Merge branch 'develop' into instance-silence
2023-04-30 22:02:04 -04:00
Namekuji
fe96578b14
enforce follow-request from silenced users
2023-04-30 21:43:56 -04:00
Namekuji
784f632b99
suppress notification from silenced users and instances
2023-04-30 21:35:10 -04:00
ThatOneCalculator
69b62fa2c0
favicon
2023-04-30 17:14:04 -07:00
Namekuji
9535bbcf89
do not notify if the target is not following
2023-04-30 19:46:02 -04:00
Namekuji
5338185605
format
2023-04-30 18:01:06 -04:00
Namekuji
5b62f110d1
add db migration
2023-04-30 18:00:19 -04:00
Namekuji
74b1bead52
Merge branch 'develop' into instance-silence
2023-04-30 17:52:05 -04:00
ThatOneCalculator
4b1fa90c8f
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
c3d747e42d
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
6eed038028
fix poll voting causing edit revisions.
2023-05-01 03:17:38 +10:00
Kaity A
627a71701f
Implement inbound note edit federation
2023-05-01 02:29:50 +10:00
Namekuji
a1645ddc5b
can overlap with blocked hosts
2023-04-30 09:04:29 -04:00
Namekuji
51858ae473
add toggler
2023-04-30 09:01:42 -04:00
Namekuji
9bc872dc00
format
2023-04-30 08:08:45 -04:00
Namekuji
151b30c53d
rename and comment
2023-04-30 07:58:03 -04:00
Namekuji
ba734a9f3c
instance silence
2023-04-30 07:27:55 -04:00
Kaity A
914355c644
Add Libre Translate support
2023-04-30 11:09:51 +10:00
ThatOneCalculator
41151ca918
new logos
2023-04-29 15:32:33 -07:00
ThatOneCalculator
11b93d2d9a
chore: upgrade megalodon
2023-04-29 13:28:24 -07:00
fruye
a18e1cccc6
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
1865a9c204
Revert "[Fix] Properly replace koa-fix-trailing-slashes with inhouse script ( #9870 )"
...
This reverts commit 2cdaad588c
.
2023-04-27 16:32:37 -07:00
Kainoa Kanter
431a08d06e
Revert "Merge pull request '[feat] Replace Koa-FavICO with a smaller router' ( #9853 ) from daikei/calckey:modularize-favico into develop"
...
This reverts commit 4f6cae7643
, reversing
changes made to 64a737d001
.
2023-04-27 16:25:13 -07:00
fruye
f8178a9535
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
e5fcde758f
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
df8db1171a
fix: style email with inline styles
2023-04-26 20:21:30 -07:00
ThatOneCalculator
e048d951fc
try to fix email style...
2023-04-26 20:04:58 -07:00
ThatOneCalculator
a44fee3aae
fix?
2023-04-26 19:58:26 -07:00
ThatOneCalculator
8e22a211d1
fix: add route
2023-04-26 19:51:25 -07:00
ThatOneCalculator
0a2335ff75
feat: ✨ frontend interface for post-account creation email verification
2023-04-26 19:44:38 -07:00
ThatOneCalculator
3dfb43be84
Merge branch 'develop' of codeberg.org:calckey/calckey into develop
2023-04-26 14:20:02 -07:00
ThatOneCalculator
fca37cd86e
Revert "chore: update summaly"
...
This reverts commit b60a3b509e
.
2023-04-26 14:19:55 -07:00
Namekuji
eebfdf8559
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
a6761ec278
see if this works
2023-04-25 18:21:15 -07:00
ThatOneCalculator
9b129be524
throw different error if following is null
2023-04-25 08:31:05 -07:00
ThatOneCalculator
b2e80db219
revert messaging room
2023-04-24 15:45:34 -07:00
naskya
df8294bde3
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
64a1c24686
chore: up pakcages
2023-04-23 15:34:50 -07:00
fruye
1a39e7a48e
feat: Implement reading Announcements from MastoAPI
2023-04-23 22:17:02 +02: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
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
c6f0047aed
reaction settings auto reload
2023-04-19 20:46:37 -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
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
1824b27e16
chore: formatting
2023-04-14 15:35:18 -07: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
ThatOneCalculator
4694e30573
chore: up swc
2023-04-13 09:43:13 -07:00
naskya
46864916d9
Allow to mute my own boosts
2023-04-12 15:52:46 +09: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
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
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
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
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
0f6e7056b7
days for featured
2023-04-06 22:48:07 -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
amybones
006bfbd42b
fix: toggling the blocking state from the instance-info admin view ( #9809 )
...
Because the admin meta information was never loaded on this page, no amount of toggling the block or suspend sliders on the instance-info page (e.g. `https://calckey.example.com/instance-info/instance.tld `) will result in the instance actually being added to the blocklist. You could still do it from the bulk blocklist management page, but that can get unwieldy quickly if you just want to do a quick block of an instance.
Co-authored-by: amy bones <amy@spookygirl.boo>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9809
Co-authored-by: amybones <amybones@noreply.codeberg.org>
Co-committed-by: amybones <amybones@noreply.codeberg.org>
2023-04-04 03:46:23 +00:00
ThatOneCalculator
daba80177a
feat: ✨ push notifs button
...
Co-authored-by: Tamania <tamaina@hotmail.co.jp>
2023-04-03 20:36:59 -07:00
Kainoa Kanter
3e334dea24
Merge pull request 'Require timeline endpoints to return the requested limit of notes.' ( #9805 ) from supakaity/hajkey:hk/notes-pagination into develop
...
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9805
2023-04-03 17:02:01 +00:00
Kaity A
3d93458d8b
Requested limit to be fulfilled if possible
2023-04-04 02:50:53 +10:00
amy bones
b28ba9f82f
fix: changing passwords, 2fa, and password resets.
...
The argon2 usage was only implemented for sign-ins which broke a bunch of other
endpoints and features.
2023-04-03 05:14:50 -07:00
Kaity A
a66eac0e5b
Separate cat-avatar mode and speak-as-cat nyanification
2023-04-02 21:24:12 +10:00
ThatOneCalculator
bb6d04f9c3
fix import
2023-04-01 23:28:55 -07:00
ThatOneCalculator
e9b45260b5
chore: 🎨 format
2023-04-01 21:10:31 -07:00
ThatOneCalculator
4e843f2949
fix: 🛂 no longer need 2fa for webauthn
2023-04-01 21:04:22 -07:00
ThatOneCalculator
93867ec927
fix migration
2023-04-01 12:14:54 -07:00
ThatOneCalculator
33ae0ca6fd
chore: add cleanup migration
2023-04-01 12:03:49 -07:00
Kaitlyn Allan
a3fa0a2f9c
Clarify variable names
2023-04-01 22:49:14 +10:00
Kaitlyn Allan
b96fe57793
Improve performance of charts
...
Fix some undefined !== deleted issues
2023-04-01 21:42:03 +10:00