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

2066 Commits

Author SHA1 Message Date
Dean Herbert
e1ab3434ed Add ability to handle user join/leave/kick events in MultiplayerComposites 2021-08-25 14:37:14 +09:00
Bartłomiej Dach
e503182a8d
Merge branch 'master' into activity-on-multiplayer-screens 2021-08-24 18:50:55 +02:00
Dean Herbert
8cd972a9fe Merge branch 'master' into pinned-comment 2021-08-24 14:37:31 +09:00
smoogipoo
956c1cc216 Merge branch 'master' into activity-on-multiplayer-screens 2021-08-24 12:33:34 +09:00
Endrik Tombak
058d2d2a49 Use nekodex's regex from osu-web 2021-08-20 23:01:06 +03:00
Endrik Tombak
8745fe9e34 Change editor timestamp regex to not match non-editor ones 2021-08-20 22:32:04 +03:00
Dan Balasescu
54bc532f0d
Merge branch 'master' into fix-messagepack-union 2021-08-20 16:01:04 +09:00
Dan Balasescu
dcff30ed6e
Merge branch 'master' into fix-login-as-guest 2021-08-20 14:06:28 +09:00
Dean Herbert
da8eba9996 Return early to avoid updating state and failure count in fail cases 2021-08-20 12:11:41 +09:00
Dan Balasescu
c95bf735fe
Merge branch 'master' into multiplayer-chat 2021-08-20 11:54:42 +09:00
Dean Herbert
a6b7ca1a4c Ensure all request failures are correctly handled during login 2021-08-19 19:55:14 +09:00
Dean Herbert
bc025efce5 Add commenting regarding workaround to avoid potential omission in the future 2021-08-19 17:42:44 +09:00
Dean Herbert
2b5a42e063 Add missing union specification for MatchUserRequest 2021-08-19 17:42:26 +09:00
Dean Herbert
f95c6f0de5 Switch multiplayer back to messagepack 2021-08-19 17:42:13 +09:00
Dean Herbert
fa01e4fad2 Add workaround for SignalR union serialisation 2021-08-19 17:41:50 +09:00
smoogipoo
1fd746524d Remove realtime room category, fix end-date showing for realtime 2021-08-19 16:09:28 +09:00
Dean Herbert
1faf789f0e Allow expanding chat using key binding even when it is hidden 2021-08-18 18:25:21 +09:00
Dan Balasescu
eaf7bd72fc
Merge branch 'master' into multiplayer-chat 2021-08-17 20:08:01 +09:00
Dean Herbert
8a1651e830 Reorganise methods in PollingComponent 2021-08-17 17:04:32 +09:00
Dean Herbert
b82f92d7b8 Adjust background colours of textbox in chat display 2021-08-17 16:16:49 +09:00
Dean Herbert
35b9f84c00 Expose StandAloneChatDisplay.Textbox 2021-08-17 16:16:49 +09:00
smoogipoo
6320768a67 Merge branch 'master' into multi-polling-request-refactor 2021-08-17 08:44:56 +09:00
smoogipoo
08d347f10b Merge branch 'master' into multi-polling-request-refactor 2021-08-16 13:12:08 +09:00
Nathan Alo
cc3468b4ab apply suggestions
- make `UserActivity.InGame` and derive that to `InSoloGame` and `InMultiplayerGame`
- rename `SoloGame` to `InSoloGame`
- rename `MultiplayerGame` to `InMultiplayerGame`
2021-08-16 06:32:33 +08:00
Opelkuh
7d7c5c06f0 Fix code formatting 2021-08-15 16:02:25 +02:00
Opelkuh
2f9f1ba862 Add test for ChannelManager.MarkChannelAsRead 2021-08-15 15:44:23 +02:00
Opelkuh
7d6f7ac75e Fix mark channel as read error 2021-08-15 02:57:11 +02:00
Bartłomiej Dach
498462dfd0
Fix room null-check racing against async schedule 2021-08-14 17:44:41 +02:00
Dean Herbert
b8c63eb1cb Merge branch 'master' into multiplayer-kick-support-events 2021-08-14 14:08:34 +09:00
smoogipoo
1fcb1cdb10 Add todo 2021-08-13 22:01:47 +09:00
Gagah Pangeran Rosfatiputra
480d5ffa5d
add pinned comment to users setter in comment bundle 2021-08-13 19:40:37 +07:00
smoogipoo
8910781bcd Move listing polling component to LoungeSubScreen 2021-08-13 17:39:09 +09:00
Gagah Pangeran Rosfatiputra
39b13efdd5
add pinned comments property in comment bundle 2021-08-13 13:13:28 +07:00
Gagah Pangeran Rosfatiputra
0901333ef3
add pinned property in comment 2021-08-13 12:57:29 +07:00
Dean Herbert
5f3ceaf0ad
Merge branch 'master' into lounge-redesign 2021-08-12 16:31:14 +09:00
Dean Herbert
9b21ebd6d0 Add client side handling on incoming kick 2021-08-11 19:56:06 +09:00
Dean Herbert
d9a4f018e6 Add event flow for receiving kick commands 2021-08-11 19:56:06 +09:00
smoogipoo
0f5bea235c Merge branch 'master' into lounge-redesign 2021-08-11 18:15:34 +09:00
Dean Herbert
e8ad0fba75 Add required server methods for kicking users 2021-08-11 17:20:41 +09:00
Dan Balasescu
b8748a86c5
Merge pull request #14204 from peppy/fix-null-ref-online-tracking-component
Fix potential null reference in online status resolution in multiplayer match
2021-08-10 18:36:13 +09:00
Dean Herbert
b121d95400 Avoid potential null reference exception in OnlinePlayBeatmapAvailabilityTracker 2021-08-10 17:37:24 +09:00
Dean Herbert
2b9168157d Fix CurrentMatchPlayingItem not being reset on leaving a multiplayer room 2021-08-10 16:53:03 +09:00
Dean Herbert
ea6e441dec Simplify method of marking players as playing in test scenes 2021-08-09 19:21:22 +09:00
Dean Herbert
0b76460043 Merge branch 'master' into lounge-redesign 2021-08-09 16:28:28 +09:00
Dean Herbert
8dc167ac9a Set default MultiplayerRoomSettings type to something that isn't playlists 2021-08-06 18:56:01 +09:00
smoogipoo
0246e6f850 Merge branch 'master' into lounge-redesign 2021-08-05 19:55:15 +09:00
smoogipoo
94aa5fbca7 Fix doubled json property (runtime error) 2021-08-05 16:31:34 +09:00
smoogipoo
fbf89493ad Merge branch 'master' into lounge-redesign 2021-08-04 19:53:55 +09:00
Dean Herbert
666007b2f9
Merge branch 'master' into multiplayer-team-vs-team-selection 2021-08-04 13:54:11 +09:00
Dean Herbert
401835a3d8 Add missing event glue 2021-08-04 13:13:47 +09:00
Dean Herbert
75426f84f1 Fire initial match user states in TestMultiplayerClient 2021-08-03 23:42:37 +09:00
Dean Herbert
b956d32587 Add the ability to change multiplayer game type 2021-08-03 23:42:37 +09:00
Dean Herbert
e11b815b82 Serialise type as snake_case 2021-08-03 23:13:39 +09:00
smoogipoo
1b6b7ce343 Merge branch 'master' into lounge-redesign 2021-08-03 20:02:31 +09:00
Dean Herbert
70da58323a Drop MatchRuleset terminology completely 2021-08-03 15:45:17 +09:00
Dean Herbert
66427127f0 Update naming in line with discussion 2021-08-03 15:09:03 +09:00
Dean Herbert
a42762e351 Merge branch 'multiplayer-rename-game-type' into multiplayer-match-rulesets 2021-08-03 14:55:51 +09:00
Dean Herbert
ee102e3755 Fix incorrectly overwritten ReferenceLoopHandling setting 2021-08-03 14:55:20 +09:00
Dean Herbert
5ac3abac99 Add missing forceScheduled parameter 2021-08-03 14:53:04 +09:00
Dean Herbert
556962a3d8
Add missing xmldoc comment
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-08-03 14:50:56 +09:00
Dean Herbert
2564c0c3df Rename GameType to MatchType and make enum instead of class 2021-08-03 14:46:31 +09:00
Dean Herbert
d93421b9b8 Expose a default TeamVs room state so it can be consumed by tests 2021-08-02 18:50:22 +09:00
Dean Herbert
c7274355a4 Remove abstract definitions from multiplayer states for now 2021-08-02 18:50:22 +09:00
Dean Herbert
617ff40de7 Add the ability to not use MessagePack when creating a HubConnector 2021-08-02 18:50:22 +09:00
Dean Herbert
1cd967b351 Add signalr json type handling specification 2021-08-02 18:50:22 +09:00
Dean Herbert
4cf2c6188d Add union attributes for derived class deserialisation 2021-08-02 18:50:22 +09:00
Dean Herbert
ce92a47ec6 Add silly event handling hookups 2021-08-02 18:50:22 +09:00
Dean Herbert
359eb9c4ec Add new event flow for match ruleset state handling
I'm totally not happy with how this is done, but don't have the energy
to rewrite everything just now.
2021-08-02 18:50:22 +09:00
Dean Herbert
035dfd071f Add missing nullable specifications 2021-08-02 18:47:26 +09:00
Dean Herbert
d17b2b3268 Add boilerplate for server events 2021-08-02 18:47:26 +09:00
Dean Herbert
1d645d4ca9 Mark base classes non-abstract to fix messagepack serialisation 2021-08-02 18:47:26 +09:00
Dean Herbert
1c125eef12 Make Users an IList for more flexibility server-side 2021-08-02 18:47:26 +09:00
Dean Herbert
9d1e95caf0 Add flow for sending match ruleset specific messages to the server 2021-08-02 18:47:26 +09:00
Dean Herbert
e8338f2711 Add basic class structure for match rulesets and required state 2021-08-02 17:14:49 +09:00
Jamie Taylor
c1d8a7e2ad
Add and use 'Submit' select sample variant for particular components 2021-07-30 21:35:28 +09:00
Dean Herbert
185ea776f5 Fix incorrect authorisation loss exception handling with recent changes 2021-07-30 18:11:40 +09:00
Dean Herbert
3a5324c947 Fix aborting an APIRequest potentially resulting in incorrect success 2021-07-29 13:01:52 +09:00
Dan Balasescu
2a94fc214f
Merge pull request #14046 from peppy/fix-rapid-reconnection
Fix `HubClientConnector` reconnecting with no delay on server-triggered error
2021-07-29 01:52:21 +09:00
Dean Herbert
cd2a1af6de Fix HubClientConnector reconnecting with no delay on server-triggered error 2021-07-28 20:46:02 +09:00
Dean Herbert
1ed4fdd5f5 Avoid deserialisation JSON request content when error is not present (or not relevant) 2021-07-28 20:13:40 +09:00
Dean Herbert
bb3747ffc9 Fix beatmap search requests double-escaping
Closes #14008.
2021-07-25 17:06:40 +09:00
Dan Balasescu
ce30bd8cc7
Merge pull request #14003 from Game4all/localise-profile-overlay-header-stats
Localise profile overlay numeric statistics
2021-07-25 12:20:38 +09:00
Dean Herbert
48120faeb2 Fix inability to join a multiplayer room which has no password 2021-07-24 19:21:16 +09:00
Lucas A
ff3d38de6f Localise accuracy display. 2021-07-23 22:37:08 +02:00
Dean Herbert
17168b8137 Fix authentication loss not handled correctly
This handles the case where on initial API connection, the server
responds with an `Unauthorized` response. It doesn't perform this same
checking/handling on every API request, which is probably what we want
eventually.

