Merge the master branch into Greg's branch #273

Merged
greg6775 merged 47 commits from master into greg-dev 2019-12-28 18:52:36 +01:00
Showing only changes of commit 328c19a53b - Show all commits

View file

@ -21,16 +21,17 @@ public class MemeCommand implements Command {
public void executed(String[] args, CommandEvent event) {
OkHttpClient client = new OkHttpClient();
Request request = new Request.Builder().url("https://some-random-api.ml/meme").build();
Request request = new Request.Builder().url("https://meme-api.herokuapp.com/gimme").build();
try {
Response response = client.newCall(request).execute();
JSONObject json = new JSONObject(response.body().string());
String url = json.get("image").toString();
String url = json.getString("url");
event.getTextChannel().sendMessage(
event.getMessageEditor().getMessage(MessageEditor.MessageType.INFO,
"commands.fun.meme.success.title", "")
.setImage(url)
.setAuthor("Subreddit: " + json.getString("subreddit"))
.build()).queue();
} catch (IOException e) {
e.printStackTrace();