Add initial Discord Game SDK Integration #1031

0x416c69 · 2019-07-24T19:34:45Z

As discussed in #721 I've implemented it.

There is a new library added to the mta path, called discord_game_sdk.dll
I think there should be client verification for this, I'm not sure.

Also it's best to request Discord for the official MTA:SA game so we can use spectate feature too.

My friend @Deihim007 suggested this in the first place.

Ali Gerami.

0x416c69 · 2019-07-24T19:40:34Z

Client/core/CDiscordManager.cpp

+        std::lock_guard<std::mutex> guardian(m_threadSafety);
+        m_storedActivity.SetDetails("Retrieving server name...");
+        m_storedActivity.GetAssets().SetSmallText(SString("Connected to %s:%i", *ipaddr, port));
+        m_storedActivity.GetAssets().SetSmallImage("a-server"); // TODO: Maybe contact with MTA:SA servers and check if this ip is a premium one containing a small image to set using this function


Maybe from https://mtasa.com/toplist/ ?

Discord have a limit of 150 images that you can upload.

Client/core/premake5.lua

jushar

Thank you very much for the pull request! Overall, it looks very good.

I commented on a few minor issues, but haven't fully reviewed it yet.

Client/core/CCore.cpp

Client/core/CCore.h

Client/core/CDiscordManager.cpp

Client/core/CDiscordManager.h

Client/core/CQueryReceiver.cpp

Client/core/StdInc.h

jushar · 2019-07-25T07:45:40Z

Server/mods/deathmatch/logic/CGame.cpp

+        CLuaArguments Arguments;
+        Arguments.PushBoolean(true);
+        Arguments.PushString(joinSecret);
+        Player.CallEvent("onPlayerDiscordJoin", Arguments);


I'd maybe generalize this a bit to something like onPlayerMessengerJoin to be not too tightly coupled to Discord.

The signature may be something like: string messengerType, bool justConnected, string secret.

Perhaps the third argument could be a table that can change depending on the "messenger"? Is "messenger" correct terminology here? Not sure.

onPlayerExternalJoin maybe?

Shared/sdk/SharedUtil.Thread.h

Client/core/CCore.cpp

sbx320 · 2019-07-25T08:18:57Z

Client/core/CDiscordManager.cpp