Opting to not address the full issue because I know this is going to be
a long one (see
05c50c0f6c/osu.Game/Online/API/APIAccess.cs (L233)).
2021-07-23 19:03:19 +09:00
Bartłomiej Dach
6dbdfcc70c
Fix room password not being percent-encoded in join request 2021-07-22 23:11:58 +02:00
Dean Herbert
57e5f5575a Fix derived API request types firing success when they shouldn't
The usual case of `virtual`/`override` being dangerous when logic is
added to the base implementation. As such, I've removed this completely.
2021-07-22 14:23:27 +09:00
Dan Balasescu
747c475b95
Merge pull request #13932 from peppy/fix-multiple-request-completion-states
Fix API request potentially firing failed events after completion
2021-07-21 15:11:03 +09:00
Bartłomiej Dach
1e634d9db0
Adjust user beatmap sections on profile overlay to match web 2021-07-20 21:55:17 +02:00
smoogipoo
b7c2d6b1ab Merge branch 'master' into add-password-support 2021-07-19 22:23:09 +09:00
smoogipoo
0a43e54dfc Fix request failing due to parameters 2021-07-19 21:24:22 +09:00
smoogipoo
a001e4aa16 Fix web request failing if password is null 2021-07-19 20:57:16 +09:00
Dean Herbert
80c2b1449b Fix API request potentially firing failed events after completion
Specifically, `Cancel()` calls were not thread safe. Due to a series of
events, `ListPollingComponent` could call `Cancel` from a non-update
thread, leading to a race condition where both a `Success` and `Fail`
event can be fired.

