Skip to content

Commit 0efe536

Browse files
committed
CreateDiscordMessage now returns correct message object
1 parent f2fc998 commit 0efe536

File tree

1 file changed

+29
-2
lines changed

1 file changed

+29
-2
lines changed

MednaNetAPI/Controllers/APIController.cs

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -839,7 +839,7 @@ public IHttpActionResult CreateDiscordMessage(int id, MednaNetAPIClient.Models.M
839839
bool clientIgnore = false;
840840

841841
Models.discord_messages newRecord = null;
842-
842+
MednaNetAPIClient.Models.Messages insertedMessage = null;
843843
try
844844
{
845845
newRecord = new Models.discord_messages();
@@ -886,6 +886,33 @@ public IHttpActionResult CreateDiscordMessage(int id, MednaNetAPIClient.Models.M
886886
db.discord_messages.Add(newRecord);
887887
db.SaveChanges();
888888

889+
890+
891+
//(tempVariable != null) ? (int?)tempVariable.Length : null;
892+
893+
insertedMessage = (from q in db.discord_messages
894+
join du in db.discord_users on q.discord_user_id equals du.user_discord_id
895+
join i in db.installs on q.code equals i.code
896+
where q.id == newRecord.id
897+
select new MednaNetAPIClient.Models.Messages()
898+
{
899+
channel = q.channel,
900+
code = q.code,
901+
message = q.message,
902+
user = new MednaNetAPIClient.Models.Users()
903+
{
904+
discordId = du.user_discord_id,
905+
id = i.id,
906+
username = (du.username == null) ? i.username : du.username,
907+
isOnline = ((du.username == null && (System.Data.Entity.DbFunctions.AddMinutes(i.last_checkin, 10) > System.Data.Entity.DbFunctions.AddMinutes(DateTime.Now, -10)) || du.is_online == true)) ? true : false
908+
909+
},
910+
postedOn = q.posted_on,
911+
id = q.id
912+
}).FirstOrDefault();
913+
914+
915+
889916
}
890917
}
891918
}
@@ -903,7 +930,7 @@ public IHttpActionResult CreateDiscordMessage(int id, MednaNetAPIClient.Models.M
903930

904931

905932

906-
return Ok(newRecord);
933+
return Ok(insertedMessage);
907934
}
908935

909936

0 commit comments

Comments
 (0)