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.

Sign up for GitHub

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

Jump to bottom

Discord rpc tweaks (3205 successor) #3216

Merged
merged 29 commits into from Oct 24, 2023
Merged

Discord rpc tweaks (3205 successor) #3216

merged 29 commits into from Oct 24, 2023

Conversation

tederis
Copy link
Collaborator

@tederis tederis commented Oct 23, 2023

This PR is based on PR #3205 and implements additional suggestions and minor improvements.

Lpsd and others added 27 commits October 23, 2023 13:46
@Lpsd @tederis
Add server name to presence state
d5ce7df 
Also fixes some edge cases where the rich presence won't be displayed properly (after enabling it for the first time, or when disconnecting from a server)
@Lpsd @tederis
Remove unused method in CDiscordRichPresence
d33913c
@Lpsd @tederis
Modify state formatting
0220b63
@Lpsd @tederis
Move CCore::GetLastConnectedServerName definition to header
48a6457
@Lpsd @tederis
Allow setting start time & party size via Lua
0b59104
@Lpsd @tederis
Remove unnecessary check
e3edcd1
@Lpsd @tederis
Change logic of SetStartTime
59def90
@Lpsd @tederis
Rename variable
33ffbd5 
Probably should refactor all this Discord code to not use Hungarian notation tbh
@Lpsd @tederis
Swap CCore::GetSingleton usage for g_pCore
89d022d
@Lpsd @tederis
Use details instead of state for server name
8f99d74
@Lpsd @tederis
Add some more default states (walking, driving, dead)
3f8df64
@Lpsd @tederis
Allow custom state to be empty in order to reset it
58d4291 
This will allow servers to revert to using the built-in/default states
@Lpsd @tederis
Add setDiscordRichPresenceEndTime
6ffa60b
@Lpsd @tederis
Add missing OOP method for setDiscordRichPresenceEndTime
6e6cbe5
@Lpsd @tederis
Allow all string values to be empty/reset
c1de4f7
@Lpsd @tederis
Remove unnecessary presence updates
c5ddcdc 
We handle presence state updates primarily in CClientGame::DoPulsePostFrame() now
@Lpsd @tederis
Set Discord state update rate to 15
4628d69
@Lpsd @tederis
Add new default states based on player tasks
a0b1ee5
@Lpsd @tederis
Use std::optional in STaskState
b8c7077 
Requires moving to Client Deathmatch due to Game SA not supporting C++17
@Lpsd @tederis
Update CDiscordRichPresence.cpp
6d5d08f
@Lpsd @tederis
Update BitStream check in CPacketHandler::Packet_ServerJoined
c74d60e
@Lpsd @tederis
Use unordered_multimap
19b14b7
@Lpsd @tederis
Address code review
bf14d1f
@Lpsd @tederis
Revert GetTickCount64_ usage where unix epoch necessary
dd4a38d
@Lpsd @tederis
Addendum to previous commit
7543ad6
@Lpsd @tederis
Update g_vehicleTypePrefixes order
ee3b6c9
@tederis
Implement suggestions and minor code improvements
da65173
@tederis tederis mentioned this pull request Oct 23, 2023
Closed
Dutchman101
Dutchman101 approved these changes Oct 24, 2023
View reviewed changes
Copy link
Member

@Dutchman101 Dutchman101 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For details on its approval, read back the discussion (past week) on dev discord

@Dutchman101 Dutchman101 merged commit ef26810 into multitheftauto:master Oct 24, 2023
6 checks passed
MTABot pushed a commit that referenced this pull request Oct 24, 2023
@github-actions
Synchronize changes from 1.6 master branch [ci skip]
b79b40f 
ef26810 Discord RPC (Discord Rich Presence) tweaks (#3216)
063b236 Update client en_US pot
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Dutchman101 Dutchman101 Dutchman101 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@tederis @Dutchman101 @Lpsd