This is intended to be the simplest fix possible, locking and guarding
specifically on the callbacks. Further work could be done in the future
to improve the flow surrounding `pendingFailure`, potentially reducing
redundant work and cleaning up the code, but that's not happening here.

Closes https://github.com/ppy/osu/issues/13632.
2021-07-19 20:27:01 +09:00
smoogipoo
2eec524f27 Fix password not copied from multiplayer client 2021-07-19 20:20:08 +09:00
smoogipoo
2515785f93 Use room password to fill settings textbox 2021-07-19 20:03:32 +09:00
smoogipoo
063f14da98 Update test room manager to not return passwords 2021-07-19 20:03:27 +09:00
Dean Herbert
3c028ce05c Add IDeepCloneable interface and update existing CreateCopy methods to use it 2021-07-19 12:54:17 +09:00
Dean Herbert
125bd36ab1 Send password in request ctor directly 2021-07-13 14:27:07 +09:00
Dean Herbert
c5319c06c2 Add password attributes to CopyFrom to make testing work better 2021-07-12 18:54:07 +09:00
Dean Herbert
9f9d7f9125 Add remaining pieces of password flow (for osu-web join request) 2021-07-12 18:22:52 +09:00
Dean Herbert
f35d55c32f Fix HasPassword not being in sync with Password value for client-side rooms 2021-07-12 15:49:19 +09:00
Dean Herbert
08c40938db Add support for updating a room's password 2021-07-12 15:49:19 +09:00
Dean Herbert
5148069efe Update signatures in line with no-overload methods (unsupported by signalr) 2021-07-12 15:49:19 +09:00
Dean Herbert
2ca11d458a Add password to room settings and multiplayer lounge interface 2021-07-12 15:49:19 +09:00
Dean Herbert
6a74fde082 Add has_password flag and region post only parameters 2021-07-12 15:49:19 +09:00
Dean Herbert
4fd6f2101c Add password textbox input 2021-07-12 15:49:19 +09:00
Dean Herbert
0db316d644 Add password scaffolding 2021-07-12 15:49:19 +09:00
smoogipoo
ac26374a93 Merge branch 'master' into lounge-redesign 2021-07-12 13:54:42 +09:00
Jamie Taylor
2eb12a59b7
Rename function to be more accurate 2021-07-09 11:16:47 +09:00
Jamie Taylor
546f55d341
Change profile section expansion to use dropdown sounds 2021-07-08 20:23:11 +09:00
smoogipoo
14b6949456 Shorten room status messages 2021-07-07 14:47:24 +09:00
PercyDan54
e1c646b9b2
Remove redundant arguments 2021-07-05 23:52:39 +08:00
Dean Herbert
31dbc7798b Merge branch 'master' into linkify-metadata 2021-07-01 19:41:33 +09:00
smoogipoo
ca0eaab8e2 Add test 2021-06-29 16:30:46 +09:00
smoogipoo
7a86686f40 Make nullable 2021-06-29 16:30:40 +09:00
smoogipoo
9132c42f87 Fix actions posted to the wrong channel 2021-06-29 15:58:07 +09:00
Bartłomiej Dach
50c27d2635 Update usages of IHasTooltip in line with framework localisation changes 2021-06-25 19:10:04 +02:00
Joseph Madamba
6fda5e569a Fix beatmap discussion links wrongly leading to beatmap page 2021-06-20 21:37:00 -07:00
Dean Herbert
9495f87f04 Remove redundant NotNull attributes in nullable classes 2021-06-17 16:07:32 +09:00
Dean Herbert
fc442713bb Debounce schedule at base class 2021-06-14 14:26:40 +09:00
Dean Herbert
8dd48d48f6 Add support for song select leaderboard to handle newly imported scores 2021-06-14 14:20:23 +09:00
Dean Herbert
26312bf60a
Merge branch 'master' into chat-mention 2021-06-11 20:03:44 +09:00
Dean Herbert
8eab7df955 Move BindCollectionChanged out of async load 2021-06-11 17:51:58 +09:00
Dean Herbert
20759657de Rename configuration variables and refactor lots more 2021-06-11 16:37:31 +09:00
Dean Herbert
3d645608eb Remove nullability of DI dependencies and fix incorrect load order 2021-06-11 16:28:53 +09:00
Dean Herbert
139401a04a Inline and refactor overly verbose MessageNotifier code 2021-06-11 16:27:31 +09:00
Dean Herbert
061e3d7f26 Move legacy ScoreInfo to be completely based on presence of classic mod 2021-06-08 18:00:09 +09:00
Craftplacer
4925a7d59e
Minor code quality changes 2021-06-05 15:57:14 +02:00
Craftplacer
5e44329e0b
Add DummyAPIAccess request handler
Make CreateChannelRequest.channel public
2021-06-05 14:43:26 +02:00
Craftplacer
ce4bcda803
Use separate method for fetching channel objects
Resolves a pull request review
2021-06-05 14:02:48 +02:00
Craftplacer
39c3b08fc7
Merge remote-tracking branch 'upstream/master' into chat-mention 2021-06-05 11:18:06 +02:00
Craftplacer
b746fe7c03
Fix binding order 2021-06-05 11:03:49 +02:00
Bartłomiej Dach
5f5f3a8c5c General comment cleanups 2021-06-03 14:20:52 +02:00
Bartłomiej Dach
b2cc2a51ec Rename method to be less misleading
Would rather avoid variations of Equals/Equal/IsEqual. There's not
really much equality involved as the types are different.
2021-06-03 14:13:01 +02:00
Bartłomiej Dach
e8c2483f19 Use standard list instead of bindable list
No reason to use a bindable list there, as `CollectionChanged` was never
subscribed to.
2021-06-03 14:09:52 +02:00
Bartłomiej Dach
8193691cbc Invert condition to reduce nesting 2021-06-03 14:09:52 +02:00
Dean Herbert
a6cc37eb3b Mark fields readonly 2021-06-03 14:56:21 +09:00
Dean Herbert
4a5d8215f3
Merge branch 'master' into keyboard_shortcuts 2021-06-03 14:47:40 +09:00
Dean Herbert
1f8abcdf6c Merge branch 'master' into fix-relative-link-resolution 2021-06-01 16:49:02 +09:00
Dean Herbert
dce24e3d4d
Merge pull request #12950 from gagahpangeran/osu-wiki-overlay
Initial implementation of Wiki Overlay
2021-06-01 15:20:56 +09:00
Dean Herbert
a9f4bc6285 Never return a null argument
Enable nullable
2021-06-01 14:11:17 +09:00
Dean Herbert
111bfd4d88 Fix relative URLs having a null argument after resolution to LinkDetails 2021-06-01 13:50:20 +09:00
smoogipoo
bca8a9ea53 Fix HandleFrame crashing when not playing 2021-05-31 10:02:02 +09:00
Craftplacer
b3ac67675e
Merge branch 'chat-mention' of github.com:Craftplacer/osu into chat-mention 2021-05-27 21:59:51 +02:00
Craftplacer
13b2b7c148
Fix formatting 2021-05-27 21:58:54 +02:00
Craftplacer
0b17af81f1
Use Contains instead of IndexOf
Co-authored-by: Berkan Diler <b.diler@gmx.de>
2021-05-27 09:48:30 +00:00
Dean Herbert
aa23c4a4b9
Merge branch 'master' into keyboard_shortcuts 2021-05-27 16:30:34 +09:00
Craftplacer
a679efac1c
Reduce duplicate notification code by making a base class 2021-05-27 01:00:26 +02:00
Craftplacer
cf39e58ce7
Subscribe to CollectionChanged before binding to JoinedChannels 2021-05-27 01:00:08 +02:00
Craftplacer
d47370bac9
Locally bind to LocalUser 2021-05-27 00:59:29 +02:00
Gagah Pangeran Rosfatiputra
905364b5fe
add url as argument for link action external 2021-05-26 19:34:34 +07:00
Dean Herbert
52ca2f4797 Merge branch 'master' into chat-mention 2021-05-26 16:00:26 +09:00
Dean Herbert
20f890cfd0
Merge branch 'master' into fix-spectator-playing-state-5 2021-05-21 16:49:22 +09:00
Dean Herbert
1c560a9490
Merge pull request #12869 from EVAST9919/sidebar
Add sidebar to news overlay
2021-05-21 16:21:18 +09:00
smoogipoo
7c59fb37f1 Move check into callback 2021-05-21 16:00:58 +09:00
smoogipoo
36aa186c6e Merge branch 'thread-safe-spectator-client' 2021-05-21 16:00:24 +09:00
smoogipoo
7f712a4d04 Fix EndPlaying potentially doing cross-thread mutation 2021-05-21 15:57:39 +09:00
smoogipoo
2fdf8aa1aa Add update thread assertions 2021-05-21 15:57:31 +09:00
smoogipoo
895eb14c5a Forcefully end playing to fix test failures 2021-05-21 14:09:30 +09:00
Andrei Zavatski
bd80cf656a Merge remote-tracking branch 'refs/remotes/ppy/master' into sidebar 2021-05-20 15:41:08 +03:00
smoogipoo
e3284b976d Merge branch 'thread-safe-spectator-client' into fix-spectator-playing-state-5 2021-05-20 19:46:26 +09:00
smoogipoo
06c99e8c7c Fix race due to StopWatchingUser() being called asynchronously 2021-05-20 19:45:31 +09:00
smoogipoo
7ee81669f7 Remove bind helpers from SpectatorClient 2021-05-20 19:27:43 +09:00
smoogipoo
b515fe3cb1 Fix playing user state not removed on stop watching 2021-05-20 19:20:09 +09:00
smoogipoo
89b4f69588 Expose playing user states as bindable dictionary 2021-05-20 19:19:39 +09:00
smoogipoo
2896da499d Merge branch 'restructure-spectator-client' into thread-safe-spectator-client 2021-05-20 18:53:54 +09:00
smoogipoo
a74405d0ed Merge branch 'master' into restructure-spectator-client 2021-05-20 18:53:42 +09:00
smoogipoo
10597f7e6a Remove locking from SpectatorClient 2021-05-20 18:37:27 +09:00
smoogipoo
6eff8d513e Annotate nullables 2021-05-20 17:51:09 +09:00
smoogipoo
df80531a0a Split online connectivity into OnlineSpectatorClient 2021-05-20 16:30:56 +09:00
smoogipoo
6beeb7f7c4 Rename SpectatorStreamingClient -> SpectatorClient 2021-05-20 15:55:07 +09:00
smoogipoo
d197a7f6f5 Rename multiplayer client classes 2021-05-20 15:39:45 +09:00
Dean Herbert
9267d23dc2 Make year nullable rather than defaulting to zero 2021-05-20 15:23:49 +09:00
Andrei Zavatski
16ffedde8a Add year parameter to GetNewsRequest 2021-05-19 15:17:57 +03:00
Andrei Zavatski
24af86689f Merge remote-tracking branch 'refs/remotes/ppy/master' into news-sidebar-new 2021-05-18 22:18:52 +03:00
smoogipoo
5f94b3bdac Remove legacy playlist item ID handling 2021-05-18 21:03:59 +09:00
smoogipoo
e3b8d8ee18 Add support for overlay-coloured links 2021-05-17 16:58:54 +09:00
Gagah Pangeran Rosfatiputra
f2de28814a
add and handle OpenWiki link action 2021-05-17 00:43:59 +07:00
Andrei Zavatski
881d82ccb6 Merge remote-tracking branch 'refs/remotes/ppy/master' into news-sidebar-new 2021-05-15 19:08:48 +03:00
Bartłomiej Dach
5b2b701915 Ignore possible null in GetResponseString()
A null there indicates a deserialisation error and therefore due to the
catch block immediately succeeding the changed line everything will
continue to work as intended.
2021-05-15 00:09:34 +02:00
Bartłomiej Dach
aaa7c7eb05 Handle null case explicitly in SpectatorState.Equals()
Uses the usual pattern of two `ReferenceEquals` checks against `this`
and `null` before proceeding to inspect field values. Doing this causes
the compiler to infer that at the point that field values are checked,
`other` can no longer viably be `null`.
2021-05-14 23:58:07 +02:00
Andrei Zavatski
13a956f6fc Merge remote-tracking branch 'refs/remotes/ppy/master' into news-sidebar-new 2021-05-12 20:08:17 +03:00
smoogipoo
f4c96b2675 Only update playing user states when users are watched 2021-05-12 13:10:59 +09:00
smoogipoo
ad11818868 Remove watched users on stop watching 2021-05-12 13:05:02 +09:00
smoogipoo
10a4a5decb Merge branch 'master' into multiplayer-spectator-screen 2021-05-11 17:33:09 +09:00
Andrei Zavatski
4b97224932 Implement NewsSideBar component 2021-05-10 09:53:52 +03:00
Bartłomiej Dach
fe86ee629e Fix temp files from beatmap listing imports not being cleaned up
As reported in #12718, it turns out that temporary files from beatmap
set downloads performed via the beatmap listing overlay could remain in
the user's filesystem even after the download has concluded.

