Commit Graph

2975 Commits

Author SHA1 Message Date
Freeplay de65c3c3f6 the better way of doing advanced MFM™ 2023-06-05 11:55:21 -04:00
Freeplay 60960d659d fix in cheat sheet also, I've realized I will need to do it a different at some point but this works for now. 2023-06-05 11:41:56 -04:00
Freeplay c25b80d39a Fix animated MFM not playing in posting form preview 2023-06-05 11:33:48 -04:00
Freeplay 47e3acd233 center-align navbar icons 2023-06-04 18:16:54 -04:00
Freeplay 517e0a16f3 Merge branch 'develop' of https://codeberg.org/calckey/calckey into upstream/develop 2023-06-04 17:52:49 -04:00
Freeplay 7c436d0a41 Prevent newly-made unlisted posts from showing in antennas 2023-06-04 17:52:44 -04:00
ThatOneCalculator 6a7e950f21
chore: formatting 2023-06-04 14:42:22 -07:00
Freeplay b0cd3b25fc fix background of mentions 2023-06-04 16:29:12 -04:00
Freeplay 3b889d9c05 header spacing 2023-06-04 16:05:06 -04:00
Freeplay c4fa29be50 i18n to more button in navbar 2023-06-04 15:46:11 -04:00
Freeplay 49d2c87e50 'clip' to 'clips' #10255 2023-06-04 15:39:23 -04:00
Freeplay 9e6a553434 preload antennas & lists 2023-06-04 15:31:42 -04:00
ThatOneCalculator 482c21d00e
chore: format 2023-06-04 12:02:34 -07:00
Kainoa Kanter 89330c5161 Merge pull request '[PR]: Add advanced MFM toggle' (#10254) from Freeplay/calckey:advanced-mfm into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10254
2023-06-04 18:59:56 +00:00
Talon 4a9e442abb Merge branch 'develop' into fix/more-accessibility 2023-06-04 12:41:40 +02:00
Freeplay 15b30231eb Allow clicking pfp in header of note page 2023-06-03 22:20:42 -04:00
Freeplay 5a3e14fa32 Forgot clip-path 2023-06-03 17:26:37 -04:00
Freeplay c80e106fb5 Advanced MFM toggle 2023-06-03 17:12:08 -04:00
Freeplay 28780772cb tweak 2023-06-03 13:43:08 -04:00
Freeplay 47a38969eb Highlight boost button if boosted! 2023-06-03 12:57:51 -04:00
Freeplay d780fea36a Merge branch 'develop' of https://codeberg.org/calckey/calckey into upstream/develop 2023-06-03 10:47:48 -04:00
Freeplay 9c424ee041 Fix blue highlight on post tap 2023-06-03 10:47:41 -04:00
TalonTheDragon 3d951c7f4b Merge branch 'develop' into fix/more-accessibility 2023-06-03 12:42:20 +02:00
ThatOneCalculator 02658fee0b
chore: ⬆️ up various deps 2023-06-03 00:41:30 -07:00
ThatOneCalculator 8b223bd5bf
Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-06-02 23:55:41 -07:00
ThatOneCalculator 99df1dcbd7
fix: summary if 1 attachment 2023-06-02 23:55:31 -07:00
Kainoa Kanter 89d5810e63 Merge pull request '[PR]: Switch position of Social and Recommended timelines' (#10239) from naskya/calckey:social-recommended-position-switch into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10239
2023-06-03 06:40:16 +00:00
ThatOneCalculator 2ec387de4a
regress: no metrics in dashboard for now 2023-06-02 23:38:05 -07:00
ThatOneCalculator 6956522694
perf: インスタンスデフォルトテーマを予めjson5 -> jsonに変換しておくことでjson5を初期バンドルに含めずに済むように
Co-authored-by: Syuilo <syuilotan@yahoo.co.jp>
2023-06-02 23:28:21 -07:00
naskya 0eb65d0f12
fix tutorial 2023-06-03 15:24:16 +09:00
ThatOneCalculator c1f699789b
chore: formatting 2023-06-02 23:21:06 -07:00
ThatOneCalculator 696c07b19a
fix: remove unessicary extra line in note menu 2023-06-02 23:20:34 -07:00
ThatOneCalculator f3bd82b074
refactor: ♻️ sync note summaries 2023-06-02 22:11:34 -07:00
ThatOneCalculator 14126de3d7
chore: formatting 2023-06-02 20:06:04 -07:00
ThatOneCalculator 44d77f60ef
Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-06-02 20:05:19 -07:00
mappi bf54fb70af
fix: vue-plyr audio tag
Co-authored-by: mappi <mappi-pr@github.com>
2023-06-02 20:05:02 -07:00
Freeplay 217b389a7b tweak 2023-06-02 22:57:04 -04:00
Freeplay bf21b84129 fix mfm-cheat-sheet styling 2023-06-02 22:54:23 -04:00
Freeplay 9ee51bc690 Merge branch 'develop' of https://codeberg.org/calckey/calckey into upstream/develop 2023-06-02 21:05:46 -04:00
Freeplay 389ca3f332 aria to acc menu button 2023-06-02 21:04:51 -04:00
ThatOneCalculator f8879650c6
Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-06-02 15:45:15 -07:00
ThatOneCalculator b0a04faaba
fix: ♻️ use locale for error
https://calckey.social/notes/9fippqiwhl287b5m
2023-06-02 15:45:05 -07:00
Freeplay 83d5415801 Merge branch 'develop' of https://codeberg.org/calckey/calckey into upstream/develop 2023-06-02 18:14:43 -04:00
Freeplay 903d12f18f fix gap 2023-06-02 18:14:39 -04:00
ThatOneCalculator 8e5a374ac7
chore: formatting 2023-06-02 14:53:28 -07:00
ThatOneCalculator 088ff4c251
Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-06-02 14:52:58 -07:00
ThatOneCalculator 4cbf73140c
fix: show message on error alert if text is null 2023-06-02 14:52:44 -07:00
Freeplay 6233883cd0 hide close button bottom fade for now 2023-06-02 17:23:09 -04:00
Freeplay d8d2ee266e Setup to also support steps 2023-06-02 15:39:33 -04:00
Freeplay c722cee101 Idk why I used ?? there 2023-06-02 15:06:57 -04:00
Freeplay 1efb167f8f Add delay & start adding cubic-bezier to mfm 2023-06-02 14:44:41 -04:00
Kainoa Kanter caa6408e03 Merge pull request '[PR]: Add an option to toggle opening post on click' (#10242) from Freeplay/calckey:note-click into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10242
2023-06-01 20:44:56 +00:00
ThatOneCalculator 35e72bfca7
chore: formatting 2023-06-01 11:55:13 -07:00
Freeplay c5cd624d82 Add expand on note click option 2023-05-31 23:52:05 -04:00
Freeplay 2515319c08 hide back button when not needed 2023-05-31 22:38:14 -04:00
Freeplay b0390a3fc0 Merge branch 'develop' of https://codeberg.org/calckey/calckey into upstream/develop 2023-05-31 22:10:49 -04:00
Freeplay 1548fc2f2a Fix #10219 2023-05-31 22:10:44 -04:00
Kainoa Kanter 001e31bfcd Merge pull request '[PR]: fix: import settings backup' (#10240) from naskya/calckey:fix/import-settings-backups into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10240
2023-06-01 00:35:15 +00:00
Freeplay c97c6fbe5b hide broken logged-out header link for now 2023-05-31 19:43:58 -04:00
Freeplay b9046573e1 fix 2023-05-31 19:35:02 -04:00
naskya 7b02b87ec6
format 2023-06-01 08:01:24 +09:00
naskya 151f5e355d
Fix exported settings being not importable 2023-06-01 07:55:59 +09:00
naskya 0a99366298
no change, but more comfortable 2023-06-01 07:29:54 +09:00
naskya 9d9047c33d
switch position of social and recommended 2023-06-01 07:24:49 +09:00
Freeplay 618042c3e3 lemme just update that 2023-05-31 17:59:03 -04:00
Freeplay f3bdce0636 Fix #10236 2023-05-31 17:02:58 -04:00
Freeplay 0663a67b86 fix 2023-05-31 16:41:31 -04:00
Freeplay 3443e5d649 button styling 2023-05-31 16:34:29 -04:00
Namekuji 8480ced256
remove empty form input 2023-05-31 01:14:13 -04:00
Namekuji b1d0b291ff
get array for alsoKnownAs 2023-05-31 01:02:22 -04:00
Freeplay 0aef4977b2 fix border w/ wallpaper 2023-05-30 10:15:18 -04:00
ThatOneCalculator c1f42d5bc1
Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-05-29 19:46:21 -07:00
ThatOneCalculator ce5d93c9df
Revert "refactor: add back old info display from mkv12"
This reverts commit c58692fa58.
2023-05-29 19:45:42 -07:00
Freeplay c6c3ec0bb6 Merge branch 'develop' of https://codeberg.org/calckey/calckey into upstream/develop 2023-05-29 22:41:09 -04:00
Freeplay 102d2bd6a8 swiper tweak 2023-05-29 22:40:53 -04:00
ThatOneCalculator c58692fa58
refactor: add back old info display from mkv12 2023-05-29 16:13:36 -07:00
ThatOneCalculator fd97dd7c18
Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-05-29 15:40:18 -07:00
ThatOneCalculator a5f3822456
margin 2023-05-29 15:40:02 -07:00
Freeplay 209fbf3759 Merge branch 'develop' of https://codeberg.org/calckey/calckey into upstream/develop 2023-05-29 18:29:55 -04:00
Freeplay 380f81dfba fix close button pos in compose box 2023-05-29 18:29:42 -04:00
ThatOneCalculator 28cdfc0b6f
fix query 2023-05-29 15:21:29 -07:00
ThatOneCalculator ea6fca97fd
feat: server metrics in admin overview 2023-05-29 15:10:25 -07:00
ThatOneCalculator a87fc03b92
style: 💄 server metrics widgets 2023-05-29 15:10:14 -07:00
ThatOneCalculator 4a05f0c876
refactor: ⚰️ remove old metrics view 2023-05-29 13:49:38 -07:00
ThatOneCalculator 7969fe3dd1
chore: formatting 2023-05-29 13:17:42 -07:00
ThatOneCalculator c3bc85e141
fix: server info widget images 2023-05-29 13:16:41 -07:00
ThatOneCalculator d6eee26e49
add tooltip to meili pie chart 2023-05-29 13:03:47 -07:00
ThatOneCalculator 908e7e20cb
remove repetitive errors in groups 2023-05-29 12:52:43 -07:00
ThatOneCalculator c075455bc2
dev33 2023-05-29 12:28:58 -07:00
Freeplay d9211926bc forgot to give aria to close button o o p s 2023-05-29 15:19:53 -04:00
Kainoa Kanter ba30a9a55b Merge pull request 'Add hints for clips, antennas, lists, and timelines' (#10226) from Freeplay/calckey:hints into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10226
2023-05-29 19:16:56 +00:00
ThatOneCalculator b0c2f1d99f
locales 2023-05-29 12:16:35 -07:00
Freeplay d232ba2aff Add lists hint 2023-05-29 15:08:33 -04:00
Freeplay 4bead341a1 closeable prop 2023-05-29 14:55:00 -04:00
Freeplay 7527351620 Add timeline hints 2023-05-29 14:51:02 -04:00
ThatOneCalculator 8dd99a2d1d
formatting 2023-05-29 10:19:13 -07:00
ThatOneCalculator 41c80b693d
fixes 2023-05-29 10:18:12 -07:00
Freeplay 020b212b10 always show antennas hint at top 2023-05-29 13:10:35 -04:00
ThatOneCalculator 7476ebc7a2
chore: format 2023-05-29 10:01:34 -07:00
Freeplay 6d66bee740 Merge branch 'develop' of https://codeberg.org/calckey/calckey into hints 2023-05-29 12:47:15 -04:00
ThatOneCalculator d7d5915e3b
dev31 2023-05-29 09:32:55 -07:00
ThatOneCalculator 655cf3dc27
chore: format 2023-05-29 09:31:02 -07:00
Freeplay 69852b8a05 Move follow button + always show label 2023-05-29 09:40:00 -04:00
Freeplay ee08e1bdda Add clips, antennas hint 2023-05-29 09:11:42 -04:00
ThatOneCalculator a717ef6923
properly calculate percent 2023-05-28 21:10:21 -07:00
ThatOneCalculator d7e906bcf7
fix 2023-05-28 20:59:36 -07:00
ThatOneCalculator 7f81268f07
fix 2023-05-28 20:47:22 -07:00
ThatOneCalculator 9be629919a
add pie chart to meili stats 2023-05-28 20:37:53 -07:00
ThatOneCalculator 2cf1d9f630
chore: formatting 2023-05-28 20:34:18 -07:00
Kainoa Kanter 5c56487802 Merge pull request 'MeiliSearch Integration' (#10204) from PrivateGER/calckey:feat/meilisearch-integration into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10204
2023-05-29 03:31:38 +00:00
ThatOneCalculator 544e3a008e
feat: server info widget
Co-authored-by: Syuilo <syuilotan@yahoo.co.jp>
2023-05-28 20:14:08 -07:00
Freeplay eeb4a41d6c add channel federation warn 2023-05-28 20:31:00 -04:00
Freeplay 56359f0c2d fix: move isRenote check to note.vue 2023-05-28 20:20:53 -04:00
TalonTheDragon 7c2876894a Merge branch 'more-accessibility' into fix/more-accessibility 2023-05-29 01:49:44 +02:00
TalonTheDragon 91e5389f86 Add labels to dialog OK and Close buttons 2023-05-29 01:48:24 +02:00
Free 3acf8de621 revert 18156487d9
revert fix: move isRenote check to note.vue
2023-05-28 23:17:10 +00:00
Freeplay 18156487d9 fix: move isRenote check to note.vue 2023-05-28 19:14:01 -04:00
Kainoa Kanter 5475b6ed44 Merge pull request 'New media list layout + hide controls when player too small' (#10213) from Freeplay/calckey:notes into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10213
2023-05-28 21:24:45 +00:00
Freeplay cae7c6b3ca fix position 2023-05-28 16:21:00 -04:00
Freeplay b15d84451d fix 2023-05-28 15:25:57 -04:00
Freeplay a55271b96b fix 2023-05-28 14:35:05 -04:00
Freeplay cb164d0f0a Hide video controls if player too small 2023-05-28 13:57:25 -04:00
ikiko b22e0f495e Merge branch 'develop' into feat-mfm-crop 2023-05-28 17:33:23 +00:00
Isabell 19c9f5af68 fix: MFM crop percentage parsing 2023-05-29 03:31:06 +10:00
Kainoa Kanter d2a77c9964 Merge pull request 'Feat: add MFM crop content' (#10211) from ikiko/calckey:feat-mfm-crop into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10211
2023-05-28 16:34:18 +00:00
Kainoa Kanter 12f316a8e0 Merge pull request 'Use ph-lock for followers-only visibility' (#10210) from naskya/calckey:ph-lock into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10210
2023-05-28 16:31:29 +00:00
Freeplay d8810600bf tweak 2023-05-28 10:53:45 -04:00
Isabell e208a96e31 add ability to crop content 2023-05-28 15:19:57 +10:00
Freeplay 01de9c0a3b Add bottom fade to show less & hide buttons 2023-05-28 00:17:23 -04:00
Freeplay 8ef68f559c new media list layout 2023-05-27 23:24:38 -04:00
PrivateGER 57577ddedb use correct stats property 2023-05-28 03:05:32 +02:00
PrivateGER 4fdf331f63 Fix Meilisearch widget reactivity 2023-05-28 02:58:20 +02:00
PrivateGER 9beda9d362 add advanced search parameters in search popup 2023-05-28 00:27:16 +00:00
PrivateGER 5dd106e956 i18n strings 2023-05-28 00:27:16 +00:00
PrivateGER 8790ac4a11 Remove stray newline 2023-05-28 00:27:16 +00:00
PrivateGER 274bfcd898 Lint + formatting 2023-05-28 00:27:16 +00:00
PrivateGER 8d08bf3ee4 Add search operators to frontend 2023-05-28 00:27:16 +00:00
PrivateGER c7c21f5c16 remove extra header 2023-05-28 00:27:16 +00:00
PrivateGER c35a640bb1 Fix property names 2023-05-28 00:27:16 +00:00
PrivateGER a33b548555 Add Meilisearch widget 2023-05-28 00:27:16 +00:00
Freeplay 9b0b8a4180 fix 2023-05-27 18:38:27 -04:00
naskya bfe2de8dea
use ph-lock for followers visibility 2023-05-28 03:10:15 +09:00
Freeplay 73d31ec332 Fix hide button being not clickable 2023-05-27 11:00:10 -04:00
TalonTheDragon be6c41d0c5 Add labels to chat form 2023-05-26 23:43:35 +02:00
TalonTheDragon 371794fb34 Do the same for the typing list 2023-05-26 23:38:38 +02:00
TalonTheDragon 36fbd0e419 Add aria live region to message list so they get read automatically as they come in 2023-05-26 23:30:27 +02:00
Freeplay 7609ac4d88 maybe fix blurry text in swiper ? 2023-05-26 17:02:17 -04:00
Freeplay a3f3ccf514 fix font size 2023-05-26 09:13:13 -04:00
ThatOneCalculator 870765684a
locale 2023-05-25 22:24:46 -07:00
ThatOneCalculator 5ecb7815ff
Revert "chore: rebase to v13 MkFolder"
This reverts commit 8783cf0adf.
2023-05-25 22:17:19 -07:00
ThatOneCalculator afa15e17ef
refactor: make post imports an experiment 2023-05-25 22:05:43 -07:00
ThatOneCalculator 8783cf0adf
chore: rebase to v13 MkFolder
Co-authored-by: Syuilo <syuilotan@yahoo.co.jp>
2023-05-25 21:46:45 -07:00
ThatOneCalculator e1462133f6
chore: format 2023-05-25 20:42:14 -07:00
Kainoa Kanter f9074ad771 Merge pull request 'fix: weird styling of reaction counts' (#10203) from naskya/calckey:fix/no-emoji-reaction-count-styling into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10203
2023-05-26 03:33:39 +00:00
naskya 0f40c2ea25
fix style 2023-05-26 12:28:31 +09:00
Kainoa Kanter 29e512af4d Merge pull request 'Fix reply and quote icons' (#10202) from Freeplay/calckey:notes into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10202
2023-05-26 03:16:52 +00:00
ThatOneCalculator 406901236b
fix: 💄 margin on expand tweet button 2023-05-25 20:05:19 -07:00
Freeplay d373e7be25 Fix reply and quote icons
past me was really dumb wth
2023-05-25 22:51:55 -04:00
ThatOneCalculator 911704d6a8
chore: formatting 2023-05-25 19:47:10 -07:00
Freeplay a534ec5565 fix z-index 2023-05-25 21:27:51 -04:00
Freeplay 5d224bf1c6 make consistent 2023-05-25 19:42:42 -04:00
Freeplay 9c7af415ae apply properties to all swipers 2023-05-25 19:40:47 -04:00
Freeplay 30beffab78 Only load timeline in active slide 2023-05-25 19:32:56 -04:00
Kainoa Kanter 6383babe04 Merge pull request 'Fix polls & own reactions not showing in replies' (#10199) from Freeplay/calckey:notes into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10199
2023-05-25 20:50:57 +00:00
Freeplay c683ee304e tweak 2023-05-25 16:24:31 -04:00
Freeplay b5ffb5af8d fix z-index 2023-05-25 15:50:14 -04:00
Kainoa Kanter 991788dcce Merge pull request 'Display author's replies first, fixes, other stuff' (#10194) from Freeplay/calckey:notes into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10194
2023-05-25 03:51:34 +00:00
Freeplay 2375d2a8a6 hide follow-button label on mobile 2023-05-24 21:41:28 -04:00
Freeplay a9a1c22605 a 2023-05-24 21:33:49 -04:00
Freeplay b70139f2bb little refactor 2023-05-24 19:33:59 -04:00
Freeplay 54777fc12f Display replies by same author first 2023-05-24 17:40:16 -04:00
Essem af3f36f063
Hide security key section if TOTP is disabled
This should prevent some unintended behavior (and 500 errors) for now.
2023-05-24 14:43:22 -05:00
Freeplay b531145270 Add 'View on remote server' to right click menu 2023-05-24 14:00:18 -04:00
Freeplay 7b86c7087d Fix 'noteOf' text in post title 2023-05-24 13:22:53 -04:00
Freeplay 34f33e6bb5 Fix truncated text in header 2023-05-24 12:27:12 -04:00
Freeplay 3d6c480334 overflow hidden to clip 2023-05-23 22:09:24 -04:00
Freeplay 2c87697492 fix 2023-05-23 21:48:54 -04:00
Freeplay 7f76143273 Change note right click menu to link context menu 2023-05-23 21:33:18 -04:00
ThatOneCalculator e8ab73562b
make tosUrl open action in case it's external 2023-05-23 18:23:06 -07:00
ThatOneCalculator 48385d7a8f
feat: 👔 add link to TOS in info icon
Address #10117
2023-05-23 18:16:54 -07:00
ThatOneCalculator 3d5b0c5d83
chore: formatting 2023-05-23 18:02:52 -07:00
ThatOneCalculator 41bfbf7df1
Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-05-23 18:01:50 -07:00
ThatOneCalculator e615ff5ebd
Merge branches 'develop' and 'develop' of codeberg.org:calckey/calckey into develop 2023-05-23 18:00:10 -07:00
ThatOneCalculator 983c860bd0
webhooks icon 2023-05-23 17:59:58 -07:00
Freeplay e135f15832 hide scrollbar in header 2023-05-23 20:54:28 -04:00
Freeplay 6e1d5f366d fix 2023-05-23 20:49:56 -04:00
Freeplay cab146fb96 Fix z-index, better clipping in notes 2023-05-23 20:30:55 -04:00
Freeplay e04562cdc8 Fix tabs not transitioning on first click 2023-05-23 13:56:29 -04:00
Kainoa Kanter dae9bd43d4 Merge pull request 'Add some labels to & truncate notifications' (#10181) from Freeplay/calckey:notifications into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10181
2023-05-23 05:33:54 +00:00
ThatOneCalculator d8aaa8f199
fix edit icon 2023-05-22 18:42:47 -07:00
Freeplay 8fe2aca14e Match notification padding to note's padding 2023-05-22 21:26:52 -04:00
Freeplay 05ce3e7039 fix rogue :global() (would prevent text in toggles from wrapping) 2023-05-22 21:16:55 -04:00
Freeplay 3a92e77c6c Merge branch 'develop' of https://codeberg.org/calckey/calckey into notifications 2023-05-22 21:12:11 -04:00
Freeplay d85067fad5 Add labels to some & truncate notifications 2023-05-22 21:11:35 -04:00
Natty 1773ae14e3
Renote button optimization 2023-05-22 17:54:44 -07:00
ThatOneCalculator 28750dddc8
why was that ever there?? 2023-05-22 17:36:19 -07:00
ThatOneCalculator b5eb374e62
fix fade 2023-05-22 17:26:27 -07:00
ThatOneCalculator 79fe1dcd61
chore: formatting 2023-05-22 17:00:50 -07:00
ThatOneCalculator 2a87323242
Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-05-22 16:59:48 -07:00
ThatOneCalculator 549802e5fa
Close #10177 2023-05-22 16:59:38 -07:00