Madeorsk/rudeshark.net
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,491 Commits 2 Branches 0 Tags 376 MiB
8033492c7c
Commit Graph

3093 Commits

Author SHA1 Message Date
cutestnekoaqua
450f798f12
why is this git ignored? 2023-03-29 00:09:31 +02:00
cutestnekoaqua
99b471d43b
why is this git ignored? 2023-03-28 23:48:27 +02:00
cutestnekoaqua
d5c80e74de
feat: experimental post import 2023-03-28 23:33:16 +02:00
Kagami Sascha Rosylight
7acb2b7c09
fix: allow announces with followers visibility 2023-03-29 04:55:16 +09:00
naskya
492a81104a
Try to fix calckey/calckey#9770 2023-03-28 03:59:07 +09:00
Free
83c7dd177b note-improvements (#9768) 
Fixes #9745, quote icon, note spacing adjustments, border radius's in noGap

Co-authored-by: Freeplay <Freeplay@duck.com>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9768
Co-authored-by: Free <freeplay@duck.com>
Co-committed-by: Free <freeplay@duck.com>
 2023-03-26 03:33:44 +00:00
cutestnekoaqua
1278200ae7
[PATCH] set workers to reduce their processing priority 
Authored-by: Kaitlyn Allan <kaitlyn.allan@enlabs.cloud>
 2023-03-25 12:35:30 +01:00
ThatOneCalculator
5b575c67ed
fix? 2023-03-24 13:14:41 -07:00
ThatOneCalculator
8acf3833fa
Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-03-24 12:45:32 -07:00
ThatOneCalculator
35bf174273
dev15 2023-03-24 12:45:25 -07:00
Namekuji
86e5a19971 fix callback url 2023-03-24 06:55:23 -04:00
ThatOneCalculator
765c61bf52
don't show buttons if mobile 2023-03-24 00:42:36 -07:00
ThatOneCalculator
a1efc980d4
fix 2023-03-24 00:34:13 -07:00
ThatOneCalculator
9ca00d73b5
fix 2023-03-24 00:04:00 -07:00
ThatOneCalculator
25d44f500b
console log 2023-03-23 23:59:42 -07:00
ThatOneCalculator
b7a5799698
feat: new chat button on mobile 2023-03-23 23:51:59 -07:00
ThatOneCalculator
434e2f24e9
feat: ✨ post metadata uses full @ 
Closes #9660
 2023-03-23 18:03:50 -07:00
ThatOneCalculator
765d90b789
chore: 📦 upgrade megalodon 2023-03-23 16:20:21 -07:00
ThatOneCalculator
f80dcca6d5
feat: masto api add display name 2023-03-23 16:16:27 -07:00
ThatOneCalculator
94640486c5
Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-03-23 09:07:25 -07:00
ThatOneCalculator
d5cafde7d1
Revert "refactor: nyaize on the frontend" 
This reverts commit aff90b3ef2.
 2023-03-23 09:06:32 -07:00
yawhn
df68d5ffff feat: swap home timeline with social's functionality (#9597) 
The Home timeline functionality is swapped with social's. Meaning that Home timeline now consists of followee's and local posts. Social from now on will contain only followee's posts. See more info in the attached ticket.

Some changes applied in english locales as well. Probably the rest of the languages need to be fixed though.

This PR closes the ticket: https://codeberg.org/calckey/calckey/issues/9552

Co-authored-by: yawhn <kordaris@gmail.com>
Co-authored-by: ThatOneCalculator <kainoa@t1c.dev>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9597
Co-authored-by: yawhn <yawhn@noreply.codeberg.org>
Co-committed-by: yawhn <yawhn@noreply.codeberg.org>
 2023-03-23 16:02:37 +00:00
amy bones
c5de597079
fix: relay signature handling 
A change sometime ago moved to setting some signature fields in the incoming
object to undefined as opposed to deleting them. The trouble is that downstream
code checks against existence, not undefinedness and rejects the message.

Resolves: #9665
 2023-03-22 17:32:49 -07:00
ThatOneCalculator
d05ab9bf46
fix color in follow button 2023-03-22 14:29:07 -07:00
ThatOneCalculator
18eed9607b
Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-03-22 12:24:45 -07:00
yawhn
25c72943c7
fix: a bug in ads 2023-03-22 12:24:37 -07:00
Kainoa Kanter
8243b635f4 Merge pull request 'fix: max user profile length to db field length' (#9750) from amybones/calckey:fix-profile-length into develop 
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9750
 2023-03-22 18:58:32 +00:00
ThatOneCalculator
3a412b955d
fix: 🐛 no nyaizing undefined text 
Closes #9752
 2023-03-22 11:54:38 -07:00
Free
4b1af35b39 Allows ctrl+clicking internal links (#9603) (#9743) 
Co-authored-by: Freeplay <Freeplay@duck.com>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9743
Co-authored-by: Free <freeplay@duck.com>
Co-committed-by: Free <freeplay@duck.com>
 2023-03-22 18:50:30 +00:00
cutestnekoaqua
4714e966f1
Masto api :) 2023-03-22 17:43:05 +01:00
cutestnekoaqua
30bc16daba
allow client credentials not just for tapbots 2023-03-22 14:40:59 +01:00
amy bones
1f840aa7b9
fix: max user profile length to db field length 
Resolves: #9749
 2023-03-22 02:10:43 -07:00
Free
bcd0488cf1 note-improvements (#9742) 
Increases the limit of the replies loaded above the focused post from 10 to 30

Co-authored-by: Freeplay <Freeplay@duck.com>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9742
Co-authored-by: Free <freeplay@duck.com>
Co-committed-by: Free <freeplay@duck.com>
 2023-03-21 04:41:50 +00:00
naskya
49d3df43d3
fix: local time for users 2023-03-21 08:24:02 +09:00
Free
74bb79792d note-improvements (#9739) 
fixes #9735, translations, plus other tweaks

Co-authored-by: Freeplay <Freeplay@duck.com>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9739
Co-authored-by: Free <freeplay@duck.com>
Co-committed-by: Free <freeplay@duck.com>
 2023-03-20 20:26:05 +00:00
ThatOneCalculator
14201f465b
typo 2023-03-19 20:19:40 -07:00
ThatOneCalculator
4ce8e83d3e
fix: make sure cw button is on new line 2023-03-19 20:15:49 -07:00
ThatOneCalculator
43bca8ed38
validate blank messages on backend 2023-03-19 20:03:49 -07:00
ThatOneCalculator
4c4c641804
fix: 🐛 can't send blank messages 
Closes #9661
 2023-03-19 20:02:14 -07:00
ThatOneCalculator
2de02cf655
Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-03-19 19:59:36 -07:00
ThatOneCalculator
aff90b3ef2
refactor: nyaize on the frontend 2023-03-19 19:59:00 -07:00
Free
c2df136dda note-improvements (#9734) 
Not sure if this is the best way to jump to the post

This also lets you select text w/out clicking to the post (and clicking normally on top of the text opens the post)

Co-authored-by: Freeplay <Freeplay@duck.com>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9734
Co-authored-by: Free <freeplay@duck.com>
Co-committed-by: Free <freeplay@duck.com>
 2023-03-20 02:31:02 +00:00
ThatOneCalculator
d75a4e56e3
change follow button background, finally 2023-03-19 19:30:08 -07:00
ThatOneCalculator
b18864946a
theme names 2023-03-19 18:49:25 -07:00
ThatOneCalculator
710a89d343
feat: ✨ more themes! 2023-03-19 18:44:08 -07:00
ThatOneCalculator
28c1419612
generic color for online user count 2023-03-19 16:58:54 -07:00
ThatOneCalculator
f73ff912f1
fix: repo url 2023-03-19 16:53:49 -07:00
cutestnekoaqua
16ef00b6fe
chore: add emoji aliases 2023-03-20 00:37:49 +01:00
cutestnekoaqua
d81bfd30ef
Revert "fix: unicode aliases" 
This reverts commit 989b497588.
 2023-03-20 00:30:05 +01:00
cutestnekoaqua
989b497588
fix: unicode aliases 2023-03-20 00:24:33 +01:00
Kainoa Kanter
60a5c4012c Merge pull request 'bug: Fix error saving drive file caption > 512 chars' (#9729) from supakaity/hajkey:hk/fix-9728 into develop 
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9729
 2023-03-19 21:54:38 +00:00
kakkokari-gtyih
27fedf9d6e
fix: don't show smartphone UI when settings icon is double-clicked 2023-03-19 21:43:07 +09:00
Kaitlyn Allan
1b134467ed Fix error saving drive file caption > 512 chars 2023-03-19 20:06:24 +10:00
ThatOneCalculator
749117a2ce
cli images 2023-03-19 02:33:44 -07:00
ThatOneCalculator
0fa22b8598
fix cli more 2023-03-19 02:08:08 -07:00
ThatOneCalculator
2dcf88b732
feat: spruce up CLI 2023-03-19 01:59:33 -07:00
Kaity A
706b4ae602 Add sonic full-text search support (#9714) 
This pull request adds support for the [sonic](https://github.com/valeriansaliou/sonic) full text indexing server into Calckey.

In addition to this, a stateful endpoint has been added that will completely (re-)index all notes into any (elasticsearch and/or sonic) indexing server defined in your config at `/api/admin/search/index-all`. It can (optionally) take input data to define the starting point, such as:

```
{"cursor": "9beg3lx6ad"}
```

Currently if both sonic and elasticsearch are defined in the config, sonic will take precedence for searching, but both indexes will continue to be updated for new note creations. Future enhancements may include the ability to choose which indexer to use (or combine multiple).

Co-authored-by: Kaitlyn Allan <kaitlyn.allan@enlabs.cloud>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9714
Co-authored-by: Kaity A <supakaity@noreply.codeberg.org>
Co-committed-by: Kaity A <supakaity@noreply.codeberg.org>
 2023-03-19 08:26:47 +00:00
ThatOneCalculator
77912ae7b5
Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-03-19 00:26:32 -07:00
ThatOneCalculator
76935a91e1
feat: compile time compression 2023-03-19 00:26:26 -07:00
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
c5d9f3bf59
Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-03-19 00:14:08 -07:00
ThatOneCalculator
2117977d88
fix: when count is actually 0 2023-03-19 00:13:30 -07:00
Free
b2bc51a4ee note-improvements (#9721) 
boop

Co-authored-by: Freeplay <Freeplay@duck.com>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9721
Co-authored-by: Free <freeplay@duck.com>
Co-committed-by: Free <freeplay@duck.com>
 2023-03-19 07:13:02 +00:00
ThatOneCalculator
681cefcda5
Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-03-19 00:12:33 -07:00
ThatOneCalculator
2ea458e2db
fix: mobile button alignment 2023-03-19 00:12:24 -07:00
Kainoa Kanter
dbe45e1838 Merge pull request 'Don't show channel edit button unless owner' (#9722) from supakaity/hajkey:hk-channel-owner-edit into develop 
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9722
 2023-03-18 23:11:47 +00: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
Kaitlyn Allan
53d482d209 Don't show channel edit button unless owner 2023-03-18 18:27:56 +10:00
Free
9e1fdeaf39 note-improvements (#9720) 
Co-authored-by: Free <freeplay@duck.com>
Co-committed-by: Free <freeplay@duck.com>
 2023-03-18 00:44:00 +00:00
ThatOneCalculator
3066d6079a
Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-03-17 09:31:47 -07:00
ThatOneCalculator
d3d21aa8ea
fix: send button 2023-03-17 09:31:39 -07: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
Cleo
177f36a2f2 Merging 'New thread view + other post improvements' (#9648) from Freeplay/calckey:note-improvements courtesy Freeplay 
Signed-of-by: Cleo John <waterdev@galaxycrow.de>
 2023-03-17 13:48:09 +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
ThatOneCalculator
4c263cfbcc
better border color 2023-03-16 15:37:49 -07:00
Freeplay
bca45c5868 fix deck view margins 2023-03-15 22:29:48 -04:00
Freeplay
f79ac3d361 Change reply icon (also align the icon in the posting form) 2023-03-15 21:24:12 -04:00
Freeplay
1be55c9685 *actually* fix the line alignment 2023-03-15 20:26:13 -04:00
Freeplay
4b391424ae fix line alignment in smaller windows 2023-03-15 19:53:22 -04:00
Freeplay
4cabd725a0 fix line in boosted text 2023-03-15 19:18:26 -04:00
Freeplay
b7b853f970 fix footer icons 2023-03-15 18:58:35 -04:00
Freeplay
23727bae92 Merge branch 'develop' of https://codeberg.org/calckey/calckey into note-improvements 2023-03-15 18:40:21 -04: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
fruye
0e2a5b3093 fix: Isolate unicode characters in display names (#9702) 
This fixes a 'Follows you' badge on a profile page and account addresses in threads from being drawn backwards when an account has some special Unicode characters that change the direction of text in their name (i.e. U+202E RIGHT-TO-LEFT OVERRIDE).

Co-authored-by: fruye <fruye@unix.dog>
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9702
Co-authored-by: fruye <fruye@noreply.codeberg.org>
Co-committed-by: fruye <fruye@noreply.codeberg.org>
 2023-03-15 07:18:18 +00:00
ThatOneCalculator
86db886199
fix: mona is free 2023-03-14 16:23:40 -07:00
ThatOneCalculator
3a13c5ea59
Merge branch 'develop' of codeberg.org:calckey/calckey into develop 2023-03-14 16:21:01 -07:00
ThatOneCalculator
e25e36d3eb
apps: mona 2023-03-14 16:20:46 -07:00
Cleo John
111bf8b77d webhook mastodon fixes 2023-03-14 17:18:30 +01:00
Kainoa Kanter
8d50cb2391 Further Masto API work, focus on Ivory compatibility (#9703) 2023-03-13 07:25:17 +00:00
Luna
e198a34cd0 Small fix to Masto ID conversion code 2023-03-13 00:44:38 -04:00
ThatOneCalculator
c2c0e5b76c
chore: up icons 2023-03-12 13:43:37 -07:00
Luna
7236aa4a3a Sorta kinda handle client_credentials auth flow 2023-03-11 23:19:17 -05:00
ThatOneCalculator
0c34b1bd48
how did vscode not catch these? 2023-03-11 13:59:36 -08:00
ThatOneCalculator
01d26a389d
forgot about the fill icons 2023-03-11 13:52:11 -08:00
ThatOneCalculator
11e1977a21
chore: phosphor 2.0.2 
adds woff2 as of 2.0.2 (my pr)
 2023-03-11 13:44:57 -08:00
ThatOneCalculator
731b761e16
style: inlie-flex on ph-fw 2023-03-11 13:36:40 -08:00
ThatOneCalculator
cf44b7de48
rm unessicary file 2023-03-11 13:29:18 -08:00
ThatOneCalculator
8721fbe8b5
fix? 2023-03-11 13:07:51 -08:00
Luna
c81d6ecc1e
Proxy object IDs for Mastodon API to prevent Calckey ID format incompatibilities 2023-03-11 16:02:35 -05:00
Luna
5e79069c4a
Clean up auth.vue 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
ThatOneCalculator
3de967393b
icons 2023-03-11 13:01:04 -08:00
ThatOneCalculator
90969b7512
refactor: ⬆️ phosphor 2, sorta 
thank you sammy
 2023-03-11 13:00:52 -08:00
ThatOneCalculator
7449b8b840
chore: apps 2023-03-11 12:22:54 -08: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
Kainoa Kanter
edaf7dbb61 chore: notes --> posts 2023-03-03 22:12:11 -08:00
Kainoa Kanter
f46445038a fix mobile navbar 2023-03-03 22:09:57 -08:00
Kainoa Kanter
1120818f47 fix: post button text alignment 2023-03-03 22:01:08 -08:00
Kainoa Kanter
f2ce0ef273 Merge pull request 'Add divider to header' (#9678) from Freeplay/calckey:a into develop 
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9678
 2023-03-04 03:25:49 +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
Freeplay
0ceb272fbf Add divider to header 2023-02-28 17:12:29 -05: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
Freeplay
aaaa58a8db change continue thread text 2023-02-27 09:42:11 -05:00
Freeplay
f4449cfafd Don't think that needed a reverse 2023-02-27 09:32:24 -05:00
Freeplay
1763e2083f Only use regular reply icon 2023-02-26 11:33:38 -05:00
Freeplay
c2dde63813 fix indents on this ? 2023-02-25 21:51:37 -05:00
Freeplay
790dcccc6e don't know why that was like that oops 2023-02-25 21:49:41 -05:00
Freeplay
5c1ca3ac29 fix small window sizes 2023-02-25 21:22:23 -05:00
Freeplay
f8d26e3e3d Tweak reaction animation 2023-02-25 20:36:00 -05:00
Freeplay
4278bd1e54 fix subnote body clip area™ 2023-02-25 20:22:17 -05:00
Freeplay
1310fa277e increase clip area of subnote body 2023-02-25 20:08:53 -05:00
Freeplay
a0720231a8 padding tweaks 2023-02-25 19:59:58 -05:00
Freeplay
8cb3a25245 change line height 2023-02-25 19:48:10 -05:00
Freeplay
404f7986e1 remove unneeded bit 2023-02-25 15:51:51 -05:00
Freeplay
a538b2ea84 a 2023-02-25 15:38:36 -05:00
Freeplay
1c57ba6242 Only animate in if newly added 2023-02-25 15:36:35 -05:00
Freeplay
5d391bd198 add some animations to reactions 2023-02-25 13:50:24 -05:00
Freeplay
233408569b style fixes 2023-02-25 12:36:57 -05:00
Freeplay
65de7b89e7 Remove content-visibility oh god that did not work as I expected 2023-02-25 12:15:35 -05:00
Freeplay
be15764e2d sort of fix replies count ? 2023-02-25 11:57:16 -05:00
Freeplay
0914a7fbd9 fix line alignment 2023-02-25 11:10:48 -05:00
Freeplay
161594d4bc Fix 'close' button in posts not sticking to bottom 
thanmk you overlfow clip
 2023-02-25 01:18:21 -05:00
Freeplay
5177fdeef1 allow mfm to overflow w/out it blocking any buttons 2023-02-25 01:15:42 -05:00
Freeplay
de97032eab add footer hover thingy to subnote too 2023-02-25 00:39:43 -05:00
Freeplay
0f94a62198 comment out unneeded bit (maybe for now) 2023-02-25 00:21:37 -05:00
Freeplay
c81a75cd1f change reply hover 2023-02-25 00:19:39 -05:00
Freeplay
7a2d1e7a07 fix alignment 2023-02-24 22:37:17 -05:00
Freeplay
5c076893c6 increase size when indents decrease 2023-02-24 22:35:37 -05:00
Freeplay
92b8aed3e2 style view thread continuation button + fix link underline 2023-02-24 22:33:21 -05:00
Freeplay
5eee718750 larger pfp's for first column of replies on mobile 2023-02-24 20:37:36 -05:00
Kainoa Kanter
6d71195acc Merge pull request 'fix: multiple Ads' bugs & feat: Ads widget' (#9668) from yawhn/elreqkey:9080_ads_widget into develop 
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9668
 2023-02-24 17:22:46 +00:00
Freeplay
b34b6de71f Reduce detailed note spacing on mobile 2023-02-24 11:55:51 -05:00