Madeorsk/rudeshark.net
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
24,920 Commits 2 Branches 0 Tags 376 MiB
27965f708d
Commit Graph

4061 Commits

Author SHA1 Message Date
Kainoa Kanter
f1e8099c48 Merge pull request '[PR]: Fix docker' (#10259) from nmkj/calckey:fix-docker into develop 
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10259
 2023-06-04 21:48:39 +00:00
ThatOneCalculator
6a7e950f21
chore: formatting 2023-06-04 14:42:22 -07:00
ThatOneCalculator
acc3b672bc
Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-06-04 14:41:30 -07:00
ThatOneCalculator
535fa9f506
fix: 🐛 prevent null date insertion 
https://calckey.aokaga.work/notes/9f6ksv2oov
 2023-06-04 14:41:18 -07:00
Namekuji
9a9c3d4c62
add rust to the runtime container for migrations 2023-06-04 16:29:24 -04: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
dbe00078a3
refactor: remove mk remnants 2023-06-02 23:30:51 -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
f2a1d5643b
Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-06-02 23:20:46 -07:00
ThatOneCalculator
696c07b19a
fix: remove unessicary extra line in note menu 2023-06-02 23:20:34 -07:00
Kainoa Kanter
d81af5e991 Merge pull request '[PR]: feat: rust backend model and utilities' (#10250) from nmkj/calckey:native-model into develop 
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10250
 2023-06-03 06:00:46 +00:00
ThatOneCalculator
f3bd82b074
refactor: ♻️ sync note summaries 2023-06-02 22:11:34 -07:00
ThatOneCalculator
7ea4c39fb7
refactor: ♻️ ssr views 
Correct og:type for users, format docs, deprecate _info_card_
 2023-06-02 21:45:11 -07:00
Namekuji
382b009ffd
add cargo test script 2023-06-03 00:40:51 -04:00
Namekuji
15f8a4cbba
cargo formats all modules 2023-06-03 00:37:10 -04:00
Namekuji
d7f80edbea
call seaorm migrations after typeorm 2023-06-03 00:27:00 -04:00
Namekuji
afe4c76392
fix migration 2023-06-02 23:48:28 -04:00
Namekuji
d3d30bbbc2
add integration test of antenna 2023-06-02 23:48:28 -04:00
Namekuji
874b0a2c69
add unit test 2023-06-02 23:48:27 -04:00
Namekuji
7cf2b39cde
fix unit tests 2023-06-02 23:48:27 -04:00
Namekuji
c443a5601c
add format script 2023-06-02 23:48:27 -04:00
Namekuji
0224824a36
fix native import 2023-06-02 23:48:26 -04:00
Namekuji
10072d6e4d
remove node cuid2 2023-06-02 23:48:26 -04:00
Namekuji
ba578c8701
initialize native database on boot 2023-06-02 23:48:25 -04:00
Namekuji
8bb87f9ea4
use native generators 2023-06-02 23:48:25 -04:00
Namekuji
55118df538
add test 2023-06-02 23:48:25 -04:00
Namekuji
a10ade8cf5
fix unit test 2023-06-02 23:48:24 -04:00
Namekuji
752d63e6de
add native calls 2023-06-02 23:48:24 -04:00
Namekuji
e932d6effa
use schema in native-utils 2023-06-02 23:48:24 -04:00
Namekuji
5e9dce3e8c
adjust module structure 2023-06-02 23:48:23 -04:00
Namekuji
148dbbe56d
move files out from crate 2023-06-02 23:48:23 -04:00
Namekuji
403e95b673
fix unit test 2023-06-02 23:48:22 -04:00
Namekuji
e51deb3794
add napi schema 2023-06-02 23:48:22 -04:00
Namekuji
d0734ef4c9
add pack_by_id 2023-06-02 23:48:22 -04:00
Namekuji
c9f31aef9b
add default values 2023-06-02 23:48:21 -04:00
Namekuji
3eb87c8f04
rename feature 2023-06-02 23:48:21 -04:00
Namekuji
193c75a2bb
skip empty array 2023-06-02 23:48:21 -04:00
Namekuji
d9d2673939
use thread to copy data 2023-06-02 23:48:20 -04:00
Namekuji
3010ac9e74
use iden enum 2023-06-02 23:48:20 -04:00
Namekuji
d28f74b513
fix primary key specifier 2023-06-02 23:48:20 -04:00
Namekuji
98f2397fbb
add migration to convert array to jsonb 2023-06-02 23:48:19 -04:00
Namekuji
745384ff58
use vec newtype 2023-06-02 23:48:19 -04:00
Namekuji
6178593e22
make sqlite compat 2023-06-02 23:48:19 -04:00
Namekuji
354ece6432
add abstraction of string array type 2023-06-02 23:48:18 -04:00
Namekuji
0bd5893e7d
fix varchar array 2023-06-02 23:48:18 -04:00
Namekuji
1455068e0c
add newtype 2023-06-02 23:48:18 -04:00
Namekuji
76e5e31411
todo unread note check 2023-06-02 23:48:17 -04:00
Namekuji
6698c00f78
rename test modules 2023-06-02 23:48:17 -04:00
Namekuji
6bbfe1a6b4
add tests 2023-06-02 23:48:17 -04:00
Namekuji
4012d38f7f
add integration test in model 2023-06-02 23:48:16 -04:00
Namekuji
737ccfe11c
remove mock database 2023-06-02 23:48:16 -04:00
Namekuji
f1f3e5976d
add random string generator 2023-06-02 23:48:15 -04:00
Namekuji
6bb8775b2e
change aid to cuid2 2023-06-02 23:48:15 -04:00
Namekuji
eda1e7ab3b
fix features 2023-06-02 23:48:15 -04:00
Namekuji
00ba8a2804
return mock db when mock feature is enabled 2023-06-02 23:48:14 -04:00
Namekuji
2f9a6859f1
add utility crate 2023-06-02 23:48:14 -04:00
Namekuji
535eb3540b
add mock database 2023-06-02 23:48:14 -04:00
Namekuji
d453eaf4ae
remove unused feature 2023-06-02 23:48:13 -04:00
Namekuji
81ba464f1b
format 2023-06-02 23:48:13 -04:00
Namekuji
9220aa3e4c
remove unused serde 2023-06-02 23:48:13 -04:00
Namekuji
bc0e0b14d0
add repository trait 2023-06-02 23:48:12 -04:00
Namekuji
4e82dab1eb
add entities and two schemas 2023-06-02 23:48:07 -04: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
Kainoa Kanter
e3b337e115 Merge pull request 'Add raw zip emoji imports' (#10246) from PrivateGER/calckey:fix/no-metadata-emoji-import into develop 
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10246
 2023-06-01 20:43:57 +00:00
PrivateGER
7eeac4810a formatter 2023-06-01 21:38:37 +02:00
PrivateGER
9be58ba0b4 missing inversion + use proper emoji path 2023-06-01 21:30:23 +02:00
PrivateGER
d409c31ad5 me when I lack a brain 2023-06-01 21:12:03 +02:00
PrivateGER
f508a358b1 more logging 2023-06-01 21:01:15 +02:00
ThatOneCalculator
35e72bfca7
chore: formatting 2023-06-01 11:55:13 -07:00
PrivateGER
4d2eaa645b Import emojis without meta.json 2023-06-01 20:53:13 +02: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
Kainoa Kanter
38b92b7aee Merge pull request '[PR]: enhance: multiple alsoKnownAs' (#10232) from nmkj/calckey:more-aka into develop 
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10232
 2023-05-31 19:10:25 +00:00
Kainoa Kanter
831abc22d0 Merge pull request 'Less WS logging + use logger for meilisearch' (#10234) from PrivateGER/calckey:fix/remove-console-logs into develop 
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10234
 2023-05-31 19:08:36 +00:00
ThatOneCalculator
88892d886e
Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-05-31 12:06:34 -07:00
ThatOneCalculator
0291579e2f
chore: ⬆️ up bull 2023-05-31 12:06:26 -07:00
PrivateGER
23f551884f Less logging of every single WS message + use logger in Meilisearch 2023-05-31 12:08:21 +02:00
Namekuji
8480ced256
remove empty form input 2023-05-31 01:14:13 -04:00
Namekuji
c321a6ee39
use parse instead 2023-05-31 01:02:41 -04:00
Namekuji
b1d0b291ff
get array for alsoKnownAs 2023-05-31 01:02:22 -04:00
PrivateGER
b10337c858 Add english and japanese stop words to Meili database 2023-05-30 23:11:10 +02: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
15d311c513
fix 2023-05-29 19:34:32 -07:00
ThatOneCalculator
2c42707551
up redis deps 2023-05-29 19:32:33 -07:00
ThatOneCalculator
da8ed09932
chore: up bull-board deps 2023-05-29 19:30:20 -07: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
PrivateGER
33ef39cd4a formatter 2023-05-29 20:09:52 +02:00
PrivateGER
0524789185 Make Meilisearch optional and don't connect if unconfigured 2023-05-29 19:46:38 +02: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
ThatOneCalculator
b15f001b31
Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-05-29 10:00:25 -07:00
ThatOneCalculator
316a09409c
revert #10222 2023-05-29 10:00:16 -07:00
Freeplay
6d66bee740 Merge branch 'develop' of https://codeberg.org/calckey/calckey into hints 2023-05-29 12:47:15 -04:00
Kainoa Kanter
8d81e4f5ee Merge pull request 'Delete deleted posts from Meilisearch' (#10223) from PrivateGER/calckey:feat/delete-posts-from-meili into develop 
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10223
 2023-05-29 16:42:57 +00:00
PrivateGER
73bf8eddc7 Delete deleted posts from Meilisearch 2023-05-29 18:33:57 +02:00
ThatOneCalculator
d7d5915e3b
dev31 2023-05-29 09:32:55 -07:00
ThatOneCalculator
655cf3dc27
chore: format 2023-05-29 09:31:02 -07:00
PrivateGER
e52b1330d3 Only connect to Meili with valid config 2023-05-29 17:36:03 +02: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
Kainoa Kanter
fca3c6f85e Merge pull request 'fix: deprecate AID and enforce Cuid2' (#10216) from nmkj/calckey:deprecate-aid into develop 
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/10216
 2023-05-29 04:12:15 +00:00
ThatOneCalculator
a717ef6923
properly calculate percent 2023-05-28 21:10:21 -07:00
ThatOneCalculator
9063f93fb2
chore: 💡 meili 2023-05-28 21:04:54 -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
Namekuji
98f9e3e5c4
use cuid2 with timestamp 2023-05-28 22:16:42 -04: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