コミットグラフ

1329 コミット

作成者 SHA1 メッセージ 日付
syeopite 52688106e4
Fix /api/v1/search/suggestions route link 2021-08-23 16:38:29 -07:00
syeopite 66b45a8fe2
Bountiful changes
- Use haltf in more locations
 - Fix wrong URL params
 - Rename API modules
 - Remove API routing file and move everything to general iv routing
   file
2021-08-23 16:28:30 -07:00
Émilien Devos b5d2eb5c70
fetch with innertube api when video is unavailable (#2329)
+ rename some client type to better names
+ fix thirdParty hack
2021-08-16 10:41:16 -07:00
syeopite 25362f16a0
Readd paid attribute for videos (#2330) 2021-08-15 10:38:30 +02:00
syeopite 39b34eece8
Extract API routes from invidious.cr (3/3)
- Auth (excluding notifications*) APIs
- Mixes

*Notifications currently require the "connection_channel" channel
for talking with the notifications job. Unfortunately, we cannot
access that within the route modules yet.
2021-08-14 00:18:25 -07:00
syeopite b3426fdc94
Restructure API routes to use more namespaces 2021-08-14 00:18:25 -07:00
syeopite 6aa65593ef
Extract API routes from invidious.cr (2/?)
- Video playback endpoints
- Search feed api
- Video info api
2021-08-14 00:18:24 -07:00
syeopite 66becbf46f
Restructure API route organisation 2021-08-14 00:18:24 -07:00
syeopite cbf3d75087
Extract API routes from invidious.cr (1/?) 2021-08-14 00:18:24 -07:00
Émilien Devos c06a20e085
Switch to innertube API for videos (#2220)
Commit history:
- Switch to innertube API for videos
- fix hardcoded strings + fix bypass geo-restriction
2021-08-13 20:29:43 +00:00
Émilien Devos 12b46bbd41
switch to innertube API for about channels (#2255) 2021-08-12 16:00:26 -07:00
syeopite cea38de4ad
Check for existance of "adaptiveFormats" in videos
Combined from commits:
- Check for existance of "adaptiveFormats" in videos
- Remove usage of ternary conditional
2021-08-12 19:26:50 +00:00
Emilien Devos 6745ca7775 fix comments using dig 2021-08-12 20:00:14 +02:00
Émilien Devos 88c5e3b6fa
Use the new youtube api for comments (#2217)
* use the new youtube api for comments
* remove PG_DB & action parameter + allow force region
* support new comments data with onResponseReceivedEndpoints
2021-08-12 19:14:30 +02:00
syeopite 7afa027b95
Switch routing logic to use modules (#2298)
* Switch routing logic to use modules
* Add more macros for adding routes of different HTTP methods
2021-08-11 12:36:25 +02:00
TheFrenchGhosty 9b74cf3225
Typo 2021-08-03 23:57:48 +02:00
syeopite 1321c90920
Extract channel routes (#2227)
* Extract primary channel routes from invidious.cr

Also removes timedtext_video stub since all it does is redirect to the
homepage. However, Invidious's 404 handler already does this.

--
As the template for the channel about page doesn't exist yet, the
behavior for the /channel/:ucid/about endpoint has been changed to be
the same as what's currently present on Invidious

(cherry picked from commit 8fad19d8057d7d22e3de27ebbc88a9978c1df27b)

* Manually extract brand_redirect from 1b569bbc99207cae7c20aa285f42477ae361dd30

This commit manually extracts the brand_redirect function from the
commit mentioned.

However, the redirect to the  `.../about` endpoint is removed due to the
fact that it doesn't exist yet.

This commit is also mainly just a bridge for the next few cherry picks from
\#2215

* Update brand_redirect to use youtubei resolve_url

(cherry picked from commit 53335fe7cfdfac392365b7cac447bc7cc6478134)

* Add additional channel endpoints to brand_redirect

(cherry picked from commit 8fc6f3add637dabb09b2034f4d82fc3d039ba15c)

* Add separate handler for /profile endpoint

* Add /channel/:ucid/home route

* Document all channel brand_urls
2021-08-03 23:46:15 +02:00
Samantaz Fox 4b46313e19
Fix crystal overrides (#2295)
* Move Crystal stdlib classes overrides to a separate file
* Document known crystal overrides
* Update crystal overrides for HTTP::Client socket
* Update shard.yml to restrict crystal versions
* Fix compilation error in Crystal 1.1.x (See
   https://github.com/crystal-lang/crystal/issues/10965
   for more details about this issue).
2021-08-03 23:44:47 +02:00
syeopite e9add69e26
Fix #resolve_url by adding ClientConfig argument
The private `_post_json` method of the YoutubeAPI requires a ClientConfig
as the third parameter. This was passed in all Youtube API methods except the
`#resolve_url` method.
2021-08-03 00:48:58 -07:00
Samantaz Fox 5b020e81ca
Youtube api improvements (#2277)
* Put youtube API functions under the YoutubeAPI namespace

* Implement the following endpoints:
  - `next`
  - `player`
  - `resolve_url`

* Allow a ClientConfig to be passed to YoutubeAPI endpoint handlers.

* Add constants for many new clients

* Fix documentation of YoutubeAPI.browse(): Comments and search
  result aren't returned by the browse() endpoint but by the next()
  and search() endpoints, respectively.

* Accept gzip compressed data, to help save on bandwidth

* Add debug/trace logging

* Other minor fixes
2021-08-03 02:58:27 +02:00
Samantaz Fox 84594b0e1e
Remove workaround for decompression of proxied files (#2286)
Was used by `proxy_file` before crystal 0.35.0.
Implemented in: f7dbf2bdd4
orphaned since: d30a972a90
2021-07-28 17:15:51 -07:00
syeopite 578bbcd181
Fix raw parameter for videos in listen mode (#2270) 2021-07-28 16:28:09 -07:00
Samantaz Fox bc937a6434
Add Korean (ko.json) to loaded locales
Required because of c83113d49b.
2021-07-26 00:15:32 +02:00
syeopite 095c894548
Merge pull request #2201 from pinchese/patch-1
futureproof comment avatars
2021-07-16 21:43:37 -07:00
Samantaz Fox 56ebef4352
Multiple front-end fixes (#2247)
Fixes:
* Sanitize user-provided content in HTML (Fixes #2193)
* Fix encoding of search query in prev/next pages (Fixes #2229)
* Fix some issues introduced with #2196:
   - Fix alignment of all <h3> elements (Move the inline style from the parent to the <h3> element)
   - Add missing comma on 'dir' HTML attribute (Typo introduced by PR #2196)

Code cleaning:
* Remove unnecessary 'each_sclice' + 'each' double loop in ECR files
* Clean the player's <source> list generation code (in player.ecr)
2021-07-15 23:01:36 +02:00
syeopite 3e5c353298
Merge pull request #2205 from syeopite/fix-age-restricted-videos
Partial (and temporary) fix for age restricted videos
2021-07-14 10:11:03 -07:00
Émilien Devos 0d57a887ea
Mute unbuffered_flush IOError exception (#2235)
Related to #1416, it doesn't really fix the real error, but instead mutes the exception message.

Like explained in #1416, this "exception Error" while flushing the client data doesn't harm the client-server connection. However, this exception message continuously spams the logs and makes debugging and error finding really difficult.
2021-07-14 17:59:33 +02:00
syeopite ae61662f61
Debloat channels.cr into multiple files (#2225)
Cherry picked from ui overhaul branch with a few modifications:
  - channel folder is renamed to channels
  - parsing for channel home and featured channels are removed due to
    lack of infrastructure from other commits

(cherry picked from commit 44d18b8e147b47ad06a54cc6fd08423d9f39074d)
2021-07-14 17:46:12 +02:00
Samantaz Fox c0e8feb66e
Add new and missing locales to i18n.cr
New locales: lt, vi
Missing: bn_BD, cs, da, eu, hu-HU, si, sk, sr, sr_Cyrl
2021-07-12 19:41:35 +02:00
syeopite 39110ad21c
Use struct for caption object 2021-07-11 16:17:22 -07:00
syeopite 57bb8c610a
Use embed stream pull as fallback for gated videos 2021-07-02 00:25:00 -07:00
Émilien Devos cf619f24a9
Remove workaround for kemalcr/kemal/issues/575 (#2230)
Full URL of the issue: https://github.com/kemalcr/kemal/issues/575
2021-07-01 16:13:06 +00:00
Samantaz Fox 67a18dcff6
Merge pull request #2196 from ahangarha/patch-1
Add bi-directional text support
2021-06-27 22:39:45 +02:00
syeopite 54b19a04bb
Fix caption parsing on age restricted videos 2021-06-27 08:35:28 -07:00
syeopite ca4df29670
Wrap comment 2021-06-25 14:14:41 -07:00
syeopite 7da0b2fd7f
Switch from URI::Params.new to URI::Params.encode 2021-06-25 12:14:21 -07:00
Samantaz Fox cfcb64c516
Fix layout of video 'card' items
Previous changes broke alignment of text and icons
2021-06-25 20:47:15 +02:00
Samantaz Fox 135ae11c20
Merge pull request #2195 from B0pol/trending
Use youtubei API for trending
2021-06-25 17:53:07 +02:00
Émilien Devos ce68d09d26
Pick a random video for bypass captcha
pick a random video from the 1000 first rows of the channel_videos table
in order to bypass the captcha more efficiently
2021-06-25 15:37:37 +00:00
syeopite aa55e67389
Fix extraction of age restricted videos 2021-06-25 07:51:51 -07:00
Penny f7992d2d09
futureproof comment avatars
i was injecting custom css into the site that made the avatars round, and noticed comment avatars looked a little odd

i opened dev tools and siffed through the html, and noticed that the image was being padded,
when it would look nicer if the element used margin instead of padding

with padding:
https://imgur.com/c0pB37e

with proposed changes (margin instead of padding):
https://imgur.com/iKmBzEi
2021-06-24 23:50:37 -05:00
Samantaz Fox eecfc155b8
Right-align the RSS icon in channel playlists 2021-06-25 02:15:49 +02:00
Samantaz Fox 9cef7945c0
Fix RTL text in video titles on Firefox
The behavior was as follow: on Right-To-Left text (e.g Arabic) that is wrapped
(because it's too long to fit on one line), the second row and following rows
may or may not be right aligned (as RTL text should be). Opening the devtools
fixes that alignement, as consistently as closing the devtool breaks it.

This problem seems to arrive only in the following configurations (link nested
in a paragraph, both of which may or may not have the dir= attribute):

* `<p><a href="some_link">RTL_TEXT</a></p>`
* `<p><a href="some_link" dir="auto">RTL_TEXT</a></p>`
* `<p dir="auto"><a href="some_link">RTL_TEXT</a></p>`

with the following CSS:

```
p {
	unicode-bidi: plaintext;
	text-align: start;
}
```

Changing the HTML to the following configuration (a paragraph with the dir=
attribute, nested in a link) seems to fix it:

`<a href="some_link"><p dir="auto">RTL_TEXT</p></a>`
2021-06-25 02:03:09 +02:00
Mostafa Ahangarha 1b1932f787 fix feed alignment on community view 2021-06-24 17:40:02 +04:30
Samantaz Fox 9e4fd193c6 Limit descriptions width to ease mixed LTR/RTL text reading
This will prevent, on large pages, the LTR and RTL text to be
far away, on each side of the page. This could happen on channel
and playlists descriptions, when the page is displayed on a large
screen.
2021-06-24 17:35:44 +04:30
Mostafa Ahangarha d16a748f37 set alignment for feed link 2021-06-24 17:08:40 +04:30
Cadence Ember 7ec93825b6 Change description-box from flex to block
I also make minor changes to the surroundings so that the same layout
and functionality as before is preserved.
2021-06-24 15:12:05 +04:30
bopol 50267a6dd6 Use youtubei API for trending 2021-06-24 00:54:06 +02:00
Émilien Devos 4803285e50
update video URL for recaptcha detection 2021-06-19 17:38:49 +00:00
syeopite 349f073b8e
Remove unnecessary "Welcome, " on username display 2021-06-19 06:03:50 -07:00
Mateusz Makowski 90c907710c
Display username in header 2021-06-19 04:58:42 -07:00
syeopite cb525af0a2
Connect to api.invidious.io with https 2021-06-19 04:17:49 -07:00
syeopite 09f7e38eed
Disable automatic instance redirection by default 2021-06-19 04:17:49 -07:00
syeopite 7c49a0ba7a
Rephrase auto instance redirect preference 2021-06-19 04:17:49 -07:00
syeopite 45e57f1ad3
Refactor fetch_random_instance 2021-06-19 04:17:49 -07:00
syeopite eb911de928
Handle if inst. api is down for rand inst fetch 2021-06-19 04:17:49 -07:00
syeopite b393e31b76
Fix inst. fetching for inst w/ disabled stats/err 2021-06-19 04:17:49 -07:00
syeopite 4a095eb98e
Fix <hr> styling on empty search page 2021-06-19 04:17:49 -07:00
syeopite d793d4ba78
Add switch invidious instance btn to all chan tabs 2021-06-19 04:17:49 -07:00
syeopite 2f54ec4e18
Fix locale consistency for err template redirects 2021-06-19 04:17:46 -07:00
syeopite b9cd40fe1e
Add redirect buttons to error template 2021-06-19 04:16:18 -07:00
syeopite 173cd7c15e
Fix switch invidious instance btn on videos 2021-06-19 04:16:18 -07:00
syeopite 950c8f7104
Enhance fetch_random_instance func
Handle cross-inst. redirect w/ broken health stats

Add check for instance version in cross-redirect
2021-06-19 04:16:18 -07:00
syeopite b63bebb519
Allow automatic instance redirect to be turned off
Instead the "switch invidious instance" link would bring users to
redirect.invidious.io
2021-06-19 04:16:18 -07:00
syeopite cf72b34866
Fix locale discrepancy for instance redirect btn 2021-06-19 04:16:18 -07:00
syeopite d06cf2a07b
Add playlist redirect 2021-06-19 04:16:18 -07:00
syeopite 10804927bb
Add channel redirect 2021-06-19 04:16:18 -07:00
syeopite f178297452
Generalize redirect route 2021-06-19 04:16:18 -07:00
syeopite 311e7684b2
Add instance redirect on empty/broken search 2021-06-19 04:16:18 -07:00
syeopite 37ff2ac2b9
Overhaul button icon html and styling 2021-06-19 04:16:18 -07:00
syeopite 4786d586cf
Add new icon button for instance redirects 2021-06-19 04:16:17 -07:00
syeopite 008598b56f
Change wording of redirect hyperlink 2021-06-19 04:16:17 -07:00
syeopite f3bc55e37e
Expose instance redirect to frontend 2021-06-19 04:16:17 -07:00
syeopite 31fa3dfd59
Add route to redirect to another instance 2021-06-19 04:16:17 -07:00
syeopite 5b47438b71
Add helper function to fetch random instance 2021-06-19 04:16:17 -07:00
TheFrenchGhosty c33ee83d87
Merge pull request #2124 from raycheung/master
Fix storyboard when proxied with an external port
2021-06-19 07:45:33 +00:00
TheFrenchGhosty f88e5f09b4
Merge pull request #2152 from syeopite/hooks-and-scripts
Add scripts to ease development
2021-06-19 07:38:33 +00:00
Samantaz Fox 3de92b337d Use if/else instead of return in search route 2021-06-14 17:27:47 +02:00
Samantaz Fox a2f5342a83 Multiple search fixes
* Remove percent-encoding of the search query when calling youtube API, as it
  breaks UTF-8
* Empty search redirects to /search, not /
* Show the fullscreen search "home page" (from #1977) at /search
* Allow 'region=' parameter to be passed to /search
* Other minor fixes
2021-06-13 21:52:36 +02:00
syeopite 6c9dd8deb6
Change internal i18n key of sv-SE from sv to sv-SE 2021-06-13 06:23:18 -07:00
syeopite 065c104f27
Upgrade to crystal 1.0.0 2021-06-08 13:10:58 -07:00
syeopite d82734641b
Merge pull request #1985 from SamantazFox/improve-youtube-api-helper
Improve youtube api calls
2021-06-07 13:59:26 -07:00
Émilien Devos 1a2ca8634d
typo in the template file 2021-06-04 18:53:24 +00:00
Ray Cheung ca5d5668d9 Fix storyboard when proxied with an external port
Say if it's `http://host:port` internally and proxied to
`https://domain:external_port`, the storyboard URL was rendered as
`https://domain:port`.
2021-05-29 11:43:39 +08:00
syeopite 445ff856fe
Allow user preferences to effect extend_desc 2021-05-24 09:16:58 -07:00
Samantaz Fox b7fe212a18
Fix youtube API function's documentation 2021-05-24 15:25:00 +02:00
Samantaz Fox cbabf0ae7e
Craft the "context" data in a dedicated function
As the amount of API endpoint function grow, this will
prevent ugly code copy/pasta
2021-05-24 13:44:49 +02:00
Samantaz Fox 344ccf3b03
Use '/youtubei/v1/browse' endpoint for playlists 2021-05-24 13:19:28 +02:00
Samantaz Fox 26a7e1b049
Use '/youtubei/v1/search' endpoint for search queries 2021-05-24 13:19:28 +02:00
Samantaz Fox 43bd331e48
Multiple youtube_api.cr helper fixes
Add documentation
Bump web client version string
Add charset=UTF-8 to the 'content-type' header
Parse JSON and return it as a Hash
Handle API error messages
2021-05-24 13:19:28 +02:00
syeopite f529948d81
Change videojs-vr to the unminified version 2021-05-23 09:24:49 -07:00
syeopite 5ba9a1f87d
Fix lint 2021-05-23 09:22:37 -07:00
syeopite a0fb75efcb
Add licence for videojs-vr 2021-05-23 09:22:37 -07:00
syeopite 6e6f4d5a37
Allow configurable support of interactive 360 vid 2021-05-23 09:22:37 -07:00
syeopite df0cd30236
Add support for VR videos through videojs-vr 2021-05-23 09:22:29 -07:00
Emilien Devos 960bd2a6be fix likes parsing 2021-05-21 23:16:48 +02:00
TheFrenchGhosty 75e5b49c3a
Merge pull request #2008 from syeopite/mobile-ui
Improve player controls for mobile devices
2021-05-13 10:33:47 +02:00
TheFrenchGhosty 3cf08dc451
Merge pull request #2052 from Myzel394/patch-1
Add autofocus attribute to search input
2021-05-13 10:32:38 +02:00
TheFrenchGhosty 6f899d998f
Merge pull request #1968 from syeopite/iss677
Add ability to expand/collapse description.
2021-05-13 10:26:38 +02:00
TheFrenchGhosty 73da8463ca
Merge pull request #1953 from syeopite/fix1673
Update regex expressions to handle unexpected '};'
2021-05-13 10:24:44 +02:00
syeopite e6fba5d802
Fix locale discrepancy for extend desc feature 2021-05-10 00:34:34 -07:00
syeopite 50ba3c5d5c
Remove unused class attr on label 2021-05-10 00:26:43 -07:00
syeopite 65663fb857
Update code to reflect 'read more' btn name change 2021-05-10 00:26:42 -07:00
syeopite 8df2f38d34
Change wording of 'read more/less' & add to locale 2021-05-10 00:25:22 -07:00
syeopite c5fae84263
Add functionality to read more button 2021-05-10 00:25:20 -07:00
sh4dowb 533d0a1fd4
Added "Read More" button for video descriptions 2021-05-10 00:24:11 -07:00
syeopite 06b27d932d
Move player styling to separate file 2021-05-03 03:44:33 -07:00
syeopite ac1ac2cfed
Add mobile-ui js to licenses 2021-05-03 03:44:33 -07:00
syeopite 53cdb04be7
Improve mobile ux with videojs-mobile-ui 2021-05-03 03:44:33 -07:00
Myzel394 c106de02e9
Added autofocus attribute to search input
Since the main action of this form is to search something, the input should automatically be focused.
2021-04-30 15:12:36 +02:00
Samantaz Fox cac5f20a28 Move locales definition to i18n.cr 2021-04-21 16:10:25 +02:00
TheFrenchGhosty beea32661a
Merge pull request #1975 from tenpura-shrimp/disablequic
add option to disable quic
2021-04-17 17:59:16 +00:00
TheFrenchGhosty b9e57d0283
Merge pull request #1977 from syeopite/add996
Change empty home page to search engine like layout
2021-04-17 17:02:47 +00:00
syeopite 5c0458a887
Move navbar search bar render check to templated 2021-04-17 05:18:58 -07:00
syeopite 65942cd46c
Rename empty.ecr to search_homepage.ecr 2021-04-17 05:16:35 -07:00
Andrew Zhao 9a8f1a0b0a add option to disable quic 2021-04-14 12:03:31 -04:00
syeopite 45d687c4e1
Preserve url params in video aliases 2021-04-11 22:09:46 -07:00
namazso f2cc16009f
Fix statistics misreporting register allow state 2021-04-10 18:52:07 +02:00
Perflyst b7eba3bc17
Merge pull request #1961 from SamantazFox/fix-thumbnails-url
Fix API giving ytimg instead of instance URLs for thumbnails
2021-04-08 11:14:36 +02:00
Perflyst 661d715446
Merge pull request #1942 from syeopite/1736
Add multiple video route aliases.
2021-04-08 11:08:25 +02:00
TheFrenchGhosty 18b4b141d9
Merge pull request #1990 from SamantazFox/patch-1
Fix for issue #1989
2021-04-08 06:24:44 +00:00
TheFrenchGhosty cd1e478b95
Merge pull request #1976 from syeopite/fixfooter
Fix footer position to bottom of page
2021-04-08 06:23:19 +00:00
syeopite 5f466eed79
Rename default_home option 'none' to 'Search' 2021-04-07 19:36:40 -07:00
Samantaz Fox 93198438b8
Fix for issue #1989
Fixes #1989
2021-04-07 15:13:41 +02:00
syeopite d9528f5cc3
Change positioning of footer to use flexbox 2021-04-06 23:53:38 -07:00
syeopite 877bb5c821
Add aliases for watch route 2021-04-06 20:36:23 -07:00
TheFrenchGhosty ae353cef2e
Merge pull request #1974 from syeopite/fix1562
Fix channel info extract for video game channels
2021-04-06 15:49:11 +00:00
syeopite 909606826d
Change footer div into footer element 2021-04-06 04:15:08 -07:00
syeopite ea16c01fa2
Fix mobile responsive design for footer 2021-04-05 20:24:02 -07:00
syeopite a8649f286c
Handle nil type for default_homepage 2021-04-04 17:19:31 -07:00
syeopite 94f285695e
Add missing closing div element 2021-04-04 16:10:27 -07:00
syeopite 428747ab69
Allow default_home config to be empty value 2021-04-04 15:20:08 -07:00
syeopite 049e8e07ef
Fix footer position to bottom of page 2021-04-04 02:45:38 -07:00
syeopite 716a845e92
Fix missing navbar search bar 2021-04-04 02:26:07 -07:00
syeopite 555108c7fd
Add styling to search bar on empty home page 2021-04-04 00:48:14 -07:00
syeopite e1af3d9bf3
Add html of search bar to empty home page 2021-04-03 23:26:58 -07:00
syeopite e864c7541c
Hide header search bar when default_home is empty 2021-04-03 21:32:30 -07:00
syeopite b4a6cbbd09
Merge info extract functions back to one 2021-04-03 20:54:10 -07:00
syeopite fe4eef5855
Fix channel info extract for 'video game' channels 2021-04-03 20:26:38 -07:00
TheFrenchGhosty c0997f951c
Merge pull request #1929 from Svallinn/channel_playlist_fix
Fix channels' playlists fetching
2021-04-03 21:21:42 +00:00
syeopite 20b961c1c8
Preserve original cookies 2021-04-02 17:08:55 -07:00
TheFrenchGhosty c4c2e01213
Merge pull request #1922 from Svallinn/search_api_fixes
Fix channels' search API
2021-04-02 05:53:41 +00:00
Samantaz Fox 62e46b7a36 Fix missing last page in playlists 2021-04-01 18:46:49 +00:00
TheFrenchGhosty 052c5c67b8
Merge pull request #1960 from syeopite/fix1959
Add new YT consent cookie to every request
2021-04-01 16:07:07 +00:00
TheFrenchGhosty b794c5cfcf
Set the request cookie to "YES+" 2021-04-01 15:59:24 +00:00
TheFrenchGhosty be8a4013a7
Merge pull request #1945 from syeopite/trending-api-fix
Fix Trending API
2021-04-01 10:22:46 +00:00
Samantaz Fox 87c25f83a4 Fix API giving ytimg instead of instance URLs for thumbnails 2021-04-01 02:36:35 +02:00
syeopite e08bea5f51
Fix lint 2021-03-31 15:34:29 -07:00
syeopite 739f610507
Add new YT consent cookie to every request 2021-03-31 14:57:00 -07:00
syeopite 608313c1d1
Update regex expressions to handle unexpected '};' 2021-03-29 17:37:12 -07:00