1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 18:47:26 +08:00
Commit Graph

534 Commits

Author SHA1 Message Date
Dean Herbert
598c6fcbad Add basic support for stupidly long hold note skin textures 2023-01-25 14:43:46 +09:00
Dean Herbert
88e6db1bea
Merge pull request #21725 from Mogiiii/mania-hidden-configuration
Add mania hidden & FadeIn mod configuration
2023-01-18 18:19:14 +09:00
Dylan Nantz
4fce7f03bd add mania mod fadein test 2023-01-11 14:14:17 -05:00
ansel
1f129d4e16 Add failing test 2023-01-11 21:20:56 +03:00
Dean Herbert
efded323e4 Rename variables and avoid the need for a property 2023-01-09 16:49:38 +09:00
Dylan Nantz
4a1a023f9e Code quality improvements 2022-12-20 13:33:33 -05:00
Dylan Nantz
c200e77994 Add mania hidden mod configuration 2022-12-19 18:31:28 -05:00
Derrick Timmermans
6a61e70766
Expose Ruleset from HitObjectComposer instead 2022-11-30 12:17:58 +01:00
Dan Balasescu
7bc8908ca9 Partial everything 2022-11-27 00:00:27 +09:00
Dean Herbert
c1b193149c Add test coverage of input near end of hold note with nearby subsequent note
Covers the scenarios mentioned in #21371.

Turns out this seems mostly okay already, so there are no fixes applied here.
2022-11-22 17:09:14 +09:00
Dean Herbert
1aa0e40f2f Add "Component" prefix to lookup naming 2022-11-09 17:46:43 +09:00
Dean Herbert
c908969d9b Rename ISkinComponent to ISkinLookup 2022-11-09 17:46:43 +09:00
Dean Herbert
923d44a769 Update dependencies 2022-11-04 17:00:58 +09:00
ekrctb
0b8b322322 Fix tests 2022-10-25 19:48:33 +09:00
Salman Ahmed
516e99df72 Add test coverage for flashlight mod 2022-10-14 02:38:43 +03:00
Salman Ahmed
2d4f390372 Remove non-smoke key bindings on "Relax" mod instead 2022-10-09 17:14:16 +03:00
Dean Herbert
a1f96ad5f8
Merge pull request #20605 from peppy/update-deps
Update all dependencies
2022-10-08 00:11:08 +09:00
Dean Herbert
072b64b8d4 Update all dependencies 2022-10-07 21:16:11 +09:00
Dean Herbert
a4f827c7fd Remove broken KeyArea test scene
Use `TestSceneStage` instead.
2022-10-07 20:05:13 +09:00
Dean Herbert
6f8533ef6b Remove pointless colour specifications in test scenes 2022-10-07 15:45:35 +09:00
Dean Herbert
6b79f16461 Make Column.AccentColour bindable 2022-10-07 15:24:36 +09:00
Dean Herbert
2ae1aef0be Move column initialisation to ctor and fix remaining tests 2022-10-07 15:24:36 +09:00
Dean Herbert
1a0b953846 Remove unnecessary Beatmap parameter in ManiaLegacySkinTransformer 2022-10-07 15:24:36 +09:00
Dean Herbert
46c3cfe54d Remove StageDefinition flow in ManiaSkinComponent 2022-10-07 15:24:36 +09:00
Dean Herbert
7796a4c109 Cache StageDefinition for consumption (and remove ColumnType) 2022-10-07 15:24:36 +09:00
Dean Herbert
df3ad618e1 Move ColumnType to constructor 2022-10-07 15:24:36 +09:00
Dean Herbert
41e69fbca6 Remove "default" prefix from naming 2022-09-18 00:15:26 +09:00
Dean Herbert
51841988bf Rename references to DefaultSkin to have Triangles suffix 2022-09-17 23:57:25 +09:00
Dean Herbert
65d1c40dd5 Remove remaining package references and replace with SQLitePCLRaw direct reference
This may require further consideration for test and iOS projects.
2022-09-15 16:58:58 +09:00
Dean Herbert
e9463f3c19 Test editor ComposeScreen tests not adding beatmap to hierarchy
Makes it hard to test anything because `EditorBeatmap`'s `Update` method
updates whether a beatmap has timing or not (enabling the placement
controls).

