langfingaz/anki
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,172 Commits 2 Branches 2 Tags 39 MiB
6e907fd8b6
Commit Graph

914 Commits

Author SHA1 Message Date
Henrik Giesel
0b955c3699 Fix formatting 2021-01-10 16:38:20 +01:00
Henrik Giesel
adf969d37f Add a few rslib unit tests 2021-01-10 16:29:10 +01:00
Henrik Giesel
8f01887fe7 Remove coercion in write_rated 2021-01-10 16:23:53 +01:00
Henrik Giesel
87bc1e69b0 Coerce added/edited:0 to 1, constrain rated:n to 1 <= 365 2021-01-10 16:16:17 +01:00
Damien Elmes
5f70d718b8 favour readability over brevity in filter conversion 2021-01-10 09:19:33 +10:00
Damien Elmes
4ba4e8ca78
Merge pull request #913 from RumovZ/fix-write-template 
Fix ordinal case in write_template
 2021-01-10 08:58:00 +10:00
Damien Elmes
3f9604457d
Merge pull request #911 from RumovZ/backend-filters 
Backend filters
 2021-01-10 08:56:57 +10:00
Damien Elmes
4d471612ec fix protobuf formatting adding carriage returns on Windows 2021-01-10 08:48:20 +10:00
RumovZ
0629f80aeb Format backend.proto 2021-01-09 20:09:47 +01:00
RumovZ
f83553c82a Merge branch 'master' into backend-filters 
Adapt new formatting.
 2021-01-09 19:03:43 +01:00
RumovZ
ca62f3ef80 Fix ordinal case in write_template 
Internal card ordinals start at 0, so add 1 again when writing a
template search string from a parsed ordinal.
 2021-01-09 17:30:12 +01:00
abdo
0b5bb711a1 Remove unused backend methods & formatting 2021-01-09 17:48:34 +03:00
abdo
5919d9273f Fix tag collapse state not getting updated 2021-01-09 17:46:52 +03:00
abdo
97b4c2124c sql formatting 2021-01-09 17:38:16 +03:00
abdo
f7f509c70d Move tag collapse method to the backend 2021-01-09 17:10:16 +03:00
abdo
1be789f25f Move sql code for upgrading to schema 17 to a separate file 2021-01-09 17:10:16 +03:00
abdo
c6e3d55400 fill_missing_tags's input should be sorted 
I assumed that fill_missing_tags will work correctly with un unsorted
tag list previously so I replaced the all_tags_sorted call, but take the following the list for example:

["foo::bar", "foo"]

This will cause "foo" to be counted like a missing tag, since it's
encountered the first time when looking at "foo::bar"", and its config
and other associated data will be lost.
 2021-01-09 17:10:16 +03:00
abdo
b33267f754 Do not check for missing tag parents at registration time 2021-01-09 17:10:16 +03:00
abdo
b276ce3dd5 Hierarchical tags 2021-01-09 17:10:13 +03:00
RumovZ
9ef691c06f Provide filter searches through backend 2021-01-09 10:50:08 +01:00
Damien Elmes
fc948d3e83 add clang-format for backend.proto formatting 2021-01-09 17:08:50 +10:00
Damien Elmes
e0c3949ef9 format backend.proto with standard Google style 2021-01-09 15:50:24 +10:00
Damien Elmes
c3b1266f47 fix some comments in wrong position after format 2021-01-09 14:26:51 +10:00
Damien Elmes
3dad3c90d0 add .sql file formatter 
Uses the logic from the sqltools VSCode add-on, with a workaround
for the use of 'type' in some table columns.

By detecting the presence of 'BUILD_WORKSPACE_DIRECTORY' we can tell
if the rule is running in test mode or was run directly, avoiding the
need for separate check and fix rules. It might be nice to extend this
to other formatting rules in the future as well.
 2021-01-09 14:22:49 +10:00
Damien Elmes
56e4e2d518 reformat .sql files 2021-01-09 14:08:55 +10:00
Henrik Giesel
82a4e0abe8 Don't import now unused INITIAL_EASE_FACTOR_THOUSANDS 2021-01-08 19:32:36 +01:00
Henrik Giesel
caa536a753 Reset ease to 0 for after rescheduling cards as new 2021-01-08 18:15:24 +01:00
Damien Elmes
fe4da25e15 fix reposition not honoring provided order, and add unit test 2021-01-08 20:38:49 +10:00
Damien Elmes
97e3bfe1c0
Merge pull request #904 from hgiesel/propdue 
Streamlining `is:due`, `prop:due`, and the FutureDue graph
 2021-01-08 16:34:53 +10:00
