Skip to content

Commit e8a7a2d

Browse files
committed
Fixed creatediscordmessage method returning a null message object
1 parent 0efe536 commit e8a7a2d

File tree

2 files changed

+28
-5
lines changed

2 files changed

+28
-5
lines changed

MednaNet-Bridge/App.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<add key="botDiscordId" value="335858899049512960" />
3333
<add key="mednaNetAPIUrl" value="http://localhost" />
3434
<add key="mednaNetAPIPort" value="24215"/>
35-
<add key="botToken" value="" />
35+
<add key="botToken" value="MzM1ODU4ODk5MDQ5NTEyOTYw.DKruJw.uJC4H96Ya1SWPdbwsUis5ZM5D5o" />
3636
</appSettings>
3737

3838

MednaNetAPI/Controllers/APIController.cs

Lines changed: 27 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -890,7 +890,7 @@ public IHttpActionResult CreateDiscordMessage(int id, MednaNetAPIClient.Models.M
890890

891891
//(tempVariable != null) ? (int?)tempVariable.Length : null;
892892

893-
insertedMessage = (from q in db.discord_messages
893+
/* insertedMessage = (from q in db.discord_messages
894894
join du in db.discord_users on q.discord_user_id equals du.user_discord_id
895895
join i in db.installs on q.code equals i.code
896896
where q.id == newRecord.id
@@ -909,9 +909,32 @@ join i in db.installs on q.code equals i.code
909909
},
910910
postedOn = q.posted_on,
911911
id = q.id
912-
}).FirstOrDefault();
913-
914-
912+
}).FirstOrDefault();*/
913+
914+
insertedMessage =
915+
(from g in db.discord_channels
916+
from m in g.discord_messages
917+
join du in db.discord_users on m.discord_user_id equals du.user_discord_id into du2
918+
from discordUsers in du2.DefaultIfEmpty()
919+
join i in db.installs on m.code equals i.code into i2
920+
from medLaunchInstall in i2.DefaultIfEmpty()
921+
where m.id == newRecord.id
922+
select new MednaNetAPIClient.Models.Messages()
923+
{
924+
channel = g.id,
925+
code = m.code,
926+
message = m.message,
927+
user = new MednaNetAPIClient.Models.Users()
928+
{
929+
discordId = discordUsers.user_discord_id,
930+
id = medLaunchInstall.id,
931+
username = (discordUsers.username == null) ? medLaunchInstall.username : discordUsers.username,
932+
isOnline = ((discordUsers.username == null && (System.Data.Entity.DbFunctions.AddMinutes(medLaunchInstall.last_checkin, 10) > System.Data.Entity.DbFunctions.AddMinutes(DateTime.Now, -10)) || discordUsers.is_online == true)) ? true : false
933+
934+
},
935+
postedOn = m.posted_on,
936+
id = m.id
937+
}).FirstOrDefault();
915938

916939
}
917940
}

0 commit comments

Comments
 (0)