Also adds a basic timing point to allow for better testing.
2022-08-31 14:07:56 +09:00
Dean Herbert
4b72e55770 Fix various test scenes not adding EditorClock to the draw hierarchy 2022-08-26 18:08:43 +09:00
Dan Balasescu
203b8b22b9 Adjust tests 2022-08-17 19:02:16 +09:00
Dean Herbert
d3ee2a0b8e Add test scene for visually adjusting mania BarLines 2022-08-08 17:38:46 +09:00
andy840119
9f79e80d8b Remove nullable disable annotation in the Mania test case. 2022-07-27 22:24:14 +08:00
Dean Herbert
958c0fb390 Remove Appveyor.TestLogger 2022-07-11 15:01:16 +09:00
Dan Balasescu
6c2d02fefd Fix tests 2022-06-30 12:37:03 +09:00
Dan Balasescu
f8830c6850 Automated #nullable processing 2022-06-17 16:37:17 +09:00
Dan Balasescu
902a0a3255 Update max combo test value 2022-06-03 16:50:43 +09:00
Bartłomiej Dach
c33aee17b0
Cache some more OverlayColourProviders to fix tests 2022-05-24 23:14:28 +02:00
Dean Herbert
c0abce918f Add enum to snap method as alternative to mutliple nested invocations 2022-05-12 16:19:07 +09:00
Dean Herbert
fecf92e16f Update libraries to latest versions 2022-05-11 19:54:59 +09:00
Dean Herbert
f6fc926f1a Add xmldoc and rename methods in IPositionSnapProvider for legibility 2022-05-05 15:58:21 +09:00
Salman Ahmed
59cf3ff50f Move distancing methods from IPositionSnapProvider to IDistanceSnapProvider 2022-04-28 05:48:45 +03:00
Salman Ahmed
70a93c0e7e Move DistanceSpacingMultiplier bindable to its own IDistanceSnapProvider interface 2022-04-24 08:33:00 +03:00
Salman Ahmed
4f8f27a58b Merge branch 'master' into osu-distance-spacing 2022-04-24 05:23:30 +03:00
Dan Balasescu
32e55e7d78 Merge branch 'master' into osu-diff-calc-max-combo 2022-03-31 15:08:08 +09:00
Shivam
1a7a160f0a Update vscode launch.json files for all other projects 2022-02-25 14:28:54 +01:00
Dan Balasescu
567da9214e Merge branch 'master' into osu-diff-calc-max-combo 2022-02-18 18:35:24 +09:00
Salman Ahmed
0992bec2c8 Change "distance spacing" multipler type to double
Avoids losing precision on initial load, causing an unnecessary
hash change in `EditorChangeHandler`.

