Added Embed functionality #1
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ggggg
requested changes
Aug 9, 2020
src/Webhooks/Events/OnLeave.cs
Outdated
Comment on lines
14
to
19
| foreach (var em in Core.Instance.Settings.Server.PlayerLeaveEmbed) | ||
| { | ||
| leaveEmb.Add(new Embed { Title = string.Format(em.Title, player.username), Description = string.Format(em.Description, player.username) }); | ||
| } | ||
| Core.Instance.joinWebhook.Send(string.Format(Core.Instance.Settings.Server.PlayerLeaveFormat, player.username), player.username, | ||
| embeds: Core.Instance.Settings.Server.PlayerLeaveUseEmbed? leaveEmb:null); |
There was a problem hiding this comment.
Seems like this is a lot of duplicate code, maybe we would have it in a function that takes in the embed settings and returns it back:
public List<Embed> CreateAllEmbeds(List<Embed> embeds) {
var emb = new List<Embed>();
foreach (var em in Core.Instance.Settings.Server.PlayerLeaveEmbed)
{
emb.Add(new Embed { Title = string.Format(em.Title, player.username), Description = string.Format(em.Description, player.username) }); // add more things to format and make docs on what each mean in the json
}
}
Comment on lines
12
to
28
| List<Embed> commandsEmb = new List<Embed>(); | ||
| List<Embed> localEmb = new List<Embed>(); | ||
|
|
||
| foreach (var em in Core.Instance.Settings.Chat.CommandsEmbed) | ||
| { | ||
| commandsEmb.Add(new Embed { Title = string.Format(em.Title, message, player.username), Description = string.Format(em.Description, message, player.username) }); | ||
| } | ||
| foreach (var em in Core.Instance.Settings.Chat.LocalEmbed) | ||
| { | ||
| localEmb.Add(new Embed { Title = string.Format(em.Title, message, player.username), Description = string.Format(em.Description, message, player.username) }); | ||
| } | ||
| if (message.StartsWith("/")) | ||
| { | ||
| Core.Instance.commandWebhook.Send(string.Format(Core.Instance.Settings.Chat.CommandsLogFormat, message, player.username), player.username); | ||
| Core.Instance.commandWebhook.Send(string.Format(Core.Instance.Settings.Chat.CommandsLogFormat, message, player.username), player.username,embeds: Core.Instance.Settings.Chat.CommandsUseEmbed?commandsEmb:null); | ||
| return; | ||
| } | ||
| Core.Instance.localWebhook.Send(string.Format(Core.Instance.Settings.Chat.LocalFormat, message, player.username), player.username); | ||
| Core.Instance.localWebhook.Send(string.Format(Core.Instance.Settings.Chat.LocalFormat, message, player.username), player.username,embeds: Core.Instance.Settings.Chat.LocalUseEmbed?localEmb:null); |
There was a problem hiding this comment.
Should be:
if (message.StartsWith("/"))
{
foreach (var em in Core.Instance.Settings.Chat.CommandsEmbed)
{
commandsEmb.Add(new Embed { Title = string.Format(em.Title, message, player.username), Description = string.Format(em.Description, message, player.username) });
}
Core.Instance.commandWebhook.Send(string.Format(Core.Instance.Settings.Chat.CommandsLogFormat, message, player.username), player.username,embeds: Core.Instance.Settings.Chat.CommandsUseEmbed?commandsEmb:null);
return;
}
foreach (var em in Core.Instance.Settings.Chat.LocalEmbed)
{
localEmb.Add(new Embed { Title = string.Format(em.Title, message, player.username), Description = string.Format(em.Description, message, player.username) });
}
Core.Instance.localWebhook.Send(string.Format(Core.Instance.Settings.Chat.LocalFormat, message, player.username), player.username,embeds: Core.Instance.Settings.Chat.LocalUseEmbed?localEmb:null);I guess
|
You tested everything? |
Co-authored-by: Ido <[email protected]>
Co-authored-by: Ido <[email protected]>
Co-authored-by: Ido <[email protected]>
Co-authored-by: Ido <[email protected]>
Co-authored-by: Ido <[email protected]>
sure, why not Co-authored-by: Ido <[email protected]>
Co-authored-by: Ido <[email protected]>
ggggg
reviewed
Aug 9, 2020
Comment on lines
+64
to
+67
| EventsHandler.Add(customEvent.Event, new Action<ShPlayer, string>((player, eventName) => | ||
| { | ||
| if (player.svPlayer.HasPermission("webhook." + eventName)) | ||
| { |
There was a problem hiding this comment.
We might wanna add embeds to that soon... not urgent though.
ggggg
requested changes
Aug 9, 2020
ggggg
approved these changes
Aug 9, 2020
|
accept now? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Plz check my pull request Mr.G.