The reason for the issue is a failure in component integration.
In the case of online downloads, files are first downloaded to a
temporary directory (`C:/Temp` or `/tmp`), with a randomly generated
filename, which ends in an extension of `.tmp`.

On the other side, `ArchiveModelManager`s have a `ShouldDeleteArchive()`
method, which determines whether a file should be deleted after
importing. At the time of writing, in the case of beatmap imports the
file is only automatically cleaned up if the extension of the file is
equal to `.osz`, which was not the case for temporary files.

As it turns out, `APIDownloadRequest` has a facility for adjusting the
file's extension, via the protected `FileExtension` property. Therefore,
use it in the case of `DownloadBeatmapSetRequest` to specify `.osz`,
which then will make sure that the `ShouldDeleteArchive()` check in
`BeatmapManager` picks it up for clean-up.
2021-05-08 17:09:14 +02:00
smoogipoo
f8f9cf9412 Merge branch 'fix-initial-playingusers' into multiplayer-spectator-screen 2021-04-22 23:25:25 +09:00
smoogipoo
f593d9e42c Fix playing users not being updated on room join 2021-04-22 23:23:43 +09:00
smoogipoo
6df23f1301 Merge branch 'master' into multiplayer-spectator-screen 2021-04-22 20:29:24 +09:00
Dan Balasescu
b774f5b72b
Merge pull request #12526 from peppy/fix-system-message-ordering
Fix system messages always being displayed above standard messages
2021-04-22 18:51:25 +09:00
Dean Herbert
3befb49ea9 Fix system messages always being displayed above standard messages
Closes https://github.com/ppy/osu/issues/12509.
2021-04-22 14:52:01 +09:00
smoogipoo
4cc3321d54 Fix potential doubling of events 2021-04-20 21:20:08 +09:00
Gagah Pangeran Rosfatiputra
d4013bd885
add GetWikiRequest 2021-04-20 16:40:30 +07:00
Gagah Pangeran Rosfatiputra
f3555ad08c
add APIWikiPage response 2021-04-20 16:12:32 +07:00
smoogipoo
c50b526ba0 Remove local state dictionary from SpectatorScreen 2021-04-19 16:48:55 +09:00
smoogipoo
83716ddb08 Rename currentUserStates -> playingUserStates 2021-04-19 16:07:00 +09:00
smoogipoo
de9e37857e Lock around playingUsers 2021-04-19 16:06:40 +09:00
smoogipoo
5885c24e00 Clear current user states on disconnect 2021-04-19 16:00:56 +09:00
smoogipoo
65a6f9f8a4 Merge branch 'fix-initial-spectator-state-callback' into multiplayer-spectator-screen 2021-04-16 18:26:46 +09:00
smoogipoo
ca74f413cd Change to explicit method instead 2021-04-16 17:31:02 +09:00
smoogipoo
5652490d61 Fix OnUserBeganPlaying not being invoked if already watching 2021-04-16 14:11:55 +09:00
smoogipoo
56e1bffdfd Populate initial user states 2021-04-13 23:57:16 +09:00
smoogipoo
5b53a2b211 Merge branch 'master' into multiplayer-spectator-screen 2021-04-13 20:07:56 +09:00
Salman Ahmed
92fab653e1 Take current mod settings value into account on equality comparsion 2021-04-12 20:51:13 +03:00
Salman Ahmed
fbd5195738 Extract mod setting value handling to utils class 2021-04-12 03:37:03 +03:00
Salman Ahmed
18fb9f5ac9
Merge branch 'master' into mod-using-reference-equality 2021-04-11 19:48:55 +03:00
smoogipoo
6eddc6c59e Enable spectating multiplayer matches 2021-04-09 21:03:50 +09:00
Dean Herbert
51fee79ef1 Fix scores not being accepted due to missing ruleset ID 2021-04-09 15:18:02 +09:00
Dean Herbert
24ae5b9169 Fix slightly incorrect solo score submission routes 2021-04-08 23:15:08 +09:00
smoogipoo
2791d454d2 Don't send spectating user state yet 2021-04-07 22:21:22 +09:00
smoogipoo
99bee73ac1 Merge branch 'master' into add-spectate-button-and-state 2021-04-07 22:07:52 +09:00
smoogipoo
56c13148f1 Fix typo in class name 2021-04-07 16:45:10 +09:00
smoogipoo
6de91d7b6b Add spectate button + test 2021-04-06 21:37:27 +09:00
smoogipoo
d5ba77b2c2 Add spectating user state 2021-04-06 21:22:28 +09:00
Dan Balasescu
ba3689b5b9
Merge pull request #12269 from PercyDan54/beatmap-details
Use OnlineViewContainer for BeatmapDetails
2021-04-06 17:52:32 +09:00
Dean Herbert
933c4010da Allow creating OnlineViewContainers with no placeholder button 2021-04-06 16:17:20 +09:00
PercyDan54
d4724f4494
Fix crash 2021-04-04 09:44:45 +08:00
smoogipoo
e1aa927827 Add dropdown option to export score 2021-04-02 13:20:15 +09:00
Dean Herbert
0a889fafc4 Don't send progress updates when not in a downloading state
This is mostly just a sanity/debounce check.
2021-03-26 14:04:40 +09:00
Dean Herbert
17a0b19ee7 Always set progress before updating download state
Without doing so, a state change may read from an old progress value.
2021-03-26 14:04:10 +09:00
Max Hübner
aa2c1ee85e Add new beatmap search filter row "General" 2021-03-25 23:20:10 +01:00
Dean Herbert
5267fb74c4 Add submission requests 2021-03-23 18:18:49 +09:00
Dean Herbert
aeff9bd853 Add return bool to HandleRequest to better trigger failures 2021-03-23 18:17:29 +09:00
Dean Herbert
ce452565f4 Avoid firing any kind of failures after success 2021-03-23 17:50:31 +09:00
Dean Herbert
f5ba746ae5 Fail all API requests sent to DummyAPIAccess
Until now, API requests sent to dummy API were just lost in the void. In most cases this somehow worked as expected, but any logic which is waiting on a request to finish will potentially never get a response.