Resolves test failures in `TestSceneEditorChangeStates`
(https://github.com/ppy/osu/runs/5192493482?check_suite_focus=true).
2022-02-16 03:28:12 +03:00
Dean Herbert
d79845fb1d Revert NUnit3TestAdaptor (again)
Console output is still broken. See
https://github.com/ppy/osu/runs/5196023462?check_suite_focus=true.
2022-02-15 17:06:34 +09:00
Dean Herbert
60153bb69d Update nuget packages to highest usable versions
EF packages are intentionally pinned to 5.0.14 as higher versions no
longer support `netstandard2.1`, which we require for xamarin projects.
2022-02-15 15:19:23 +09:00
Salman Ahmed
528dc03b8c Expose distance spacing in IPositionSnapProvider for updating distance grid
Alternate method is to expose a `SnapDistancesChanged` event in
`IPositionSnapProvider` instead, but I chose this way as an analogue to
`IBeatSnapProvider.BeatDivisor`, which might even make sense to be
exposed as `BindableBeatDivisor` instead of caching that separately.
2022-02-15 02:21:53 +03:00
Dean Herbert
176bb4a4e2 Update desktop projects to target .NET 6 2022-02-10 17:42:09 +09:00
Dean Herbert
4b646709c1
Merge pull request #16658 from Spooghetti420/no-long-notes-mod
Add "Hold Off" mod (no long notes)
2022-02-02 13:35:44 +09:00
Bartłomiej Dach
e4028b8fc1
Remove index ctor param from ColumnHitObjectArea
No longer used since 5692cecaa4.
2022-02-01 21:49:52 +01:00
Dean Herbert
bb8dc74e88 Fix constant formatting 2022-01-31 12:20:51 +09:00
Spooghetti420
b52153e73d Remove settings 2022-01-30 17:40:15 +00:00
Dean Herbert
c7580a5177 Fix inspections in test scene 2022-01-29 14:06:43 +09:00
Dean Herbert
035a84e75c Rename function and make public again for test usage 2022-01-29 14:05:23 +09:00
Spooghetti420
a4aa501bb5 Change threshold from ms to beat-based, add tests 2022-01-28 21:59:53 +00:00
Spooghetti420
146c54a2c1 Fix code formatting 2022-01-27 21:02:59 +00:00
Spooghetti420
3e068e564d Update mod per discussion + create test 2022-01-27 20:56:51 +00:00
Henry Lin
44311c1f4e Add tests for diffcalc max combo 2022-01-23 11:25:22 +08:00
Dan Balasescu
3e5d29ed00
Merge pull request #16505 from peppy/remove-base-difficulty-usage
Remove all usage of `BaseDifficulty` (and access `Difficulty` instead)
2022-01-19 13:53:55 +09:00
Dean Herbert
96d07e20ed Revert nunit test adaptor version bump until console output bug is resolved
Tests have started to output too much log content, causing viewing CI
failures to be painfully impossible. Roll back for now.

Fix may be related to
https://github.com/nunit/nunit3-vs-adapter/issues/941, although we don't
use filter.
2022-01-19 02:18:58 +09:00
Dean Herbert
7f65f3a47f Remove all usage of BaseDifficulty (and access Difficulty instead) 2022-01-18 22:57:39 +09:00
Dean Herbert
1b62a685f3 Merge branch 'master' into realm-integration/score-and-beatmaps 2022-01-18 15:07:59 +09:00
Dean Herbert
125439d177 Update all (non-NET6) nuget packages 2022-01-18 11:09:26 +09:00
Dean Herbert
5601f6f1fe Merge branch 'master' into realm-integration/score-and-beatmaps 2022-01-17 12:29:02 +09:00
Bartłomiej Dach
8e5ff201a1
Modify mania special skin to demonstrate failure case 2022-01-16 18:59:26 +01:00
Bartłomiej Dach
093b76e0ff
Fix drawable mania judgement scene looking broken 2022-01-16 18:56:21 +01:00
Dean Herbert
b5f670cc5b Add far too many fixes for ruleset non-nullable requirements 2022-01-12 23:24:11 +09:00
Dean Herbert
f9713b8895 Replace usage of TimeoutAttribute to fix beatmap conversion test failures 2022-01-04 11:51:41 +09:00
Joseph Madamba
7de43e3aba Fix most open compound words in identifiers being closed 2021-12-27 20:26:28 -08:00
Bartłomiej Dach
c429c74d89
Expose and use test ruleset config cache in test scenes 2021-12-23 19:42:26 +01:00
Bartłomiej Dach
5cbaa028eb
Use extracted ruleset config cache implementation in DI 2021-12-23 19:02:10 +01:00
Dean Herbert
441b7baa93 Provide a realm factory to usages of ToLive/RealmLive 2021-12-14 14:26:34 +09:00
Dean Herbert
f6a3709060 Store default skins to database 2021-11-29 18:28:25 +09:00
Dean Herbert
23146d59d1 Use ILive for current skin 2021-11-29 18:28:25 +09:00
Dean Herbert
e0629ba81c Update all dependencies 2021-11-20 13:31:10 +09:00
Dean Herbert
fabf253381 Update difficulty calculator tests to also use IWorkingBeatmap 2021-11-15 19:16:49 +09:00
Dean Herbert
369b4ba789 Update DifficultyCalculator to take an IRulesetInfo 2021-11-15 19:16:48 +09:00
Bartłomiej Dach
5e31e890ae
Extract class for clipboard contents for DI purposes 2021-11-10 12:36:23 +01:00
Bartłomiej Dach
410e9159d1
Fix test failures due to missing dependencies 2021-11-09 19:54:38 +01:00
dependabot[bot]
7747fd5810
Bump Microsoft.NET.Test.Sdk from 16.11.0 to 17.0.0
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.11.0 to 17.0.0.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.11.0...v17.0.0)