Damien Elmes
10630ab723 handle SortOrderProto conversion separately, and use enum getter 
In most cases we can just fall back on the default enum value instead
of caring if it's missing/invalid.
 2021-01-08 15:56:20 +10:00
Damien Elmes
cbeb714062 convert sort_kind_from_pb into from impl 2021-01-08 09:42:54 +10:00
Damien Elmes
1a5b5f09cc convert from protobuf enum, rather than the underlying i32 2021-01-08 09:24:03 +10:00
Henrik Giesel
4c570785bb Add comment about integer division 2021-01-07 20:10:25 +01:00
Henrik Giesel
04a56209c6 Restate rslib unit test 2021-01-07 19:56:36 +01:00
Henrik Giesel
155a59b80b Search for Learn and PreviewRepeat cards when using prop:due 2021-01-07 19:01:10 +01:00
Henrik Giesel
795dcab370 Include PreviewRepeat cards in is:due 2021-01-07 17:24:10 +01:00
RumovZ
76c16180ae Add native enum for concatenate_search's separator 2021-01-07 12:50:57 +01:00
RumovZ
ebe535e42f Add Position in PropertyKind match of writer.rs 2021-01-06 23:29:09 +01:00
RumovZ
6ee9e4f58c Merge branch 'master' of https://github.com/ankitects/anki into norm-search 2021-01-06 20:57:24 +01:00
RumovZ
d9f7d2e70d Add tests for writer.rs 
Also minor adjustments to concatenate_searches.
 2021-01-06 19:39:34 +01:00
RumovZ
07499dd890 Implement search replacing via Ctrl+Shift combo 
Also switch to using the new backend functions for concatenating and
negating searches.
 2021-01-06 18:32:29 +01:00
RumovZ
84061a6e6d Implement replace_search_term 2021-01-06 14:03:43 +01:00
RumovZ
79d0b5496b Implement concatenate_searches 
Fix minor stuff in writer.rs.
 2021-01-06 14:00:47 +01:00
RumovZ
713db05f27 Implement negate_search 2021-01-06 13:57:35 +01:00
Damien Elmes
e28c67d4f6
Merge pull request #895 from hgiesel/newlearn 
Change meaning of "is:learn" to filter on type, not queue
 2021-01-06 19:13:59 +10:00
Henrik Giesel
59cb901a3b Change meaning of "is:learn" to filter on type, not queue 2021-01-05 17:36:55 +01:00
Damien Elmes
dad4c76089 no need to log card resets when exporting 2021-01-05 11:11:37 +10:00
abdo
dc51dc6795 Rename prop:order to prop:pos 2021-01-02 13:35:10 +03:00
abdo
0ad4619833 Support prop:order to search for new cards by order 2021-01-01 04:36:51 +03:00
Damien Elmes
6199548ba9
Merge pull request #879 from Arthur-Milchior/Tex_keep_alt 
Add Alt text to latex image
 2020-12-31 12:02:40 +10:00
Damien Elmes
a0b4948760 fix clippy error in unit test 2020-12-31 09:48:05 +10:00
Arthur Milchior
d933d7774f Add Alt text to latex image 
I'm trying to go over accessibilities issues in AnkiDroid. Since we'll use rust backend, I thought I might as well go
over it in rust directly. The only side effect in anki is that, if you copy a text with the image, you'll get the LaTeX
copied instead of nothing. Alas, it seems qt does not show alt text.
 2020-12-30 18:00:06 +01:00
Damien Elmes
3f3f4b5c36 add aarch64 Linux to cargo; update deps 2020-12-30 13:33:16 +10:00
RumovZ
95b4e4cc84 Make function names more explicit and add docs 2020-12-29 11:18:49 +01:00
RumovZ
62753290d8 Make normalized search syntax more explicit 
Also fix a bug with NoCombining and WordBoundary searches.
 2020-12-29 11:06:53 +01:00