Going forward, I'm not 100% sure that every `Wait` on a web response will have local timeout logic (I think there is a certain amount of assumption that this is being managed for us by `APIAccess`), so I've made this change to better handle such cases going forward. Now, rather than nothing happening, requests will trigger a failure via the existing exception logic rather than silently pretending the request never arrived.
2021-03-23 17:37:45 +09:00
Dean Herbert
58c60100b4 Fix APIScoreToken's data type not matching server side 2021-03-23 14:04:47 +09:00
smoogipoo
7fa5fd5647 Update usages of config with framework changes 2021-03-17 16:10:16 +09:00
Dan Balasescu
ff2327ffac
Merge branch 'master' into configure-await-false 2021-03-08 22:24:29 +09:00
Dean Herbert
b1cd01ceb8 Apply ConfigureAwait changes to game side 2021-03-08 14:36:35 +09:00
Dean Herbert
765cc5cf37 Remove iOS multiplayer blocking code 2021-03-08 14:35:22 +09:00
smoogipoo
7adb33f40e Fix beatmap getting nulled due to failing web request 2021-03-01 17:24:54 +09:00
Dean Herbert
254f9bb58b Show API human readable error message when chat posting fails
Closes #11902.
2021-02-26 13:38:00 +09:00
Dean Herbert
9ed8d902f7 Fix requests being indefinitely queued when user is offline 2021-02-24 19:57:42 +09:00
Dean Herbert
664d243003 Disable multiplayer/spectator on iOS until it can be supported again 2021-02-23 15:22:46 +09:00
smoogipoo
d985b8ab2a Increase beatmapset download timeout 2021-02-22 17:14:39 +09:00
Dean Herbert
a2aec6bcdc
Merge pull request #11808 from smoogipoo/multiplayer-no-playlist-mangling
Rework multiplayer playlist handling to support multiple items
2021-02-19 14:33:53 +09:00
smoogipoo
c0e0bd4f42 Add compatibility with old server build 2021-02-19 13:57:04 +09:00
smoogipoo
183a481a34 Refactor playlist update to remove .Contains() check 2021-02-19 13:32:32 +09:00
Dean Herbert
71316bbee5 Allow using OnlineViewContainer without deriving it 2021-02-18 17:45:58 +09:00
smoogipoo
56e9e10ff5 Make server authoritative in playlist item id 2021-02-18 15:30:31 +09:00
smoogipoo
8930ff4465 Merge branch 'master' into multiplayer-no-playlist-mangling 2021-02-17 19:29:01 +09:00
smoogipoo
70a995919c Update comments 2021-02-17 17:58:24 +09:00
smoogipoo
0d1149911c Don't display expired playlist items 2021-02-17 17:33:10 +09:00
smoogipoo
fb0e9d6760 Add played property to playlist item 2021-02-17 16:58:32 +09:00
Dean Herbert
86faa7f465
Merge pull request #11798 from smoogipoo/multiplayer-long-types
Use long type where required in multiplayer
2021-02-17 15:50:12 +09:00
smoogipoo
9a7b6ebe50 Fix missed occurrence 2021-02-17 14:30:52 +09:00
smoogipoo
f61b8e6154 Change to long 2021-02-16 21:32:38 +09:00
smoogipoo
100097d78f Fix playlist not being handled correctly for non-joined cases 2021-02-16 21:32:35 +09:00
smoogipoo
379393fe10 Merge branch 'multiplayer-long-types' into multiplayer-no-playlist-mangling 2021-02-16 19:37:55 +09:00