---
updated-dependencies:
- dependency-name: Microsoft.NET.Test.Sdk
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-11-01 17:01:54 +00:00
Dean Herbert
5c7623e68e
Merge pull request #15255 from goodtrailer/node-samples-ilist
Change IHasRepeats.NodeSamples to IList from List
2021-10-28 14:24:26 +09:00
Dean Herbert
6944151486 Apply batch fixing of built-in types using var 2021-10-27 13:04:41 +09:00
goodtrailer
4440b9ca11 Change IHasRepeats.NodeSamples to IList from List 2021-10-23 01:59:07 -07:00
Dean Herbert
46bafb6252 Merge branch 'master' into no-more-difficulty-control-points-info 2021-09-28 13:53:56 +09:00
Dean Herbert
bb132f9509 Update a few more missed event changes in tests 2021-09-16 22:41:35 +09:00
Dean Herbert
45b07aa362 Add some basic animated textures to mania metric skin 2021-09-16 15:33:55 +09:00
smoogipoo
f9af24df23 Fix mania hitobject tests 2021-09-15 15:22:27 +09:00
Bartłomiej Dach
1edf608260
Add failing test case 2021-09-12 18:17:39 +02:00
Bartłomiej Dach
fdd48c3e71
Refactor note colouring test scene 2021-09-12 17:42:35 +02:00
Dean Herbert
1952ebece9 Update tests to use more correct control point definitions 2021-09-06 22:04:51 +09:00
Dean Herbert
d4e5a612ea Update IPositionalSnapProvider to take a HitObject as reference, rather than raw time
This allows fetching the correct `DifficultyControlPoint` from the
hitobject. Nothing more.
2021-09-03 17:11:12 +09:00
Dean Herbert
a3d9ab1e2e Move approach rate to EffectControlPoint 2021-09-03 16:58:16 +09:00
dependabot[bot]
5a1eccd8e3
Bump Microsoft.NET.Test.Sdk from 16.10.0 to 16.11.0
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.10.0 to 16.11.0.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.10.0...v16.11.0)

