ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Clean up playerscouter disc (aim at specific uses, instead of general) (#1806)

Browse Source
This commit is contained in:
Lucwousin
2019-10-17 23:54:11 +02:00
committed by Ganom
parent 220b90c0a6
commit bdf947775e
3 changed files with 28 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
http-api/src/main/java/net/runelite/http/api/discord/DiscordEmbed.java
View File

@@ -61,49 +61,20 @@ public class DiscordEmbed
VideoEmbed video; VideoEmbed video;
ProviderEmbed provider; ProviderEmbed provider;
AuthorEmbed author; AuthorEmbed author;
@Builder.Default final List<FieldEmbed> fields = new ArrayList<>();
List<FieldEmbed> fields = new ArrayList<>();
public DiscordEmbed() public DiscordEmbed(AuthorEmbed author, ThumbnailEmbed thumb, String description, FooterEmbed footer, String color, List<FieldEmbed> fields)
{ {
this.author = author;
this.thumbnail = thumb;
this.description = description;
this.footer = footer;
this.color = color;
this.fields.addAll(fields);
} }
public DiscordEmbed(String title, String description) public DiscordMessage toDiscordMessage(String username, String content, String avatarUrl)
{ {
this(title, description, null); return new DiscordMessage(username, content, avatarUrl, this);
}
public DiscordEmbed(String title, String description, String url)
{
setTitle(title);
setDescription(description);
setUrl(url);
}
public static DiscordMessage toDiscordMessage(DiscordEmbed embed, String username, String avatarURL)
{
return DiscordMessage.builder()
.username(username)
.avatarUrl(avatarURL)
.content("")
.embed(embed)
.build();
}
public DiscordMessage toDiscordMessage(String username, String avatarUrl)
{
return DiscordEmbed.toDiscordMessage(this, username, avatarUrl);
}
public static class DiscordEmbedBuilder
{
List<FieldEmbed> fields = new ArrayList<>();
public DiscordEmbedBuilder field(FieldEmbed field)
{
fields.add(field);
return this;
}
} }
} }

37
http-api/src/main/java/net/runelite/http/api/discord/DiscordMessage.java
View File

@@ -29,16 +29,12 @@ package net.runelite.http.api.discord;
import com.google.gson.annotations.SerializedName; import com.google.gson.annotations.SerializedName;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import lombok.ToString; import lombok.ToString;
@Getter @Getter
@Setter @Setter
@Builder
@AllArgsConstructor
@ToString @ToString
public class DiscordMessage public class DiscordMessage
{ {
@@ -48,24 +44,14 @@ public class DiscordMessage
String avatarUrl; String avatarUrl;
@SerializedName("tts") @SerializedName("tts")
boolean textToSpeech; boolean textToSpeech;
List<DiscordEmbed> embeds = new ArrayList<>(); final List<DiscordEmbed> embeds = new ArrayList<>();
public DiscordMessage() DiscordMessage(String username, String content, String avatar_url, DiscordEmbed embed)
{ {
this.username = username;
} this.content = content;
this.avatarUrl = avatar_url;
public DiscordMessage(String username, String content, String avatar_url) this.embeds.add(embed);
{
this(username, content, avatar_url, false);
}
public DiscordMessage(String username, String content, String avatar_url, boolean tts)
{
setUsername(username);
setContent(content);
setAvatarUrl(avatar_url);
setTextToSpeech(tts);
} }
public void setUsername(String username) public void setUsername(String username)
@@ -79,15 +65,4 @@ public class DiscordMessage
this.username = null; this.username = null;
} }
} }
public static class DiscordMessageBuilder
{
List<DiscordEmbed> embeds = new ArrayList<>();
public DiscordMessageBuilder embed(DiscordEmbed embed)
{
embeds.add(embed);
return this;
}
}
} }

26
runelite-client/src/main/java/net/runelite/client/plugins/playerscouter/PlayerScouter.java
View File

@@ -586,7 +586,6 @@ public class PlayerScouter extends Plugin
message(name, icon, image, fieldList, color); message(name, icon, image, fieldList, color);
player.setScouted(true); player.setScouted(true);
fieldList.clear();
} }
private void message(String name, String iconUrl, ThumbnailEmbed thumbnail, List<FieldEmbed> fields, String color) private void message(String name, String iconUrl, ThumbnailEmbed thumbnail, List<FieldEmbed> fields, String color)
@@ -602,25 +601,24 @@ public class PlayerScouter extends Plugin
final Date currentTime = new Date(System.currentTimeMillis()); final Date currentTime = new Date(System.currentTimeMillis());
DiscordEmbed discordEmbed = DiscordEmbed.builder() DiscordEmbed discordEmbed = new DiscordEmbed(
.author(AuthorEmbed.builder() AuthorEmbed.builder()
.icon_url(iconUrl) .icon_url(iconUrl)
.name(name) .name(name)
.build()) .build(),
.thumbnail(thumbnail) thumbnail,
.description(" ") " ",
.fields(fields) FooterEmbed.builder()
.footer(FooterEmbed.builder()
.icon_url("https://raw.githubusercontent.com/runelite/runelite/master/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/ultimate_ironman.png") .icon_url("https://raw.githubusercontent.com/runelite/runelite/master/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/ultimate_ironman.png")
.text("Gabon Scouter | Time: " + SDF.format(currentTime)) .text("Gabon Scouter | Time: " + SDF.format(currentTime))
.build()) .build(),
.color(color) color,
.build(); fields
);
DiscordMessage discordMessage = discordEmbed.toDiscordMessage("Gabon Scouter", " ", "https://i.imgur.com/2A6dr7q.png");
DiscordMessage discordMessage = new DiscordMessage("Gabon Scouter", " ", "https://i.imgur.com/2A6dr7q.png");
discordMessage.getEmbeds().add(discordEmbed);
DISCORD_CLIENT.message(this.webhook, discordMessage); DISCORD_CLIENT.message(this.webhook, discordMessage);
fields.clear();
} }
private String location(PlayerContainer player) private String location(PlayerContainer player)