Arthur Milchior
008a87a794 NF: test # / and ^ can remains at end of string 2020-12-28 07:58:15 +01:00
Damien Elmes
14c0066a53 simplify NoteField init in test; add other bad chars 2020-12-28 13:19:37 +10:00
Damien Elmes
1d15a207bb fix comment and add basic unit test 2020-12-28 13:14:49 +10:00
Damien Elmes
b8a96d81f8
Merge pull request #870 from Arthur-Milchior/trim_start_field_name 
Trim the start of field name if it is #, /, ^ or a whitespace
 2020-12-28 13:06:57 +10:00
Arthur Milchior
01caa3d996 Trim the start of field name if it is #, /, ^ or a whitespace 
I actually need to trim whitespace again to deal with a field name of the form "# foo"
 2020-12-28 03:32:05 +01:00
Damien Elmes
40c5f8a907 update prost to new 0.7 release+auto stage changes 
Allows us to drop slow git repo.
 2020-12-28 10:12:35 +10:00
RumovZ
ecd04f8a59 Don't escape isolated - 2020-12-22 11:52:17 +01:00
RumovZ
873e96b60a Fix format and tests 2020-12-22 11:32:53 +01:00
RumovZ
5b24d9e4a6 Expose search writer 2020-12-22 11:06:55 +01:00
RumovZ
fcc87d16ea Add search writer 2020-12-22 11:04:38 +01:00
Damien Elmes
b48451610f fix sync indicator turning blue after startup sync 
https://forums.ankiweb.net/t/why-is-my-sync-button-blue/2078/26?u=dae
 2020-12-22 10:46:50 +10:00
Damien Elmes
ebeae9a5a0 don't pass BUILDINFO into build script 
It was causing the build script to be recompiled each time a commit was
made, even though buildinfo.txt was not changing.
 2020-12-21 16:04:29 +10:00
Damien Elmes
06399446e3 add some code editing/completion docs 2020-12-16 14:16:08 +10:00
Damien Elmes
dee0a2fc18 fix reposition not being applied in browser sort order 
https://forums.ankiweb.net/t/reposition-function-not-working/5817

Also changed id->cid in the non-sorting case, as otherwise when
using all_searched_cards() on a sorted list, the results will be wrong.
 2020-12-16 10:58:46 +10:00
Damien Elmes
75cbbea048
Merge pull request #848 from cecini/rslibdep 
Update Rust deps, and nom to v6
 2020-12-15 20:04:02 +10:00
cecini
d37ea0f5f7 Update rslib dep nom 2020-12-15 08:19:52 +00:00
abdo
197d665de8 Fix duplicate check not decoding entities 
This is a regression introduced in 358d0f957e

See https://forums.ankiweb.net/t/bug-duplicates-not-detecting-on-paste/5753
 2020-12-14 15:13:00 +03:00
Damien Elmes
77c9db5bba plural rules and decimal separator should use bundle's language 
Instead of providing the list of languages in preferred order, when
creating a bundle we need to specify the bundle language as the first
language, so that the correct plural rules are used. Fluent's docs
are misleading here; I will submit a PR to fix them.

The old behaviour caused:
https://forums.ankiweb.net/t/bug-in-review-intervals-for-some-languages-in-number-of-cards/5744
 2020-12-14 14:23:49 +10:00
Damien Elmes
1da327c725 minor doc updates 2020-12-11 22:37:12 +10:00
Damien Elmes
a9ea8e11a2 fix filtered decks not honoring sort order 
https://forums.ankiweb.net/t/2-1-36-filtered-decks-bug/5649/
 2020-12-09 22:50:49 +10:00
Damien Elmes
93c1289e69 bump rust deps 2020-12-09 15:34:43 +10:00
Damien Elmes
7ddc8ecd01 update rules_rust for separate compile_data arg 2020-12-01 16:48:45 +10:00
Damien Elmes
4c3577b12e update Rust deps incl. Pyo3 
This includes the refcount bug fix from pyo3 0.12.4
 2020-12-01 16:48:45 +10:00
Damien Elmes
1cb3984049 deck renaming tweaks 
- normalize name prior to creating parents
- always mark modified

https://github.com/ankitects/anki/pull/831#issuecomment-730064858
 2020-11-30 10:09:23 +10:00
Damien Elmes
009906d0c2 fix duplicate search not checking first field 
Thanks to abdo for the initial solution. Closes #838
 2020-11-30 09:27:10 +10:00