---
updated-dependencies:
- dependency-name: Microsoft.NET.Test.Sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-01 18:17:37 +00:00
Salman Ahmed
15812520bd Replace global editor test case with mania compose screen test scene 2021-08-26 09:45:01 +03:00
dependabot[bot]
0d3de488de
Bump NUnit3TestAdapter from 3.17.0 to 4.0.0
Bumps [NUnit3TestAdapter](https://github.com/nunit/nunit3-vs-adapter) from 3.17.0 to 4.0.0.
- [Release notes](https://github.com/nunit/nunit3-vs-adapter/releases)
- [Commits](https://github.com/nunit/nunit3-vs-adapter/compare/V3.17...V4.0.0)

---
updated-dependencies:
- dependency-name: NUnit3TestAdapter
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-07-01 17:02:17 +00:00
ekrctb
9dcd0bf311 Remove IPlayfieldProvider by caching Playfield 2021-06-17 10:15:24 +09:00
ekrctb
a431b4eeda Add scrolling direction toggle for mania selection blueprint test scene 2021-06-15 15:22:36 +09:00
ekrctb
403aa433cf Rewrite mania selection blueprint test scene 2021-06-15 15:14:14 +09:00
ekrctb
d0e57f7dd9 Use HitObject instead of DHO for mania selection blueprint layout
- Fix moving selected hold note between columns will cause a crash
2021-06-15 13:20:51 +09:00
Dean Herbert
5366e7f61e
Merge branch 'master' into remove-hud-component-lookup 2021-06-02 16:10:06 +09:00
Dean Herbert
f8ae70e562 Update existing function type rather than adding an override 2021-06-02 16:04:53 +09:00
dependabot[bot]
967a7c3db5
Bump Microsoft.NET.Test.Sdk from 16.9.4 to 16.10.0
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.9.4 to 16.10.0.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.9.4...v16.10.0)

---
updated-dependencies:
- dependency-name: Microsoft.NET.Test.Sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-06-01 19:59:27 +00:00
Dean Herbert
ebfc24a499 Rename conflicting resources 2021-05-31 19:14:49 +09:00
Dean Herbert
b16d10bd95 Provide game-wide resources via IStorageResourceProvider 2021-05-31 18:57:47 +09:00
Dean Herbert
bddc3121dc Merge branch 'master' into mania-pooling 2021-05-19 17:23:45 +09:00
Dan Balasescu
ef81bdf63f
Merge branch 'master' into always-use-lifetime-entry 2021-05-18 20:10:12 +09:00
smoogipoo
562ac73e96 Merge branch 'hoc-event-queue' into mania-pooling 2021-05-18 14:54:00 +09:00
smoogipoo
72beddaadc Remove nested blueprints from hold notes 2021-05-18 14:25:07 +09:00
smoogipoo
b5afe4e506 Merge branch 'hoc-event-queue' into mania-pooling 2021-05-13 21:53:38 +09:00
smoogipoo
1ae57a6105 Fix hold note input test
Not sure why this was checking visibility. If it needs to be tested, it
does not belong in an "Input" test.
2021-05-13 20:11:06 +09:00
smoogipoo
ffb6135a1b Rework hitobject blueprints to take in hitobject models 2021-05-13 19:53:32 +09:00
smoogipoo
5692cecaa4 Initial implementation of DHO pooling 2021-05-12 16:35:05 +09:00
Justus Franklin Tumacder
0b06c5bcb1 Remove unneeded test data 2021-05-01 15:00:18 +08:00
Justus Franklin Tumacder
ecb053b0de Merge branch 'master' of https://github.com/ppy/osu into justusft/mania-color-snap 2021-05-01 11:20:28 +08:00
ekrctb
fd8e552a8b Fix filename not matching class name 2021-04-29 19:36:52 +09:00
ekrctb
4cc94efb06 Fix failing mania test 2021-04-29 14:39:52 +09:00
ekrctb
799d2a3300 Replace failed mania test (pooling not accounted) with a more robust test
Also fix null reference in Playfield
2021-04-29 14:38:01 +09:00
dependabot[bot]
1b3b07d6a9
Bump NUnit from 3.13.1 to 3.13.2
Bumps [NUnit](https://github.com/nunit/nunit) from 3.13.1 to 3.13.2.
- [Release notes](https://github.com/nunit/nunit/releases)
- [Changelog](https://github.com/nunit/nunit/blob/v3.13.2/CHANGES.md)
- [Commits](https://github.com/nunit/nunit/compare/v3.13.1...v3.13.2)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-29 03:51:12 +00:00
Justus Franklin Tumacder
4752a0201a Fix cake errors 2021-04-27 19:40:04 +08:00
Justus Franklin Tumacder
c4d28110d6 Add visual tests for timing based note coloring 2021-04-27 19:02:57 +08:00
Justus Franklin Tumacder
8b9d2a6cff Remove caching for ConfigColourCodedNotes 2021-04-25 08:32:49 +08:00
Justus Franklin Tumacder
bedabc1ddf Fix cake errors 2021-04-24 22:12:07 +08:00
Justus Franklin Tumacder
8b01082cbb Fix visual tests missing dependency for ColourCodedNotes 2021-04-24 21:28:48 +08:00
Justus Franklin Tumacder
f9905ebe68 Remove beatmap argument in Note 2021-04-24 19:37:10 +08:00
Justus Franklin Tumacder
7e3a611f95 Add snap color option for osu!mania 2021-04-24 16:23:52 +08:00
smoogipoo
30e6ea4291 Add failing test 2021-04-22 18:59:57 +09:00
ekrctb
a965e8a75d Remove AutoGenerator workaround of now-fixed issue 2021-04-16 14:13:41 +09:00
Dan Balasescu
345779b19a
Merge branch 'master' into diffcalc/fix/clockrate-adjusted-decay 2021-04-02 20:58:29 +09:00
dependabot-preview[bot]
6a286c5e21
Bump Microsoft.NET.Test.Sdk from 16.9.1 to 16.9.4
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.9.1 to 16.9.4.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.9.1...v16.9.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-04-01 17:16:02 +00:00
smoogipoo
f78d628878 Improve assertions 2021-03-31 12:21:07 +09:00
smoogipoo
ded91b32a4 Add failing test 2021-03-31 12:11:43 +09:00
smoogipoo
8438fce764 Merge branch 'master' into diffcalc/fix/clockrate-adjusted-decay 2021-03-26 11:47:38 +09:00
Bartłomiej Dach
d85929d721 Adjust autoplay generation tests to match expected behaviour 2021-03-22 22:45:21 +01:00
Bartłomiej Dach
c4f3714385 Make hold note input tests fail due to head hiding 2021-03-21 18:39:57 +01:00
Bartłomiej Dach
a16c0641b2 Revert EF Core to version 2.2
This reverts commit f3faad74d5, reversing
changes made to 712e7bc7bf.

Several issues arose after migrating to 5.0, including, but possibly not
limited to, performance regressions in song select, as well as failures
when attempting to save beatmaps after metadata changes in the editor.
2021-03-21 11:05:15 +01:00
Dean Herbert
1573298e68 Update remaining package references to point to efcore5 2021-03-15 13:12:10 +09:00
dependabot-preview[bot]
b03efd6940
Bump Microsoft.NET.Test.Sdk from 16.8.3 to 16.9.1
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.8.3 to 16.9.1.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.8.3...v16.9.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-03-02 00:43:45 +00:00
smoogipoo
dff1d80f39 Update HasFlag usages to HasFlagFast 2021-02-25 15:38:56 +09:00
Samuel Cattini-Schultz
417bb07b36 Update tests with fixed diffcalc values 2021-02-20 20:23:49 +11:00
Samuel Cattini-Schultz
9d229a5ec2 Add tests for clockrate adjusted difficulty calculations 2021-02-20 16:27:58 +11:00
Dean Herbert
72b2123500 Update nunit in line with framework 2021-02-15 21:42:35 +09:00
smoogipoo
30dae5bf1c Add test to make sure the algorithm is passed down in time 2021-02-04 15:21:26 +09:00
Dean Herbert
1e99357a97 Update build configurations to net5.0 paths 2021-01-19 12:13:27 +09:00
Roman Kapustin
0ea4e221b2 Merge branch 'master' into net5.0 2021-01-14 14:02:51 +03:00
dependabot-preview[bot]
0fd2e368c1
Bump Microsoft.NET.Test.Sdk from 16.8.0 to 16.8.3
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.8.0 to 16.8.3.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](https://github.com/microsoft/vstest/compare/v16.8.0...v16.8.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2021-01-01 17:53:41 +00:00