+
+CDiscordManager::~CDiscordManager()
+{
+    m_bSuicide = true;


This look very hacky. Not sure how to do this more nicely though

The only other way is signals I guess

Client/core/CDiscordManager.cpp

Client/core/ServerBrowser/CServerList.cpp

Client/mods/deathmatch/logic/CClientGame.cpp

Shared/mods/deathmatch/logic/Enums.cpp

0x416c69 · 2019-07-30T13:47:27Z

So as you guys stopped reviewing this, I'll adjust the necessary modifications to the PR.

Edit: There you have it.

qaisjp · 2019-08-18T18:33:55Z

Seems to work well, with a few minor catches!

Doesn't seem to compile on Windows without modification (i.e. copying a lib file from https://dl-game-sdk.discordapp.net/latest/discord_game_sdk.zip into vendor/discordgsdk/lib).

Please can you fix this?

Things that worked great

activity message when loading game / in menu
activity message when joining a server
activity message when ingame
activity message disappears when you disable rich presence whilst ingame
activity message disappears when you disable rich presence whilst in menu

Something odd

The discord activity message does not reappear after you enable rich presence, it only appears when you join a server. (Does not say "In Main Menu" when you disconnect from a server either!)

0x416c69 · 2019-08-18T20:33:07Z

The discord activity message does not reappear after you enable rich presence, it only appears when you join a server.

Well, it will be enabled in 15 seconds or less, it will use the "reconnecting" feature for reappearing which will be done in every 15 sec. (Thought it's better to prevent user spamming enable/disable)

(Does not say "In Main Menu" when you disconnect from a server either!)

Are you sure? It works for me.

Please can you fix this?

Why not.

Also things that you may have missed:

Closing and opening discord after the game is opened
Backward compatibility check

Also allow it through .gitignore

…a-blue into discordintegration

qaisjp · 2019-08-18T21:00:18Z

Well, it will be enabled in 15 seconds or less, it will use the "reconnecting" feature for reappearing which will be done in every 15 sec. (Thought it's better to prevent user spamming enable/disable)

Okay!

(Does not say "In Main Menu" when you disconnect from a server either!)

I meant after you turned the feature off and on again. So this doesn't matter anymore.

Also things that you may have missed:

Closing and opening discord after the game is opened

Backward compatibility check

Yep, can confirm the first one works. Haven't tried backwards compat.

0x416c69 · 2020-01-31T05:15:23Z

156cdf9 should have done the job.

Can you test it for once more?

0x416c69 · 2020-02-11T19:58:59Z

@qaisjp I confirm that the bug you reported is now fixed. (Thanks to @StrixG)

Server/mods/deathmatch/logic/luadefs/CLuaPlayerDefs.cpp

Also disallow to use party max than the max players value

Also do not download discord again when it is already up to date

qaisjp

This looks ready to merge.

The Lua API will need changing but I'm happy for us to say something like this on the wiki:

This is function is experimental and you should first check that the function exists before using it. The function can be removed at any time.
if onPlayerDiscordJoin then
    onPlayerDiscordJoin(...)
end

I'll give it a little bit of time for one of @multitheftauto/blue-collaborators to send a secondary approval, because it's many lines of code.

If someone merges this, please squash merge, a couple of large files have been deleted and shouldn't end up in `master`.

qaisjp · 2020-02-12T12:25:45Z

utils/buildactions/install_discord.lua

 		if os.isfile(archive_path) and os.md5_file(archive_path) == DISCORD_MD5 then
 			print("Discord Game SDK is up to date.")
-			download_discord = false
+			return


It was like this before, but I found that if you delete the other files but keep the .zip, it won't re-add the other files.

I think CEF has the same issue, so I don't mind if both do.

qaisjp · 2020-03-14T20:31:22Z

repeating for loudness

If someone merges this, please squash merge, a couple of large files have been deleted and shouldn't end up in `master`.

qaisjp · 2020-03-22T18:48:17Z

I am merging this in 1 week if nobody else reviews this

ghost · 2020-03-25T14:09:11Z

@qaisjp The PR looks good. Let's go for the merge!

0x416c69 added 5 commits July 24, 2019 23:43

Add Discord Game SDK library

6358b21

Add shared part of discord game sdk integration

bf7a7d1

Add client part of discord game sdk integration

caf7a50

Add server part of discord game sdk integration

9b63cf5

Resolve conflicts created by 4244ec5

a0c001d

0x416c69 commented Jul 24, 2019

View reviewed changes

patrikjuvonen added the enhancement New feature or request label Jul 24, 2019

patrikjuvonen reviewed Jul 24, 2019

View reviewed changes

Client/core/premake5.lua Outdated Show resolved Hide resolved

jushar reviewed Jul 25, 2019

View reviewed changes

sbx320 requested changes Jul 25, 2019

View reviewed changes

0x416c69 commented Jul 26, 2019

View reviewed changes

Shared/mods/deathmatch/logic/Enums.cpp Show resolved Hide resolved

0x416c69 and others added 12 commits July 30, 2019 18:57

Make changes/Correct mistakes according to reviews

8e0bd9e

Merge branch 'master' into feature/discord-rich-presence

f0792de

Merge branch 'master' into discordintegration

14979e4

Move DISCORD_CLIENT_ID to CDiscordManager.cpp

1e6e308

discord: change SetLargeImage asset key

323fb64

discord: change neutral activity message

1901c11

discord: add start timestamp to main menu

58aeddd

discord: use time(&time_t)

1ef02be

addendum to 1ef02be

5b3a347

Minor style improvements

1344873

Run format document/selection on changed files

4c867a9

Remove unnecessary null check

0d1f1d6

0x416c69 added 2 commits August 19, 2019 01:04

Add discord game sdk library

765a82f

Also allow it through .gitignore

Merge branch 'discordintegration' of https://github.com/0x416c69/mtas…

129b84c

…a-blue into discordintegration

Merge branch 'master' into discordintegration

a174747

Fix a minor mistake

f7f74d8

StrixG reviewed Feb 11, 2020

View reviewed changes

Server/mods/deathmatch/logic/luadefs/CLuaPlayerDefs.cpp Outdated Show resolved Hide resolved

0x416c69 and others added 5 commits February 12, 2020 00:05

Use luaL_error

d473604

Also disallow to use party max than the max players value

update out of date dll

75ee065

Add discord download script

8273615

Link correct library

1515f9d

Also do not download discord again when it is already up to date

Add discord dll to installer

3c0443e

qaisjp approved these changes Feb 12, 2020

View reviewed changes

qaisjp reviewed Feb 12, 2020

View reviewed changes

Merge branch 'master' into discordintegration

f7a19d2

qaisjp requested a review from a team February 29, 2020 15:51

Lpsd mentioned this pull request Mar 6, 2020

MTA Discord Rich Presence #1280

Closed

qaisjp added 2 commits March 14, 2020 20:29

Update DISCORD_BASEURL

858bbab

Merge branch 'master' into discordintegration

b642481

Merge branch 'master' into discordintegration

6d8d7ef

qaisjp modified the milestones: 1.6, Backlog Mar 23, 2020

ghost approved these changes Mar 25, 2020

View reviewed changes

qaisjp changed the title ~~Discord Game SDK Integration (Rich Presence & Join features for now)~~ Add initial Discord Game SDK Integration Mar 25, 2020

qaisjp merged commit 850c76d into multitheftauto:master Mar 25, 2020

qaisjp removed the request for review from sbx320 March 25, 2020 18:54

qaisjp mentioned this pull request Mar 30, 2020

Discord Rich Presence #721

Closed

Deihim007 mentioned this pull request Mar 22, 2022

Add discord-rpc #2577

Closed

18 tasks

Uh oh!

Uh oh!

Add initial Discord Game SDK Integration #1031

Add initial Discord Game SDK Integration #1031

Uh oh!

Conversation

0x416c69 commented Jul 24, 2019

Uh oh!

0x416c69 Jul 24, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

jushar left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jushar Jul 25, 2019

Choose a reason for hiding this comment

Uh oh!

qaisjp Jul 25, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

0x416c69 Jul 25, 2019

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

sbx320 Jul 25, 2019

Choose a reason for hiding this comment

Uh oh!

0x416c69 Jul 25, 2019

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

0x416c69 commented Jul 30, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

qaisjp commented Aug 18, 2019

Uh oh!

0x416c69 commented Aug 18, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

qaisjp commented Aug 18, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

0x416c69 commented Jan 31, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

0x416c69 commented Feb 11, 2020

Uh oh!

Uh oh!

qaisjp left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

If someone merges this, please squash merge, a couple of large files have been deleted and shouldn't end up in master.

Uh oh!

qaisjp Feb 12, 2020

Choose a reason for hiding this comment

Uh oh!

qaisjp commented Mar 14, 2020

If someone merges this, please squash merge, a couple of large files have been deleted and shouldn't end up in master.

Uh oh!

qaisjp commented Mar 22, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ghost commented Mar 25, 2020

Uh oh!

Reviewers

Assignees

0x416c69 Jul 24, 2019 •

edited

Loading

qaisjp Jul 25, 2019 •

edited

Loading

0x416c69 commented Jul 30, 2019 •

edited

Loading

0x416c69 commented Aug 18, 2019 •

edited

Loading

qaisjp commented Aug 18, 2019 •

edited

Loading

0x416c69 commented Jan 31, 2020 •

edited

Loading

qaisjp left a comment •

edited

Loading

If someone merges this, please squash merge, a couple of large files have been deleted and shouldn't end up in `master`.

If someone merges this, please squash merge, a couple of large files have been deleted and shouldn't end up in `master`.

qaisjp commented Mar 22, 2020 •

edited

Loading