RumovZ
540d52c471 Comment fix 2020-11-27 22:12:36 +01:00
RumovZ
0c9ad7e952 Revert implementation of r: prefix 2020-11-27 22:10:37 +01:00
Damien Elmes
780f32b8ae fix new Clippy lints 2020-11-25 09:12:19 +10:00
Damien Elmes
3923f56cbf fix clippy lints 2020-11-24 20:13:05 +10:00
Damien Elmes
b55fd93cab manual tag on rslib was preventing clippy lints 2020-11-24 20:10:16 +10:00
Damien Elmes
d7cded4ae1 fix compilation of rslib outside Bazel 
fixes code completion
 2020-11-24 18:51:19 +10:00
Damien Elmes
c9b3ed1eae switch to workspace for Rust code 2020-11-24 18:41:03 +10:00
RumovZ
347c547e10 Add tests for conversion functions in text.rs 2020-11-20 09:45:53 +01:00
RumovZ
0fc84d19b2 Replace text.rs/text_to_re with text.rs/to_re 2020-11-20 09:23:25 +01:00
Damien Elmes
e23d40e850
Merge pull request #823 from RumovZ/rework-search-parser 
Rework search parser
 2020-11-20 16:22:12 +10:00
Damien Elmes
7c57e5044b mark created deck parents as modified 
Thanks to cecini for the original report. Closes #831:
https://github.com/ankitects/anki/pull/831
 2020-11-19 08:48:43 +10:00
RumovZ
785540bddc Revert changes to normalisation handling 
Handle norm calls individually in write_search_node_to_sql again.
 2020-11-18 23:46:27 +01:00
RumovZ
6e51bad7db Implement the prefix r: to search for raw input 2020-11-18 22:26:51 +01:00
RumovZ
c185fb966b Merge branch 'master' into rework-search-parser 
Conflicts:
    rslib/src/search/sqlwriter.rs
 2020-11-18 09:04:04 +01:00
Damien Elmes
fcb3283a9d move ftl into top level ftl/ folder; make it source of truth for aqt 
This avoids the need to modify the external repo before new strings
can be used in aqt.
 2020-11-18 16:20:58 +10:00
Damien Elmes
c1e6149a1b fix browser updateTitle() 2020-11-18 13:40:21 +10:00
Damien Elmes
ffa26fe4bc fix remaining _() references; remove unused imports 2020-11-18 12:43:46 +10:00
RumovZ
b09a398d2d Make - escapable 
Treat unescaped - as before but make it escapable with \ to distinguish
the literal from the negator.
 2020-11-17 18:38:27 +01:00
RumovZ
91873d68eb Fix RE in to_custom_re of text.rs 
Match every single (potentially escaped) character of the string, so
they can be escaped properly.
 2020-11-17 15:39:54 +01:00
Damien Elmes
e527d31dfc begin plural string migration 2020-11-17 23:29:08 +10:00
RumovZ
8c02c6e205 Split unescaping between parser and writer 
* Unescape wildcards in writer instead of parser.
* Move text conversion functions to text.rs.
* Implicitly norm when converting text.
* Revert to using collection when comparing tags but add escape support.
 2020-11-17 12:49:37 +01:00
Damien Elmes
9d1b6231d7 merge pylib references 2020-11-17 19:23:06 +10:00
Damien Elmes
6418993840 merge bulk of qt/ - designer files still to do 2020-11-17 17:42:43 +10:00
abdo
358d0f957e Make dupe search operate on non-stripped text 
See https://github.com/ankitects/anki/pull/822/
 2020-11-16 04:01:04 +03:00
RumovZ
7c5cf6d18b Use enforced re to parse deck 
Fix write_deck not recognising escaped deck name separators:
\:\: -> ::
 2020-11-15 21:32:36 +01:00
RumovZ
a6628709c5 Annotate RegEx for invalid-escape check 2020-11-15 14:22:16 +01:00
RumovZ
a16d271eb0 Extend tests for new search parsing 
(Also fix indentation)
 2020-11-15 12:00:20 +01:00
RumovZ
ae01a5b3a2 Fix escape check for escaped backslash 2020-11-15 11:57:11 +01:00
RumovZ
63cc877023 Move whitespace check for tags from to sqlwriter 
Instead of not parsing a tag containing whitespace, check for spaces
when writing sql and if there are any, explicitly match nothing.
 2020-11-15 11:54:21 +01:00
