Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve #2855 and #2856 #2854

Merged
merged 4 commits into from Dec 18, 2022
Merged

Resolve #2855 and #2856 #2854

merged 4 commits into from Dec 18, 2022

Conversation

Marc-Spector
Copy link
Collaborator

@Marc-Spector Marc-Spector commented Nov 29, 2022

Closes #2855
Closes #2856

@codecov
Copy link

codecov bot commented Nov 29, 2022

Codecov Report

Merging #2854 (e7bd031) into develop (46507ac) will decrease coverage by 0.01%.
The diff coverage is 53.33%.

Additional details and impacted files
@@              Coverage Diff              @@
##             develop    #2854      +/-   ##
=============================================
- Coverage      65.43%   65.41%   -0.02%     
  Complexity      5095     5095              
=============================================
  Files            553      553              
  Lines          20794    20795       +1     
  Branches        1167     1168       +1     
=============================================
- Hits           13606    13604       -2     
- Misses          6505     6508       +3     
  Partials         683      683              
Impacted Files Coverage Δ
...in/java/com/faforever/client/chat/ChatChannel.java 87.50% <ø> (ø)
.../java/com/faforever/client/fx/PlatformService.java 4.13% <0.00%> (-0.03%) ⬇️
...m/faforever/client/game/CustomGamesController.java 63.11% <ø> (-0.60%) ⬇️
...om/faforever/client/chat/ChannelTabController.java 87.84% <42.85%> (-1.49%) ⬇️
...om/faforever/client/game/GameDetailController.java 84.76% <60.00%> (ø)
...om/faforever/client/game/GamesTableController.java 69.67% <100.00%> (+0.56%) ⬆️
...va/com/faforever/client/login/LoginController.java 88.44% <100.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 46507ac...e7bd031. Read the comment docs.

@Marc-Spector
Copy link
Collaborator Author

Fixed error messages when updating the topic if try to reconnect the chat

java.lang.IllegalArgumentException: Chat user 'DaphnewenSiwaona' is unknown for channel '#russian'
	at com.faforever.client.chat.KittehChatService.lambda$getOrCreateChatUser$9(KittehChatService.java:203)
	at java.base/java.util.Optional.orElseThrow(Optional.java:403)
	at com.faforever.client.chat.KittehChatService.getOrCreateChatUser(KittehChatService.java:203)
	at com.faforever.client.chat.ChannelTabController.getMessageCssClass(ChannelTabController.java:302)
	at com.faforever.client.chat.AbstractChatTabController.renderHtml(AbstractChatTabController.java:627)
	at com.faforever.client.chat.AbstractChatTabController.appendChatMessageSection(AbstractChatTabController.java:577)
	at com.faforever.client.chat.AbstractChatTabController.addMessage(AbstractChatTabController.java:539)
	at com.faforever.client.chat.AbstractChatTabController.lambda$onChatMessage$22(AbstractChatTabController.java:507)
	at com.faforever.client.fx.JavaFxUtil.runLater(JavaFxUtil.java:484)
	at com.faforever.client.chat.AbstractChatTabController.onChatMessage(AbstractChatTabController.java:506)
	at com.faforever.client.chat.ChannelTabController.updateChannelTopic(ChannelTabController.java:218)
	at com.sun.javafx.application.PlatformImpl.lambda$runLater$10(PlatformImpl.java:457)
	at java.base/java.security.AccessController.doPrivileged(AccessController.java:399)
	at com.sun.javafx.application.PlatformImpl.lambda$runLater$11(PlatformImpl.java:456)
	at com.sun.glass.ui.InvokeLaterDispatcher$Future.run(InvokeLaterDispatcher.java:96)
	at com.sun.glass.ui.win.WinApplication._runLoop(Native Method)
	at com.sun.glass.ui.win.WinApplication.lambda$runLoop$3(WinApplication.java:184)
	at java.base/java.lang.Thread.run(Thread.java:833)

java.lang.IllegalArgumentException: Chat user 'Tex' is unknown for channel '#aeolus'
	at com.faforever.client.chat.KittehChatService.lambda$getOrCreateChatUser$9(KittehChatService.java:203)
	at java.base/java.util.Optional.orElseThrow(Optional.java:403)
	at com.faforever.client.chat.KittehChatService.getOrCreateChatUser(KittehChatService.java:203)
	at com.faforever.client.chat.ChannelTabController.getMessageCssClass(ChannelTabController.java:302)
	at com.faforever.client.chat.AbstractChatTabController.renderHtml(AbstractChatTabController.java:627)
	at com.faforever.client.chat.AbstractChatTabController.appendChatMessageSection(AbstractChatTabController.java:577)
	at com.faforever.client.chat.AbstractChatTabController.addMessage(AbstractChatTabController.java:539)
	at com.faforever.client.chat.AbstractChatTabController.lambda$onChatMessage$22(AbstractChatTabController.java:507)
	at com.faforever.client.fx.JavaFxUtil.runLater(JavaFxUtil.java:484)
	at com.faforever.client.chat.AbstractChatTabController.onChatMessage(AbstractChatTabController.java:506)
	at com.faforever.client.chat.ChannelTabController.updateChannelTopic(ChannelTabController.java:218)
	at com.sun.javafx.application.PlatformImpl.lambda$runLater$10(PlatformImpl.java:457)
	at java.base/java.security.AccessController.doPrivileged(AccessController.java:399)
	at com.sun.javafx.application.PlatformImpl.lambda$runLater$11(PlatformImpl.java:456)
	at com.sun.glass.ui.InvokeLaterDispatcher$Future.run(InvokeLaterDispatcher.java:96)
	at com.sun.glass.ui.win.WinApplication._runLoop(Native Method)
	at com.sun.glass.ui.win.WinApplication.lambda$runLoop$3(WinApplication.java:184)
	at java.base/java.lang.Thread.run(Thread.java:833)

@Sheikah45
Copy link
Member

Can I get a more descriptive title?

@Marc-Spector
Copy link
Collaborator Author

I cannot think of a more descriptive title. Should I split the PR into several parts?

@Sheikah45
Copy link
Member

No I guess I can just come up with something when I merge it

Sheikah45
Sheikah45 previously approved these changes Nov 30, 2022
@Sheikah45
Copy link
Member

Can you fix the conflicts?

@Marc-Spector
Copy link
Collaborator Author

Rebased and resolved the conflicts

@Sheikah45 Sheikah45 changed the title Minor fixes Resolve #2855 and #2856 Dec 18, 2022
@Sheikah45 Sheikah45 merged commit f3c1f1c into develop Dec 18, 2022
@Sheikah45 Sheikah45 deleted the bugfix/chat branch December 18, 2022 14:43
@Marc-Spector
Copy link
Collaborator Author

I did not know it was possible to use such the title. 😅

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
3 participants