ThatOneCalculator
86b50ee32a
don't load icons in pug
2022-11-21 20:05:08 -08:00
ThatOneCalculator
73e628ccb5
deprecate node < 18
2022-11-21 16:27:32 -08:00
ThatOneCalculator
160c65fa62
description, not summary
2022-11-19 01:20:31 -08:00
ThatOneCalculator
1f60f89d81
test api docs
2022-11-19 01:15:35 -08:00
ThatOneCalculator
54db70a216
perf: ⚡ load icons css last
2022-11-19 00:53:30 -08:00
ThatOneCalculator
684f7be189
perf: ⚡ load icons css last
2022-11-19 00:52:41 -08:00
ThatOneCalculator
4ff8ff74de
Add Sage to patron list
2022-11-19 00:08:45 -08:00
ThatOneCalculator
acf6f11b80
fix patrons
2022-11-19 00:04:35 -08:00
ThatOneCalculator
bef01175dc
fetch patrons remotely
2022-11-18 23:54:50 -08:00
ThatOneCalculator
ec237623f2
typo
2022-11-18 20:18:00 -08:00
ThatOneCalculator
90efe2090e
Finally fix star reaction fallback migration
2022-11-18 20:17:32 -08:00
ThatOneCalculator
4c881cf7aa
migration
2022-11-18 19:26:45 -08:00
ThatOneCalculator
9daf4db0cb
feat: ✨ Page drafts
2022-11-18 19:24:05 -08:00
syuilo
eb9d50ec70
improve performance (merge deepClone from Misskey dev)
2022-11-18 17:28:58 -08:00
ThatOneCalculator
cf17d5feec
upgrade deps
2022-11-18 17:20:34 -08:00
ThatOneCalculator
aa66bded69
init
2022-11-17 13:54:25 -08:00
ThatOneCalculator
cb6362fd49
chore: ⬆️ upgrade packages
2022-11-16 02:08:33 -08:00
ThatOneCalculator
b87ba18d42
don't require credential for stats
2022-11-15 00:37:35 -08:00
ThatOneCalculator
8eecacec4f
AVIF support
2022-11-14 18:53:38 -08:00
ThatOneCalculator
59b33b08ce
more fixes
2022-11-14 18:35:01 -08:00
ThatOneCalculator
3dd84a15d8
chore: ⬆️ update deps
2022-11-13 13:14:34 -08:00
ThatOneCalculator
15430ca087
fix pinned users list
2022-11-09 20:06:03 -08:00
ThatOneCalculator
d209b61ed9
fix pinned users
2022-11-09 19:59:20 -08:00
ThatOneCalculator
eaa4d17065
chore: 📦 package upgrades
2022-11-09 17:21:09 -08:00
Johann150
58dfd45ce1
server: reduce dead instance detection to 7 days
2022-11-09 17:19:49 -08:00
Johann150
5a691f7e98
server: avoid adding suspended instances to deliver queue
...
This should reduce the performance hit when adding large numbers of
instances to the deliver queue by making the check for suspended and
dead instances a bulk operation.
Changelog: Changed
Reviewed-on: https://akkoma.dev/FoundKeyGang/FoundKey/pulls/215
2022-11-09 17:19:29 -08:00
Francis Dinh
cd48673b2e
backend: Update sharp to 0.31.2
...
This fixes a bug where the backend might crash when processing certain images on an ARM64 system.
See https://akkoma.dev/FoundKeyGang/FoundKey/issues/226 and https://github.com/misskey-dev/misskey/issues/8605 for details.
2022-11-08 19:52:08 +01:00
ThatOneCalculator
4a08da1292
oopsie
2022-11-06 19:44:26 -08:00
ThatOneCalculator
87225b41cd
fix
2022-11-06 17:44:38 -08:00
ThatOneCalculator
b3a5fdb1e0
feat: 💄 Phosphor icons!
2022-11-06 17:33:52 -08:00
ThatOneCalculator
9b3e578c9e
sq
2022-11-06 14:20:14 -08:00
ThatOneCalculator
7beec91753
calckey_app
2022-11-06 13:24:02 -08:00
ThatOneCalculator
9cb1b1a48c
update deps
2022-11-04 13:20:18 -07:00
ThatOneCalculator
471240b101
a
2022-11-04 13:12:56 -07:00
yawhn
58eed45187
whitespace fix
2022-11-03 02:15:40 +02:00
yawhn
dba4d2240e
Fix for undefined url param in some pages
2022-11-03 02:03:27 +02:00
yawhn
9bc3f885bc
[ #9064 ] Fix CSS and Image caching issue
2022-11-02 23:31:42 +02:00
ThatOneCalculator
f13e19dee1
feat: ✨ Managed hosting complete
2022-11-01 18:41:59 -07:00
ThatOneCalculator
db6e17364a
Max users
2022-10-30 21:38:20 -07:00
ThatOneCalculator
01e289c6de
No darkreader
2022-10-30 21:27:06 -07:00
ThatOneCalculator
b383c904b2
change to click.self
2022-10-28 10:52:13 -07:00
ThatOneCalculator
e72348f5d1
OCR image captioning work
2022-10-27 15:01:38 -07:00
ThatOneCalculator
d46f08c189
chore: 📦 Update packages
2022-10-27 14:25:31 -07:00
ThatOneCalculator
6ed18667b7
feat: ✨ Allow importing follows from Pixelfed
2022-10-27 14:17:40 -07:00
Francis Dinh
b331d1b0eb
use await for notes.countBy
2022-10-26 14:48:37 -07:00
Johann150
97b6f45993
server: allow to like own gallery posts
...
Since you are also allowed to react to your own notes, it seems sensible
that you should be allowed to like your own gallery posts.
Analogous to commit 4c5aa9e53887cca5561fcec6ab0754e018f589a5.
Changelog: Changed
2022-10-26 14:46:30 -07:00
Johann150
958196a103
server: allow to like own pages
...
Since you are also allowed to react to your own notes, it seems sensible
that you should be allowed to like your own pages.
Changelog: Changed
2022-10-26 14:46:23 -07:00
ThatOneCalculator
4c9dabe7b8
Security fixes
2022-10-25 19:22:30 -07:00
ThatOneCalculator
9217d9bff5
fix
2022-09-21 13:18:12 -07:00
ThatOneCalculator
a075813d30
Allow admins to set logo url
2022-09-21 13:05:59 -07:00
ThatOneCalculator
918af38a79
implement update notif into UI
2022-09-15 15:36:43 -07:00
ThatOneCalculator
e9445561fd
logs
2022-09-15 15:32:25 -07:00
ThatOneCalculator
6a2fc8ec3b
fix
2022-09-15 15:28:32 -07:00
ThatOneCalculator
92150c575f
move codeberg fetch to backend
2022-09-15 15:23:08 -07:00
ThatOneCalculator
790e4361dc
fix: 🐛 motd
2022-09-13 21:38:02 -07:00
ThatOneCalculator
4c021e196f
fix motd
2022-09-13 20:41:45 -07:00
ThatOneCalculator
b0e1c3d866
meta
2022-09-13 20:23:52 -07:00
ThatOneCalculator
59f80c60b9
Merge remote-tracking branch 'nullobsi/secure-fetch' into develop
2022-09-13 20:23:22 -07:00
ThatOneCalculator
afa87c1cab
chore: ♻️ `about-misskey` -> `about-calckey`
2022-09-10 12:25:22 -07:00
ThatOneCalculator
a9eb58ac72
chore: 🔀 Merge upstream to 12.119.0
2022-09-10 12:13:55 -07:00
syuilo
7c89a27e61
update deps
2022-09-10 19:14:07 +09:00
ThatOneCalculator
e8664b5664
chore: 🔀 Merge upstream
2022-09-09 12:16:58 -07:00
ThatOneCalculator
0f21d4c077
chore: ⬆️ Upgrade several deps
...
From yarn upgrade-interactive
2022-09-07 16:23:33 -07:00
nullobsi
1c7dc4a1e8
Hide private data in pug when private mode is enabled
2022-09-06 20:47:36 -07:00
nullobsi
7caec25f0f
Add secure mode settings to Security tab
2022-09-06 20:47:33 -07:00
nullobsi
26f0483094
In private mode, block access to many public APIs
2022-09-06 20:46:42 -07:00
nullobsi
a03f13fb3f
Add Secure Mode and Private Mode
...
- Add instance actor
- Add private mode, which uses an allowlist
- Add Secure Mode, restricts access to blocked instances
2022-09-06 20:46:41 -07:00
nullobsi
7887082622
Add migration for allowedHosts, secureMode, privateMode
2022-09-06 20:46:41 -07:00
syuilo
1b014bc3e5
fix(server): 他人の通知を既読にできる可能性があるのを修正
2022-09-06 20:54:49 +09:00
Takuya Yoshida
057d1642c8
Update typeorm to 0.3.9 ( #9083 )
2022-09-06 14:57:46 +09:00
ThatOneCalculator
4dc706a91a
chore: ⬆️ Upgrade TypeORM
2022-09-05 14:53:48 -07:00
ThatOneCalculator
e6236a2ffb
fix screenshot size
2022-08-27 21:44:30 -07:00
ThatOneCalculator
770b2d9908
bg col
2022-08-27 21:44:17 -07:00
ThatOneCalculator
ef801a4b94
description
2022-08-27 21:43:57 -07:00
ThatOneCalculator
5c6cff93ef
feat: ✨ improve pwa manifest
2022-08-27 21:42:38 -07:00
ThatOneCalculator
ab4c267594
Merge remote-tracking branch 'misskey/develop' into develop
2022-08-27 15:18:59 -07:00
syuilo
47b2e56967
update deps
2022-08-27 16:34:14 +09:00
syuilo
773139b737
enhance(client): add html color-schema support
2022-08-27 00:39:59 +09:00
ThatOneCalculator
899d7b42b5
Always `signToActivityPubGet`
2022-08-22 23:44:26 -07:00
ThatOneCalculator
ea3c2441be
fix: 🔒 Up multer to LTS as to avoid CVE-2022-24434
2022-08-17 15:57:16 -07:00
ThatOneCalculator
f101791d02
Fix overlap betwen favicon and splash icon
2022-08-15 15:55:30 -07:00
ThatOneCalculator
c80577c709
Merge remote-tracking branch 'misskey/develop' into develop
2022-08-15 15:21:46 -07:00
syuilo
dddc076d01
update deps
2022-08-13 18:45:29 +09:00
ThatOneCalculator
20c32d6b0e
Add back migration
2022-08-09 19:56:03 -07:00
ThatOneCalculator
73a57858e0
feat: ✨ custom css/assets
...
typo
fix gulpfile
2022-08-09 13:09:54 -07:00
ThatOneCalculator
e7f2c7df03
fix: recommended timeline
...
I doubt itll work, but...
🙏
hail mairy
certified typeorm moment
im stuff
debug log
not a fan of js/ts
istg
missing parenthesis
postgres can kiss my ass
didnt need `::string[]` i think
hide caption button
Remove debug log
Clean up
no longer beta!
fix streaming
2022-08-09 13:09:54 -07:00
ThatOneCalculator
916e9db51a
attempt to fix
2022-08-09 00:37:48 -07:00
ThatOneCalculator
7095abf728
Obliteration of Ai-chan 🐱 🔫
2022-08-08 14:58:27 -07:00
ThatOneCalculator
0601a89cb8
New error images!
2022-08-08 14:07:09 -07:00
ThatOneCalculator
74bd9fd01c
docs
2022-08-05 14:11:18 -07:00
ThatOneCalculator
31e9279c70
More Calckey branding
2022-08-05 14:07:40 -07:00
ThatOneCalculator
497675c49e
import order
2022-08-04 18:13:56 -07:00
ThatOneCalculator
4cae839bfa
thumbs up or star trggers pleroma like
2022-08-04 18:12:57 -07:00
ThatOneCalculator
c1509ebcad
idk
2022-08-04 14:28:16 -07:00
ThatOneCalculator
26e82b73dc
im stuff
2022-08-04 14:25:54 -07:00
ThatOneCalculator
b376d3e98e
stuff?
2022-08-04 14:16:22 -07:00
ThatOneCalculator
1151991b70
t
2022-08-04 14:13:12 -07:00
Johann150
74cf3d887c
backend: fix lint "no-throw-literal"
2022-08-04 13:36:37 -07:00
Johann150
dd28859348
fix spelling error
2022-08-04 13:34:18 -07:00
ThatOneCalculator
0e7361d4b8
Merge remote-tracking branch 'misskey/develop' into develop
2022-08-04 13:31:54 -07:00
syuilo
f3164c9cf2
fix: use new for throw error
...
Co-Authored-By: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
2022-08-01 17:44:53 +09:00
syuilo
78f061b9db
update deps
2022-07-31 22:01:01 +09:00
syuilo
b5bf4e75a6
use es2021 for node
2022-07-31 14:20:10 +09:00
ThatOneCalculator
025a8e23c4
revers
2022-07-29 15:07:07 -07:00
ThatOneCalculator
3ccf2ea098
test
2022-07-29 09:27:39 -07:00
ThatOneCalculator
5b9e2ec817
try new query
2022-07-29 09:17:10 -07:00
ThatOneCalculator
2d14777573
try to fix streaming
2022-07-29 08:57:53 -07:00
ThatOneCalculator
669ee2c600
im stuff
2022-07-29 01:11:25 -07:00
ThatOneCalculator
bcc219566d
remove console log
2022-07-29 00:44:17 -07:00
ThatOneCalculator
261e00fcde
console log
2022-07-29 00:40:27 -07:00
ThatOneCalculator
8d1144cda0
stuff
2022-07-29 00:35:49 -07:00
ThatOneCalculator
1372a246b5
brackets
2022-07-29 00:33:51 -07:00
ThatOneCalculator
b51a8750a3
()
2022-07-29 00:30:42 -07:00
ThatOneCalculator
b53bbc960f
im stuff
2022-07-29 00:28:21 -07:00
ThatOneCalculator
5112f6425e
try @Johann150's solution :)
2022-07-29 00:25:22 -07:00
ThatOneCalculator
13648d03a1
im stuff
2022-07-29 00:20:40 -07:00
ThatOneCalculator
40c197ed60
no quotes
2022-07-29 00:13:29 -07:00
ThatOneCalculator
152c8c9cae
testtt
2022-07-29 00:09:49 -07:00
ThatOneCalculator
8380487afe
testtt
2022-07-29 00:00:39 -07:00
ThatOneCalculator
3fae29e4d5
FROM clause
2022-07-28 23:57:18 -07:00
ThatOneCalculator
15ad79c3de
aaa
2022-07-28 23:53:42 -07:00
ThatOneCalculator
e639496be2
fix!!!!
2022-07-28 23:46:36 -07:00
ThatOneCalculator
291649b6e7
proper error
2022-07-28 23:01:13 -07:00
ThatOneCalculator
9d53e8322a
bruh
2022-07-28 22:57:54 -07:00
ThatOneCalculator
e8ccd62a27
help i cant write queer ees :(
2022-07-28 22:54:59 -07:00
ThatOneCalculator
e447e72c77
ack
2022-07-28 22:46:51 -07:00
ThatOneCalculator
664ea1dcf4
test :(
2022-07-28 22:42:40 -07:00
ThatOneCalculator
73ac045aa8
typo!!
2022-07-28 22:31:49 -07:00
ThatOneCalculator
2c7ece6bc6
I think i fixed it!
2022-07-28 22:29:54 -07:00
ThatOneCalculator
1af22f0bc2
test
2022-07-28 22:17:59 -07:00
ThatOneCalculator
a0529277e3
typo in file name
2022-07-28 21:50:00 -07:00
ThatOneCalculator
c96c0ac7d3
typo
2022-07-28 21:49:36 -07:00
ThatOneCalculator
b3a50187b1
Recommended timeline!
2022-07-28 21:28:13 -07:00
ThatOneCalculator
fccab12c82
im stufff
2022-07-27 21:36:02 -07:00
ThatOneCalculator
84c3664628
A
2022-07-27 21:33:23 -07:00
ThatOneCalculator
d37e83046c
fix againnn
2022-07-27 21:31:05 -07:00
ThatOneCalculator
4ac6073a77
fix migration
2022-07-27 21:25:37 -07:00
ThatOneCalculator
1001c18e17
Fix migration
2022-07-27 21:22:03 -07:00
Johann150
b60d8f147c
fix lints
2022-07-27 19:46:56 -07:00
Chloe Kudryavtsev
29cdb93104
backend: improve mutes and blocks
...
Mutes and blocks now also apply recursively to replies and renotes.
Furthermore, any mentioned user being muted or blocked will also apply.
2022-07-27 19:46:26 -07:00
ThatOneCalculator
1129a2ec8c
Custom splash icons!
2022-07-27 10:25:30 -07:00
ThatOneCalculator
7ae95770aa
Add endpoint
2022-07-27 09:58:18 -07:00
ThatOneCalculator
4a7166625f
clean up
2022-07-27 09:47:29 -07:00
ThatOneCalculator
4d22797624
Custom MOTD!
2022-07-27 09:46:35 -07:00
ThatOneCalculator
a88fe74b82
semi for children
2022-07-26 14:45:36 -07:00
ThatOneCalculator
f04995c3e8
fix
2022-07-25 14:17:58 -07:00
Johann150
7da0602759
use getNote instead of Notes.find
...
If a note is not visible to the requesting user, an error will be raised.
2022-07-25 14:17:20 -07:00
ThatOneCalculator
3046b87b76
.js
2022-07-25 14:02:46 -07:00
ThatOneCalculator
0eb25b5ab4
fix import
2022-07-25 13:59:12 -07:00
ThatOneCalculator
6bf10ccfbc
im stuff
2022-07-25 13:57:13 -07:00
Johann150
15f06a1d50
enable to fetch replies recursively
2022-07-25 13:40:37 -07:00
Johann150
86342538aa
pack children without detail
2022-07-25 13:40:22 -07:00
Johann150
d6a95797d8
remove ms dependency
2022-07-25 13:38:31 -07:00
Johann150
20763a84ee
Merge: enhance privacy of notes
...
https://akkoma.dev/FoundKeyGang/FoundKey/pulls/14
2022-07-25 13:36:44 -07:00
Johann150
3b40c7d081
remove unnecessary joins
...
These joins are no longer necessary as of commit
c35372a20d22cddb75e93a0b407f2b652cd7faf0. It seems they are bad enough
for performance to break installs.
2022-07-25 13:28:57 -07:00
ThatOneCalculator
ee0a19c3f7
Merge remote-tracking branch 'misskey/develop' into develop
2022-07-25 10:23:27 -07:00
syuilo
f835421d70
update deps
2022-07-25 21:10:06 +09:00
ThatOneCalculator
e90d5b23db
More #31748f
2022-07-24 18:36:55 -07:00
ThatOneCalculator
2b1e707f8c
Merge remote-tracking branch 'misskey/develop' into develop
2022-07-24 18:07:18 -07:00
syuilo
9f5c8f42e0
tweak rate limit
2022-07-24 17:56:48 +09:00
ThatOneCalculator
e4a72f8de3
🎨
2022-07-23 22:10:07 -07:00
ThatOneCalculator
bf8a82bf67
Less cluttered notifications
2022-07-23 21:30:42 -07:00
ThatOneCalculator
4230e289da
more rpine stuff
2022-07-23 21:23:04 -07:00
ThatOneCalculator
a866d49b6f
Merge remote-tracking branch 'johann150/mk/bearer-authentication' into develop
2022-07-23 19:05:35 -07:00
ThatOneCalculator
1f98b349bf
Merge remote-tracking branch 'misskey/develop' into develop
2022-07-23 18:57:23 -07:00
dependabot[bot]
d93ad43c49
chore(deps): bump undici from 5.5.1 to 5.8.0 in /packages/backend ( #9028 )
...
Bumps [undici](https://github.com/nodejs/undici ) from 5.5.1 to 5.8.0.
- [Release notes](https://github.com/nodejs/undici/releases )
- [Commits](https://github.com/nodejs/undici/compare/v5.5.1...v5.8.0 )
---
updated-dependencies:
- dependency-name: undici
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-07-23 14:41:01 +09:00
dependabot[bot]
ab9fcc863f
chore(deps): bump file-type from 17.1.2 to 17.1.3 in /packages/backend ( #9030 )
...
Bumps [file-type](https://github.com/sindresorhus/file-type ) from 17.1.2 to 17.1.3.
- [Release notes](https://github.com/sindresorhus/file-type/releases )
- [Commits](https://github.com/sindresorhus/file-type/compare/v17.1.2...v17.1.3 )
---
updated-dependencies:
- dependency-name: file-type
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-07-23 14:40:54 +09:00
syuilo
3acfeb1680
update tfjs
2022-07-23 14:31:15 +09:00
ThatOneCalculator
d2b0367e8f
Merge remote-tracking branch 'misskey/develop' into develop
2022-07-21 23:43:30 -07:00
xianon
b6556c7ff1
リモートユーザーを正しくブロックできるように修正する ( #9027 )
2022-07-22 15:41:31 +09:00
ThatOneCalculator
db97dff0cb
b3
2022-07-21 12:48:23 -07:00
syuilo
53d24c2ba1
chore: improve error message of boot
2022-07-21 22:30:36 +09:00
ThatOneCalculator
d88f07f431
Properly apply star is like patch
2022-07-19 15:23:26 -07:00
ThatOneCalculator
3149b93de2
indentation
2022-07-19 12:01:45 -07:00
ThatOneCalculator
4d0f511fa1
Better ASCII art
2022-07-19 11:18:44 -07:00
ThatOneCalculator
64ef31f8db
Calckey as software name, finally!
2022-07-19 10:49:43 -07:00
ThatOneCalculator
de6c93ceb6
Calckey in launch strings
2022-07-19 10:18:05 -07:00
ThatOneCalculator
b1efe26c89
More Calckey strings
2022-07-19 10:13:17 -07:00
ThatOneCalculator
4386004fbf
Branding
2022-07-19 09:21:45 -07:00
ThatOneCalculator
eaf31f78ad
Merge remote-tracking branch 'misskey/develop' into develop
2022-07-19 09:04:29 -07:00
syuilo
2497499d63
Merge branch 'develop' into pr/9021
2022-07-19 23:53:08 +09:00
Acid Chicken (硫酸鶏)
a3c2dbbfb5
fix(server): make sure `getFileInfo` doesn't fail if `detectSensitivity` ever fails ( #9020 )
2022-07-19 17:09:21 +09:00
Johann150
c4e2a222f0
handle authentication errors in stream API
2022-07-19 09:32:46 +02:00
Johann150
0131ec4a58
update openapi spec generator
...
Properly document GET API endpoints.
Added Bearer token authentication.
2022-07-19 09:32:01 +02:00
Johann150
4ca48908be
improve authentication errors
2022-07-19 09:29:04 +02:00
Johann150
29f7eb4482
add OAuth 2.0 Bearer Token authentication
2022-07-19 09:29:04 +02:00
ThatOneCalculator
c0b42fd3be
tabs
2022-07-18 23:21:08 -07:00
ThatOneCalculator
3632eec20b
calckey ascii art
2022-07-18 23:07:18 -07:00
ThatOneCalculator
f35d518caf
oauth
2022-07-18 22:22:24 -07:00
ThatOneCalculator
0e25cf773a
yarn lol
2022-07-18 22:04:21 -07:00
ThatOneCalculator
09b78cb1ab
MOTD
2022-07-18 21:47:32 -07:00
ThatOneCalculator
0c46bb96b1
The annoying orange
2022-07-18 21:32:02 -07:00
ThatOneCalculator
6a70fed2e7
migration
2022-07-18 21:04:55 -07:00
ThatOneCalculator
fcb91702d9
Merge remote-tracking branch 'nullobsi/secure-fetch' into develop
2022-07-18 20:50:15 -07:00
ThatOneCalculator
4bfc6f2457
Merge remote-tracking branch 'thatonecalculator/self-host-images' into develop
2022-07-18 20:34:37 -07:00
ThatOneCalculator
f63e725a90
Merge remote-tracking branch 'thatonecalculator/repair-style' into develop
2022-07-18 20:34:06 -07:00
ThatOneCalculator
3609c2784d
Calckey
2022-07-18 19:00:45 -07:00
nullobsi
3f14e23431
Hide private data in pug when private mode is enabled
2022-07-17 15:25:40 -07:00
nullobsi
a69557f193
Add secure mode settings to Security tab
2022-07-17 15:25:40 -07:00
nullobsi
e7f20affc9
In private mode, block access to many public APIs
2022-07-17 15:25:40 -07:00