RumovZ
57787368a1 Always use regex for tag search 
Don't distinguish between the glob and no-glob cases when comparing
tags but always use regexp. Thus, avoid problems with SQL wildcards in
registered tags.
 2020-11-15 09:52:00 +01:00
Damien Elmes
4bf93a9af0 add native-tls in preparation for Linux-only ring 2020-11-15 14:02:53 +10:00
RumovZ
9e53481003 Fix tests for new search parsing (and reformat) 2020-11-14 19:13:09 +01:00
RumovZ
836977aac8 Fix whitespace in write_tag and parser/whitespac0 2020-11-14 19:10:56 +01:00
RumovZ
3949996728 For deck searches, unescape quotes only 
For now, revert to the old handling of deck names using text_to_re from
text.rs and have parser.rs only unescape quotes.
 2020-11-14 19:06:37 +01:00
RumovZ
b186e61e54 Fix 'escaped' parser for empty string 
Fix a bug where 'escaped' parsers (nom) accepted the empty
string by wrapping them in 'verify' parsers.
 2020-11-14 18:28:24 +01:00
RumovZ
0cff65e5a8 Fix bugs and inconsistencies in the search parser 2020-11-12 17:27:50 +01:00
Damien Elmes
5bb3d7c114 format_fix -> format; rename svelte-check for consistency 2020-11-12 20:19:32 +10:00
Damien Elmes
0489c92908 drop El Capitan support 2020-11-12 20:03:41 +10:00
Damien Elmes
c4f28a0a17 prep for i18n updates 
Update scripts will be split into separate repo
 2020-11-11 16:18:28 +10:00
Damien Elmes
e99c0dbe15
Merge pull request #793 from nwwt/object-audio-tags-support 
Audio & object tag support
 2020-11-11 10:33:31 +10:00
Andreas Reis
e68a40f13e cleanup / renames 
・ soundRegexps →  sound_regexps

・ htmlRegexps →  html_media_regexps

・ HTML_TAGS →  HTML_MEDIA_TAGS

・ escapeImages →  escape_media_filenames + alias

・ strip_html_preserving_image_filenames →  strip_html_preserving_media_filenames
 2020-11-10 14:53:04 +01:00
Damien Elmes
96f77b4b5e
Merge pull request #805 from cecini/duecounts 
align rslib get_subnode impl with anki pythonapi find_deck_in_tree
 2020-11-06 10:57:49 +10:00
Damien Elmes
c157ccb3f5 handle notes with invalid utf8 2020-11-06 10:21:51 +10:00
Damien Elmes
3f47ff9abd fix missing buildinfo on Windows 2020-11-05 11:21:27 +10:00
Damien Elmes
f25af77122 fixes for consuming rust lib from external repo 2020-11-04 19:20:49 +10:00
Damien Elmes
3c12cb1600 update to latest fluent libs, and integrate maximum digit handling 
We now limit number of digits in our formatter, instead of relying
on an upstream patch.
 2020-11-03 14:10:45 +10:00
Damien Elmes
ef79596c5b add shallow_since to a bunch of git deps 2020-11-03 11:42:11 +10:00
Damien Elmes
8f5474bef0 ues native roots with rustls 2020-11-03 10:42:20 +10:00
Damien Elmes
e54bb9d1bf update env_logger, and minor dep updates 2020-11-03 09:04:57 +10:00
Damien Elmes
35f5358bf7 reqwest was missing default-features = false 
Still needed until we fix OpenSSL compilation on Linux
 2020-11-02 21:53:24 +10:00
Damien Elmes
a079bb1820 update rusqlite and pin-project 
Thanks to Alan for the heads up
 2020-11-02 18:26:19 +10:00
Damien Elmes
dc3bd07919 update cargo deps; add script to copy them from rslib/ 2020-11-02 18:17:26 +10:00
Damien Elmes
e0817c004d move backend.proto into rslib/ 2020-11-02 16:28:31 +10:00
Damien Elmes
d36162bd49 clippy lint 2020-11-01 16:19:08 +10:00
Damien Elmes
0cf964b16d trailing newline .ftl check can happen at build time 
Removes the need to build ripgrep for CI
 2020-11-01 14:59:45 +10:00
Damien Elmes
b17d537a9e remove old makefiles 2020-11-01 14:41:01 +10:00
Damien Elmes
aea0a6fcc6 initial Bazel conversion 
Running and testing should be working on the three platforms, but
there's still a fair bit that needs to be done:

- Wheel building + testing in a venv still needs to be implemented.
- Python requirements still need to be compiled with piptool and pinned;
need to compile on all platforms then merge
- Cargo deps in cargo/ and rslib/ need to be cleaned up, and ideally
unified into one place
- Currently using rustls to work around openssl compilation issues
on Linux, but this will break corporate proxies with custom SSL
authorities; need to conditionally use openssl or use
https://github.com/seanmonstar/reqwest/pull/1058
- Makefiles and docs still need cleaning up
- It may make sense to reparent ts/* to the top level, as we don't
nest the other modules under a specific language.
- rspy and pylib must always be updated in lock-step, so merging
rspy into pylib as a private module would simplify things.
- Merging desktop-ftl and mobile-ftl into the core ftl would make
managing and updating translations easier.
- Obsolete scripts need removing.
- And probably more.
 2020-11-01 14:26:58 +10:00
cecini
2606a8a489 align rslib get_subnode impl with anki pythonapi find_deck_in_tree, fix nestdeck due counts issue 2020-10-29 23:53:26 +08:00
Andreas Reis
6e9aaad11e Add audio & object tags to media check 
Makes the media check recognize files in <audio> and <object> tags as used.

They've been observed/supported by the WebView (checked: Anki, AnkiDroid) since just about forever already and are extremely useful if one knows a thing about web dev.
 2020-10-25 13:09:57 +01:00
abdo
97ea14449f Ensure non-empty names 
https://github.com/ankitects/anki/pull/801/
 2020-10-22 16:11:06 +03:00
abdo
55f1d3773f Strip double quotes from names 
Strip double quotes from all kinds of names

https://github.com/ankitects/anki/pull/798
 2020-10-21 21:48:49 +03:00
Damien Elmes
c96784c0eb fix new clippy lints 2020-10-09 21:35:53 +10:00
Damien Elmes
90fa38495e reindex when checking database 
Came across a user with a corrupt index:

sqlite> pragma integrity_check;
 integrity_check = wrong # of entries in index ix_revlog_cid
 integrity_check = wrong # of entries in index ix_cards_sched

This is not picked up by a quick check, and a vacuum does not
fix it, but a reindex does.

AnkiWeb currently performs a full check when a file is uploaded
to it, so this was leading to "corrupt" to show up when syncing
the collection, with a local DB check not reporting/fixing the issue.
 2020-10-05 17:40:43 +10:00
Damien Elmes
53a984ba15 bump version 2020-10-02 10:22:21 +10:00
Damien Elmes
955c1bafb9 fix * handling in unqualifed text as well 
https://forums.ankiweb.net/t/anki-2-1-desktop-searching-with-only-when-limited-to-a-field/3789/4
 2020-09-29 21:18:19 +10:00
Damien Elmes
7e872de875 fix escaping of * in field search 
mentioned in
https://github.com/ankitects/anki/pull/769
 2020-09-27 16:04:08 +10:00
Damien Elmes
c125893eba bump version 2020-09-24 10:52:24 +10:00
Damien Elmes
cc3fdb2f37 rename downgrade method for clarity 2020-09-22 15:53:26 +10:00
Damien Elmes
76acf04dc0 update schema to fix default initial ease in deck configs 
Closes #766

- changes the on-disk representation from % to a multiplier,
eg 250 -> 2.5, as this is consistent with the other options
- resets deck configs at or below 1.3 to 2.5
- for any cards that were using a reset deck config, reset their
current factor if it's at or below 2.0x. The cutoff is arbitrary,
and just intended to make sure we catch cards the user has rated
Easy on multiple times. The existing due dates are left alone.
 2020-09-22 08:16:39 +10:00
Damien Elmes
d74cc2e9b0 stop is:due gathering learning cards that are not due yet 
https://forums.ankiweb.net/t/how-to-avoid-rebuilding-filtered-decks-to-skip-learning-cards-steps/3551/
 2020-09-21 11:41:54 +10:00