From 136ab5a75b7db101d92110e1c8894d234ad21b10 Mon Sep 17 00:00:00 2001 From: shibme Date: Fri, 12 Feb 2016 23:49:30 +0530 Subject: [PATCH] Moving the models/types to an independent package --- README.md | 2 +- pom.xml | 9 +- .../lib/jtelebot/service/TelegramBot.java | 7 - .../shib/java/lib/jtelebot/types/Audio.java | 42 ----- src/me/shib/java/lib/jtelebot/types/Chat.java | 57 ------- .../shib/java/lib/jtelebot/types/ChatId.java | 39 ----- .../jtelebot/types/ChosenInlineResult.java | 26 --- .../shib/java/lib/jtelebot/types/Contact.java | 32 ---- .../java/lib/jtelebot/types/Document.java | 37 ---- .../java/lib/jtelebot/types/ForceReply.java | 29 ---- .../java/lib/jtelebot/types/InlineQuery.java | 31 ---- .../lib/jtelebot/types/InlineQueryResult.java | 25 --- .../types/InlineQueryResultArticle.java | 101 ----------- .../jtelebot/types/InlineQueryResultGif.java | 93 ----------- .../types/InlineQueryResultMpeg4Gif.java | 93 ----------- .../types/InlineQueryResultPhoto.java | 102 ----------- .../types/InlineQueryResultVideo.java | 113 ------------- .../java/lib/jtelebot/types/Location.java | 21 --- .../shib/java/lib/jtelebot/types/Message.java | 158 ------------------ .../java/lib/jtelebot/types/ParseMode.java | 5 - .../java/lib/jtelebot/types/PhotoSize.java | 32 ---- .../lib/jtelebot/types/ReplyKeyboardHide.java | 21 --- .../jtelebot/types/ReplyKeyboardMarkup.java | 57 ------- .../java/lib/jtelebot/types/ReplyMarkup.java | 5 - .../shib/java/lib/jtelebot/types/Sticker.java | 37 ---- .../java/lib/jtelebot/types/TelegramFile.java | 56 ------- .../shib/java/lib/jtelebot/types/Update.java | 31 ---- src/me/shib/java/lib/jtelebot/types/User.java | 39 ----- .../lib/jtelebot/types/UserProfilePhotos.java | 23 --- .../shib/java/lib/jtelebot/types/Video.java | 53 ------ .../shib/java/lib/jtelebot/types/Voice.java | 32 ---- 31 files changed, 8 insertions(+), 1400 deletions(-) delete mode 100644 src/me/shib/java/lib/jtelebot/types/Audio.java delete mode 100644 src/me/shib/java/lib/jtelebot/types/Chat.java delete mode 100644 src/me/shib/java/lib/jtelebot/types/ChatId.java delete mode 100644 src/me/shib/java/lib/jtelebot/types/ChosenInlineResult.java delete mode 100644 src/me/shib/java/lib/jtelebot/types/Contact.java delete mode 100644 src/me/shib/java/lib/jtelebot/types/Document.java delete mode 100644 src/me/shib/java/lib/jtelebot/types/ForceReply.java delete mode 100644 src/me/shib/java/lib/jtelebot/types/InlineQuery.java delete mode 100644 src/me/shib/java/lib/jtelebot/types/InlineQueryResult.java delete mode 100644 src/me/shib/java/lib/jtelebot/types/InlineQueryResultArticle.java delete mode 100644 src/me/shib/java/lib/jtelebot/types/InlineQueryResultGif.java delete mode 100644 src/me/shib/java/lib/jtelebot/types/InlineQueryResultMpeg4Gif.java delete mode 100644 src/me/shib/java/lib/jtelebot/types/InlineQueryResultPhoto.java delete mode 100644 src/me/shib/java/lib/jtelebot/types/InlineQueryResultVideo.java delete mode 100644 src/me/shib/java/lib/jtelebot/types/Location.java delete mode 100644 src/me/shib/java/lib/jtelebot/types/Message.java delete mode 100644 src/me/shib/java/lib/jtelebot/types/ParseMode.java delete mode 100644 src/me/shib/java/lib/jtelebot/types/PhotoSize.java delete mode 100644 src/me/shib/java/lib/jtelebot/types/ReplyKeyboardHide.java delete mode 100644 src/me/shib/java/lib/jtelebot/types/ReplyKeyboardMarkup.java delete mode 100644 src/me/shib/java/lib/jtelebot/types/ReplyMarkup.java delete mode 100644 src/me/shib/java/lib/jtelebot/types/Sticker.java delete mode 100644 src/me/shib/java/lib/jtelebot/types/TelegramFile.java delete mode 100644 src/me/shib/java/lib/jtelebot/types/Update.java delete mode 100644 src/me/shib/java/lib/jtelebot/types/User.java delete mode 100644 src/me/shib/java/lib/jtelebot/types/UserProfilePhotos.java delete mode 100644 src/me/shib/java/lib/jtelebot/types/Video.java delete mode 100644 src/me/shib/java/lib/jtelebot/types/Voice.java diff --git a/README.md b/README.md index 21a5a3e..df65563 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ Add to your `pom.xml` me.shib.java.lib jtelebot - 0.9.1 + 1.0 ``` diff --git a/pom.xml b/pom.xml index 0d30730..7c8c346 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ me.shib.java.lib jtelebot - 0.9.1 + 1.0 JTeleBot A Java library for Telegram Bot API https://github.com/shibme/jtelebot @@ -56,7 +56,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.5 + 3.5.1 1.7 1.7 @@ -145,6 +145,11 @@ + + me.shib.java.lib + jtelebot-models + 1.0 + me.shib.java.lib rest-client-java diff --git a/src/me/shib/java/lib/jtelebot/service/TelegramBot.java b/src/me/shib/java/lib/jtelebot/service/TelegramBot.java index 1309d73..2eb2fd0 100644 --- a/src/me/shib/java/lib/jtelebot/service/TelegramBot.java +++ b/src/me/shib/java/lib/jtelebot/service/TelegramBot.java @@ -678,11 +678,4 @@ public Update[] getUpdatesImmediately() throws IOException { public File downloadFile(String file_id) throws IOException { return downloadFile(file_id, null); } - - /** - * The types of chat actions available - */ - public enum ChatAction { - typing, upload_photo, record_video, upload_video, record_audio, upload_audio, upload_document, find_location - } } diff --git a/src/me/shib/java/lib/jtelebot/types/Audio.java b/src/me/shib/java/lib/jtelebot/types/Audio.java deleted file mode 100644 index 50acc30..0000000 --- a/src/me/shib/java/lib/jtelebot/types/Audio.java +++ /dev/null @@ -1,42 +0,0 @@ -package me.shib.java.lib.jtelebot.types; - -public class Audio { - - private String file_id; - private int duration; - private String performer; - private String title; - private String mime_type; - private long file_size; - - public String getFile_id() { - return file_id; - } - - public int getDuration() { - return duration; - } - - public String getPerformer() { - return performer; - } - - public String getTitle() { - return title; - } - - public String getMime_type() { - return mime_type; - } - - public long getFile_size() { - return file_size; - } - - @Override - public String toString() { - return "Audio [file_id=" + file_id + ", duration=" + duration + ", performer=" + performer + ", title=" + title - + ", mime_type=" + mime_type + ", file_size=" + file_size + "]"; - } - -} diff --git a/src/me/shib/java/lib/jtelebot/types/Chat.java b/src/me/shib/java/lib/jtelebot/types/Chat.java deleted file mode 100644 index 0139994..0000000 --- a/src/me/shib/java/lib/jtelebot/types/Chat.java +++ /dev/null @@ -1,57 +0,0 @@ -package me.shib.java.lib.jtelebot.types; - -public class Chat { - - private String title; - private String type; - private long id; - private String first_name; - private String last_name; - private String username; - - @Override - public String toString() { - if (getType() == ChatType.Private) { - return getUser().toString(); - } - return "Chat [id=" + id + ", first_name=" + first_name + ", last_name=" + last_name + ", username=" + username - + ", title=" + title + ", type=" + type + "]"; - } - - public User getUser() { - if (getType() == ChatType.Private) { - return new User(id, first_name, last_name, username); - } - return null; - } - - public ChatType getType() { - String expectedType = type.toLowerCase().substring(0, 1).toUpperCase() + type.toLowerCase().substring(1); - return ChatType.valueOf(expectedType); - } - - public String getTitle() { - return title; - } - - public long getId() { - return id; - } - - public String getFirst_name() { - return first_name; - } - - public String getLast_name() { - return last_name; - } - - public String getUsername() { - return username; - } - - public enum ChatType { - Private, Group, Supergroup, Channel - } - -} diff --git a/src/me/shib/java/lib/jtelebot/types/ChatId.java b/src/me/shib/java/lib/jtelebot/types/ChatId.java deleted file mode 100644 index 6ec1348..0000000 --- a/src/me/shib/java/lib/jtelebot/types/ChatId.java +++ /dev/null @@ -1,39 +0,0 @@ -package me.shib.java.lib.jtelebot.types; - -public class ChatId { - - private String chat_id; - - /** - * Initialize a new ChatId with the username of the target channel (in the format @channelusername) - * - * @param chat_id username of the target channel (in the format @channelusername) - */ - public ChatId(String chat_id) { - this.chat_id = chat_id; - } - - /** - * Initialize a new ChatId with the unique identifier of the target chat (Private or Group) - * - * @param chat_id Unique identifier of the target chat - */ - public ChatId(long chat_id) { - this.chat_id = chat_id + ""; - } - - /** - * Returns the chat_id as string - * - * @return the chat id as a string - */ - public String getChatId() { - return this.chat_id; - } - - @Override - public String toString() { - return "ChatId [chat_id=" + chat_id + "]"; - } - -} diff --git a/src/me/shib/java/lib/jtelebot/types/ChosenInlineResult.java b/src/me/shib/java/lib/jtelebot/types/ChosenInlineResult.java deleted file mode 100644 index ceb8f39..0000000 --- a/src/me/shib/java/lib/jtelebot/types/ChosenInlineResult.java +++ /dev/null @@ -1,26 +0,0 @@ -package me.shib.java.lib.jtelebot.types; - -public class ChosenInlineResult { - - private String result_id; - private User from; - private String query; - - public String getResult_id() { - return result_id; - } - - public User getFrom() { - return from; - } - - public String getQuery() { - return query; - } - - @Override - public String toString() { - return "Update [result_id=" + result_id + ", from=" + from + ", query=" + query + "]"; - } - -} diff --git a/src/me/shib/java/lib/jtelebot/types/Contact.java b/src/me/shib/java/lib/jtelebot/types/Contact.java deleted file mode 100644 index 1735f4a..0000000 --- a/src/me/shib/java/lib/jtelebot/types/Contact.java +++ /dev/null @@ -1,32 +0,0 @@ -package me.shib.java.lib.jtelebot.types; - -public class Contact { - - private String phone_number; - private String first_name; - private String last_name; - private String user_id; - - public String getPhone_number() { - return phone_number; - } - - public String getFirst_name() { - return first_name; - } - - public String getLast_name() { - return last_name; - } - - public String getUser_id() { - return user_id; - } - - @Override - public String toString() { - return "Contact [phone_number=" + phone_number + ", first_name=" + first_name + ", last_name=" + last_name - + ", user_id=" + user_id + "]"; - } - -} diff --git a/src/me/shib/java/lib/jtelebot/types/Document.java b/src/me/shib/java/lib/jtelebot/types/Document.java deleted file mode 100644 index ee39bfd..0000000 --- a/src/me/shib/java/lib/jtelebot/types/Document.java +++ /dev/null @@ -1,37 +0,0 @@ -package me.shib.java.lib.jtelebot.types; - -public class Document { - - private String file_id; - private PhotoSize thumb; - private long duration; - private String mime_type; - private long file_size; - - public String getFile_id() { - return file_id; - } - - public PhotoSize getThumb() { - return thumb; - } - - public long getDuration() { - return duration; - } - - public String getMime_type() { - return mime_type; - } - - public long getFile_size() { - return file_size; - } - - @Override - public String toString() { - return "Document [file_id=" + file_id + ", thumb=" + thumb + ", duration=" + duration + ", mime_type=" - + mime_type + ", file_size=" + file_size + "]"; - } - -} diff --git a/src/me/shib/java/lib/jtelebot/types/ForceReply.java b/src/me/shib/java/lib/jtelebot/types/ForceReply.java deleted file mode 100644 index 16f1b36..0000000 --- a/src/me/shib/java/lib/jtelebot/types/ForceReply.java +++ /dev/null @@ -1,29 +0,0 @@ -package me.shib.java.lib.jtelebot.types; - -public class ForceReply implements ReplyMarkup { - - private final boolean force_reply = true; - private boolean selective; - - public ForceReply(boolean selective) { - this.selective = selective; - } - - public ForceReply() { - this.selective = false; - } - - public boolean getForce_reply() { - return force_reply; - } - - public boolean isSelective() { - return selective; - } - - @Override - public String toString() { - return "ForceReply [force_reply=" + force_reply + ", selective=" + selective + "]"; - } - -} diff --git a/src/me/shib/java/lib/jtelebot/types/InlineQuery.java b/src/me/shib/java/lib/jtelebot/types/InlineQuery.java deleted file mode 100644 index 84a5177..0000000 --- a/src/me/shib/java/lib/jtelebot/types/InlineQuery.java +++ /dev/null @@ -1,31 +0,0 @@ -package me.shib.java.lib.jtelebot.types; - -public class InlineQuery { - - private String id; - private User from; - private String query; - private String offset; - - public String getId() { - return id; - } - - public User getFrom() { - return from; - } - - public String getQuery() { - return query; - } - - public String getOffset() { - return offset; - } - - @Override - public String toString() { - return "InlineQuery [id=" + id + ", from=" + from + ", query=" + query + ", offset=" + offset + "]"; - } - -} diff --git a/src/me/shib/java/lib/jtelebot/types/InlineQueryResult.java b/src/me/shib/java/lib/jtelebot/types/InlineQueryResult.java deleted file mode 100644 index 90224e9..0000000 --- a/src/me/shib/java/lib/jtelebot/types/InlineQueryResult.java +++ /dev/null @@ -1,25 +0,0 @@ -package me.shib.java.lib.jtelebot.types; - -public abstract class InlineQueryResult { - - private String id; - private InlineQueryResultType type; - - public InlineQueryResult(String id, InlineQueryResultType type) { - this.id = id; - this.type = type; - } - - public String getId() { - return id; - } - - public InlineQueryResultType getType() { - return type; - } - - public enum InlineQueryResultType { - article, photo, gif, mpeg4_gif, video - } - -} \ No newline at end of file diff --git a/src/me/shib/java/lib/jtelebot/types/InlineQueryResultArticle.java b/src/me/shib/java/lib/jtelebot/types/InlineQueryResultArticle.java deleted file mode 100644 index 7ff1b20..0000000 --- a/src/me/shib/java/lib/jtelebot/types/InlineQueryResultArticle.java +++ /dev/null @@ -1,101 +0,0 @@ -package me.shib.java.lib.jtelebot.types; - -public class InlineQueryResultArticle extends InlineQueryResult { - private String title; - private String message_text; - private ParseMode parse_mode; - private boolean disable_web_page_preview; - private String url; - private boolean hide_url; - private String description; - private String thumb_url; - private int thumb_width; - private int thumb_height; - - public InlineQueryResultArticle(String id, String title, String message_text) { - super(id, InlineQueryResultType.article); - this.title = title; - this.message_text = message_text; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getMessage_text() { - return message_text; - } - - public void setMessage_text(String message_text) { - this.message_text = message_text; - } - - public ParseMode getParse_mode() { - return parse_mode; - } - - public void setParse_mode(ParseMode parse_mode) { - this.parse_mode = parse_mode; - } - - public boolean isDisable_web_page_preview() { - return disable_web_page_preview; - } - - public String getUrl() { - return url; - } - - public void setUrl(String url) { - this.url = url; - } - - public boolean isHide_url() { - return hide_url; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getThumb_url() { - return thumb_url; - } - - public void setThumb_url(String thumb_url) { - this.thumb_url = thumb_url; - } - - public int getThumb_width() { - return thumb_width; - } - - public void setThumb_width(int thumb_width) { - this.thumb_width = thumb_width; - } - - public int getThumb_height() { - return thumb_height; - } - - public void setThumb_height(int thumb_height) { - this.thumb_height = thumb_height; - } - - public void disableWebPagePreview(boolean disable_web_page_preview) { - this.disable_web_page_preview = disable_web_page_preview; - } - - public void hideUrl(boolean hide_url) { - this.hide_url = hide_url; - } - -} diff --git a/src/me/shib/java/lib/jtelebot/types/InlineQueryResultGif.java b/src/me/shib/java/lib/jtelebot/types/InlineQueryResultGif.java deleted file mode 100644 index aa8ea5b..0000000 --- a/src/me/shib/java/lib/jtelebot/types/InlineQueryResultGif.java +++ /dev/null @@ -1,93 +0,0 @@ -package me.shib.java.lib.jtelebot.types; - -public class InlineQueryResultGif extends InlineQueryResult { - - private String gif_url; - private String thumb_url; - private int gif_width; - private int gif_height; - private String title; - private String caption; - private String message_text; - private ParseMode parse_mode; - private boolean disable_web_page_preview; - - public InlineQueryResultGif(String id, String gif_url, String thumb_url) { - super(id, InlineQueryResultType.gif); - this.gif_url = gif_url; - this.thumb_url = thumb_url; - } - - public String getGif_url() { - return gif_url; - } - - public void setGif_url(String gif_url) { - this.gif_url = gif_url; - } - - public String getThumb_url() { - return thumb_url; - } - - public void setThumb_url(String thumb_url) { - this.thumb_url = thumb_url; - } - - public int getGif_width() { - return gif_width; - } - - public void setGif_width(int gif_width) { - this.gif_width = gif_width; - } - - public int getGif_height() { - return gif_height; - } - - public void setGif_height(int gif_height) { - this.gif_height = gif_height; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getCaption() { - return caption; - } - - public void setCaption(String caption) { - this.caption = caption; - } - - public String getMessage_text() { - return message_text; - } - - public void setMessage_text(String message_text) { - this.message_text = message_text; - } - - public ParseMode getParse_mode() { - return parse_mode; - } - - public void setParse_mode(ParseMode parse_mode) { - this.parse_mode = parse_mode; - } - - public boolean isDisable_web_page_preview() { - return disable_web_page_preview; - } - - public void disableWebPagePreview(boolean disable_web_page_preview) { - this.disable_web_page_preview = disable_web_page_preview; - } - -} diff --git a/src/me/shib/java/lib/jtelebot/types/InlineQueryResultMpeg4Gif.java b/src/me/shib/java/lib/jtelebot/types/InlineQueryResultMpeg4Gif.java deleted file mode 100644 index 61f8369..0000000 --- a/src/me/shib/java/lib/jtelebot/types/InlineQueryResultMpeg4Gif.java +++ /dev/null @@ -1,93 +0,0 @@ -package me.shib.java.lib.jtelebot.types; - -public class InlineQueryResultMpeg4Gif extends InlineQueryResult { - - private String mpeg4_url; - private String thumb_url; - private int mpeg4_width; - private int mpeg4_height; - private String title; - private String caption; - private String message_text; - private ParseMode parse_mode; - private boolean disable_web_page_preview; - - public InlineQueryResultMpeg4Gif(String id, String mpeg4_url, String thumb_url) { - super(id, InlineQueryResultType.mpeg4_gif); - this.mpeg4_url = mpeg4_url; - this.thumb_url = thumb_url; - } - - public String getMpeg4_url() { - return mpeg4_url; - } - - public void setMpeg4_url(String mpeg4_url) { - this.mpeg4_url = mpeg4_url; - } - - public String getThumb_url() { - return thumb_url; - } - - public void setThumb_url(String thumb_url) { - this.thumb_url = thumb_url; - } - - public int getMpeg4_width() { - return mpeg4_width; - } - - public void setMpeg4_width(int mpeg4_width) { - this.mpeg4_width = mpeg4_width; - } - - public int getMpeg4_height() { - return mpeg4_height; - } - - public void setMpeg4_height(int mpeg4_height) { - this.mpeg4_height = mpeg4_height; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getCaption() { - return caption; - } - - public void setCaption(String caption) { - this.caption = caption; - } - - public String getMessage_text() { - return message_text; - } - - public void setMessage_text(String message_text) { - this.message_text = message_text; - } - - public ParseMode getParse_mode() { - return parse_mode; - } - - public void setParse_mode(ParseMode parse_mode) { - this.parse_mode = parse_mode; - } - - public boolean isDisable_web_page_preview() { - return disable_web_page_preview; - } - - public void disableWebPagePreview(boolean disable_web_page_preview) { - this.disable_web_page_preview = disable_web_page_preview; - } - -} diff --git a/src/me/shib/java/lib/jtelebot/types/InlineQueryResultPhoto.java b/src/me/shib/java/lib/jtelebot/types/InlineQueryResultPhoto.java deleted file mode 100644 index 8b2d008..0000000 --- a/src/me/shib/java/lib/jtelebot/types/InlineQueryResultPhoto.java +++ /dev/null @@ -1,102 +0,0 @@ -package me.shib.java.lib.jtelebot.types; - -public class InlineQueryResultPhoto extends InlineQueryResult { - - private String photo_url; - private String thumb_url; - private int photo_width; - private int getPhoto_height; - private String title; - private String description; - private String caption; - private String message_text; - private ParseMode parse_mode; - private boolean disable_web_page_preview; - - public InlineQueryResultPhoto(String id, String photo_url, String thumb_url) { - super(id, InlineQueryResultType.photo); - this.photo_url = photo_url; - this.thumb_url = thumb_url; - } - - public String getPhoto_url() { - return photo_url; - } - - public void setPhoto_url(String photo_url) { - this.photo_url = photo_url; - } - - public String getThumb_url() { - return thumb_url; - } - - public void setThumb_url(String thumb_url) { - this.thumb_url = thumb_url; - } - - public int getPhoto_width() { - return photo_width; - } - - public void setPhoto_width(int photo_width) { - this.photo_width = photo_width; - } - - public int getGetPhoto_height() { - return getPhoto_height; - } - - public void setGetPhoto_height(int getPhoto_height) { - this.getPhoto_height = getPhoto_height; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getCaption() { - return caption; - } - - public void setCaption(String caption) { - this.caption = caption; - } - - public String getMessage_text() { - return message_text; - } - - public void setMessage_text(String message_text) { - this.message_text = message_text; - } - - public ParseMode getParse_mode() { - return parse_mode; - } - - public void setParse_mode(ParseMode parse_mode) { - this.parse_mode = parse_mode; - } - - public boolean isDisable_web_page_preview() { - return disable_web_page_preview; - } - - public void disableWebPagePreview(boolean disable_web_page_preview) { - this.disable_web_page_preview = disable_web_page_preview; - } - -} diff --git a/src/me/shib/java/lib/jtelebot/types/InlineQueryResultVideo.java b/src/me/shib/java/lib/jtelebot/types/InlineQueryResultVideo.java deleted file mode 100644 index 27ce121..0000000 --- a/src/me/shib/java/lib/jtelebot/types/InlineQueryResultVideo.java +++ /dev/null @@ -1,113 +0,0 @@ -package me.shib.java.lib.jtelebot.types; - -public class InlineQueryResultVideo extends InlineQueryResult { - private String video_url; - private String thumb_url; - private String mime_type; - private String message_text; - private String title; - private String description; - private int mpeg4_width; - private int mpeg4_height; - private int mpeg4_duration; - private ParseMode parse_mode; - private boolean disable_web_page_preview; - - public InlineQueryResultVideo(String id, String video_url, String thumb_url, String mime_type, String message_text, String title) { - super(id, InlineQueryResultType.video); - this.video_url = video_url; - this.thumb_url = thumb_url; - this.mime_type = mime_type; - this.message_text = message_text; - this.title = title; - } - - public String getVideo_url() { - return video_url; - } - - public void setVideo_url(String video_url) { - this.video_url = video_url; - } - - public String getThumb_url() { - return thumb_url; - } - - public void setThumb_url(String thumb_url) { - this.thumb_url = thumb_url; - } - - public String getMime_type() { - return mime_type; - } - - public void setMime_type(String mime_type) { - this.mime_type = mime_type; - } - - public String getMessage_text() { - return message_text; - } - - public void setMessage_text(String message_text) { - this.message_text = message_text; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public int getMpeg4_width() { - return mpeg4_width; - } - - public void setMpeg4_width(int mpeg4_width) { - this.mpeg4_width = mpeg4_width; - } - - public int getMpeg4_height() { - return mpeg4_height; - } - - public void setMpeg4_height(int mpeg4_height) { - this.mpeg4_height = mpeg4_height; - } - - public int getMpeg4_duration() { - return mpeg4_duration; - } - - public void setMpeg4_duration(int mpeg4_duration) { - this.mpeg4_duration = mpeg4_duration; - } - - public ParseMode getParse_mode() { - return parse_mode; - } - - public void setParse_mode(ParseMode parse_mode) { - this.parse_mode = parse_mode; - } - - public boolean isDisable_web_page_preview() { - return disable_web_page_preview; - } - - public void setDisable_web_page_preview(boolean disable_web_page_preview) { - this.disable_web_page_preview = disable_web_page_preview; - } - -} diff --git a/src/me/shib/java/lib/jtelebot/types/Location.java b/src/me/shib/java/lib/jtelebot/types/Location.java deleted file mode 100644 index b59c78d..0000000 --- a/src/me/shib/java/lib/jtelebot/types/Location.java +++ /dev/null @@ -1,21 +0,0 @@ -package me.shib.java.lib.jtelebot.types; - -public class Location { - - private float longitude; - private float latitude; - - public float getLongitude() { - return longitude; - } - - public float getLatitude() { - return latitude; - } - - @Override - public String toString() { - return "Location [longitude=" + longitude + ", latitude=" + latitude + "]"; - } - -} diff --git a/src/me/shib/java/lib/jtelebot/types/Message.java b/src/me/shib/java/lib/jtelebot/types/Message.java deleted file mode 100644 index 29bc50d..0000000 --- a/src/me/shib/java/lib/jtelebot/types/Message.java +++ /dev/null @@ -1,158 +0,0 @@ -package me.shib.java.lib.jtelebot.types; - -import java.util.Arrays; - -public class Message { - - private long message_id; - private User from; - private long date; - private Chat chat; - private User forward_from; - private long forward_date; - private Message reply_to_message; - private String text; - private Audio audio; - private Document document; - private PhotoSize[] photo; - private Sticker sticker; - private Video video; - private Voice voice; - private String caption; - private Contact contact; - private Location location; - private User new_chat_participant; - private User left_chat_participant; - private String new_chat_title; - private PhotoSize[] new_chat_photo; - private boolean delete_chat_photo; - private boolean group_chat_created; - private boolean supergroup_chat_created; - private boolean channel_chat_created; - private long migrate_to_chat_id; - private long migrate_from_chat_id; - - - public long getMessage_id() { - return message_id; - } - - public User getFrom() { - return from; - } - - public long getDate() { - return date; - } - - public Chat getChat() { - return chat; - } - - public User getForward_from() { - return forward_from; - } - - public long getForward_date() { - return forward_date; - } - - public Message getReply_to_message() { - return reply_to_message; - } - - public String getText() { - return text; - } - - public Audio getAudio() { - return audio; - } - - public Document getDocument() { - return document; - } - - public PhotoSize[] getPhoto() { - return photo; - } - - public Sticker getSticker() { - return sticker; - } - - public Video getVideo() { - return video; - } - - public Voice getVoice() { - return voice; - } - - public String getCaption() { - return caption; - } - - public Contact getContact() { - return contact; - } - - public Location getLocation() { - return location; - } - - public User getNew_chat_participant() { - return new_chat_participant; - } - - public User getLeft_chat_participant() { - return left_chat_participant; - } - - public String getNew_chat_title() { - return new_chat_title; - } - - public PhotoSize[] getNew_chat_photo() { - return new_chat_photo; - } - - public boolean getDelete_chat_photo() { - return delete_chat_photo; - } - - public boolean getGroup_chat_created() { - return group_chat_created; - } - - public boolean getSupergroup_chat_created() { - return supergroup_chat_created; - } - - public boolean getChannel_chat_created() { - return channel_chat_created; - } - - public long getMigrate_to_chat_id() { - return migrate_to_chat_id; - } - - public long getMigrate_from_chat_id() { - return migrate_from_chat_id; - } - - @Override - public String toString() { - return "Message [message_id=" + message_id + ", from=" + from + ", date=" + date + ", chat=" + chat - + ", forward_from=" + forward_from + ", forward_date=" + forward_date + ", reply_to_message=" - + reply_to_message + ", text=" + text + ", audio=" + audio + ", document=" + document + ", photo=" - + Arrays.toString(photo) + ", sticker=" + sticker + ", video=" + video + ", voice=" + voice - + ", caption=" + caption + ", contact=" + contact + ", location=" + location + ", new_chat_participant=" - + new_chat_participant + ", left_chat_participant=" + left_chat_participant + ", new_chat_title=" - + new_chat_title + ", new_chat_photo=" + Arrays.toString(new_chat_photo) + ", delete_chat_photo=" - + delete_chat_photo + ", group_chat_created=" + group_chat_created + ", supergroup_chat_created=" - + supergroup_chat_created + ", channel_chat_created=" + channel_chat_created + ", migrate_to_chat_id=" - + migrate_to_chat_id + ", migrate_from_chat_id=" + migrate_from_chat_id + "]"; - } - -} diff --git a/src/me/shib/java/lib/jtelebot/types/ParseMode.java b/src/me/shib/java/lib/jtelebot/types/ParseMode.java deleted file mode 100644 index 1b90dcf..0000000 --- a/src/me/shib/java/lib/jtelebot/types/ParseMode.java +++ /dev/null @@ -1,5 +0,0 @@ -package me.shib.java.lib.jtelebot.types; - -public enum ParseMode { - HTML, Markdown -} diff --git a/src/me/shib/java/lib/jtelebot/types/PhotoSize.java b/src/me/shib/java/lib/jtelebot/types/PhotoSize.java deleted file mode 100644 index 208af83..0000000 --- a/src/me/shib/java/lib/jtelebot/types/PhotoSize.java +++ /dev/null @@ -1,32 +0,0 @@ -package me.shib.java.lib.jtelebot.types; - -public class PhotoSize { - - private String file_id; - private int width; - private int height; - private long file_size; - - public String getFile_id() { - return file_id; - } - - public int getWidth() { - return width; - } - - public int getHeight() { - return height; - } - - public long getFile_size() { - return file_size; - } - - @Override - public String toString() { - return "PhotoSize [file_id=" + file_id + ", width=" + width + ", height=" + height + ", file_size=" + file_size - + "]"; - } - -} diff --git a/src/me/shib/java/lib/jtelebot/types/ReplyKeyboardHide.java b/src/me/shib/java/lib/jtelebot/types/ReplyKeyboardHide.java deleted file mode 100644 index 0b50bb5..0000000 --- a/src/me/shib/java/lib/jtelebot/types/ReplyKeyboardHide.java +++ /dev/null @@ -1,21 +0,0 @@ -package me.shib.java.lib.jtelebot.types; - -public class ReplyKeyboardHide implements ReplyMarkup { - - private final boolean hide_keyboard = true; - private boolean selective; - - public boolean getHide_keyboard() { - return hide_keyboard; - } - - public boolean isSelective() { - return selective; - } - - @Override - public String toString() { - return "ReplyKeyboardHide [hide_keyboard=" + hide_keyboard + ", selective=" + selective + "]"; - } - -} diff --git a/src/me/shib/java/lib/jtelebot/types/ReplyKeyboardMarkup.java b/src/me/shib/java/lib/jtelebot/types/ReplyKeyboardMarkup.java deleted file mode 100644 index 0d5363a..0000000 --- a/src/me/shib/java/lib/jtelebot/types/ReplyKeyboardMarkup.java +++ /dev/null @@ -1,57 +0,0 @@ -package me.shib.java.lib.jtelebot.types; - -import java.util.Arrays; - -public class ReplyKeyboardMarkup implements ReplyMarkup { - - private String[][] keyboard; - private boolean resize_keyboard; - private boolean one_time_keyboard; - private boolean selective; - - public ReplyKeyboardMarkup(String[][] keyboard) { - initializer(keyboard, false, true, false); - } - - public ReplyKeyboardMarkup(String[][] keyboard, boolean resize_keyboard) { - initializer(keyboard, resize_keyboard, true, false); - } - - public ReplyKeyboardMarkup(String[][] keyboard, boolean resize_keyboard, boolean one_time_keyboard) { - initializer(keyboard, resize_keyboard, one_time_keyboard, false); - } - - public ReplyKeyboardMarkup(String[][] keyboard, boolean resize_keyboard, boolean one_time_keyboard, boolean selective) { - initializer(keyboard, resize_keyboard, one_time_keyboard, selective); - } - - private void initializer(String[][] keyboard, boolean resize_keyboard, boolean one_time_keyboard, boolean selective) { - this.keyboard = keyboard; - this.resize_keyboard = resize_keyboard; - this.one_time_keyboard = one_time_keyboard; - this.selective = selective; - } - - public String[][] getKeyboard() { - return keyboard; - } - - public boolean isResize_keyboard() { - return resize_keyboard; - } - - public boolean isOne_time_keyboard() { - return one_time_keyboard; - } - - public boolean isSelective() { - return selective; - } - - @Override - public String toString() { - return "ReplyKeyboardMarkup [keyboard=" + Arrays.toString(keyboard) + ", resize_keyboard=" + resize_keyboard - + ", one_time_keyboard=" + one_time_keyboard + ", selective=" + selective + "]"; - } - -} diff --git a/src/me/shib/java/lib/jtelebot/types/ReplyMarkup.java b/src/me/shib/java/lib/jtelebot/types/ReplyMarkup.java deleted file mode 100644 index 128115f..0000000 --- a/src/me/shib/java/lib/jtelebot/types/ReplyMarkup.java +++ /dev/null @@ -1,5 +0,0 @@ -package me.shib.java.lib.jtelebot.types; - -public interface ReplyMarkup { - public String toString(); -} diff --git a/src/me/shib/java/lib/jtelebot/types/Sticker.java b/src/me/shib/java/lib/jtelebot/types/Sticker.java deleted file mode 100644 index 4636bd2..0000000 --- a/src/me/shib/java/lib/jtelebot/types/Sticker.java +++ /dev/null @@ -1,37 +0,0 @@ -package me.shib.java.lib.jtelebot.types; - -public class Sticker { - - private String file_id; - private int width; - private int height; - private PhotoSize thumb; - private long file_size; - - public String getFile_id() { - return file_id; - } - - public int getWidth() { - return width; - } - - public int getHeight() { - return height; - } - - public PhotoSize getThumb() { - return thumb; - } - - public long getFile_size() { - return file_size; - } - - @Override - public String toString() { - return "Sticker [file_id=" + file_id + ", width=" + width + ", height=" + height + ", thumb=" + thumb - + ", file_size=" + file_size + "]"; - } - -} diff --git a/src/me/shib/java/lib/jtelebot/types/TelegramFile.java b/src/me/shib/java/lib/jtelebot/types/TelegramFile.java deleted file mode 100644 index 401f7c0..0000000 --- a/src/me/shib/java/lib/jtelebot/types/TelegramFile.java +++ /dev/null @@ -1,56 +0,0 @@ -package me.shib.java.lib.jtelebot.types; - -import java.io.File; - -public class TelegramFile { - - private String file_id; - private File file; - private long file_size; - private String file_path; - - /** - * Initialize a Telegram file with an existing file_id. - * - * @param file_id the file_id of the file that was already uploaded to telegram servers. - */ - public TelegramFile(String file_id) { - this.file_id = file_id; - } - - /** - * Initialize a Telegram file object with a local file for uploading it to telegram servers. - * - * @param file the File object of a local file that has to be uploaded to the telegram servers. - */ - public TelegramFile(File file) { - this.file = file; - } - - public String getFile_id() { - return file_id; - } - - public File getFile() { - return file; - } - - public void setFile(File file) { - this.file = file; - } - - public long getFile_size() { - return file_size; - } - - public String getFile_path() { - return file_path; - } - - @Override - public String toString() { - return "TelegramFile [file_id=" + file_id + ", file=" + file + ", file_size=" + file_size + ", file_path=" - + file_path + "]"; - } - -} diff --git a/src/me/shib/java/lib/jtelebot/types/Update.java b/src/me/shib/java/lib/jtelebot/types/Update.java deleted file mode 100644 index 70dcef4..0000000 --- a/src/me/shib/java/lib/jtelebot/types/Update.java +++ /dev/null @@ -1,31 +0,0 @@ -package me.shib.java.lib.jtelebot.types; - -public class Update { - - private long update_id; - private Message message; - private InlineQuery inline_query; - private ChosenInlineResult chosen_inline_result; - - public long getUpdate_id() { - return update_id; - } - - public Message getMessage() { - return message; - } - - public InlineQuery getInline_query() { - return inline_query; - } - - public ChosenInlineResult getChosen_inline_result() { - return chosen_inline_result; - } - - @Override - public String toString() { - return "Update [update_id=" + update_id + ", message=" + message + ", inline_query=" + inline_query + ", chosen_inline_result=" + chosen_inline_result + "]"; - } - -} diff --git a/src/me/shib/java/lib/jtelebot/types/User.java b/src/me/shib/java/lib/jtelebot/types/User.java deleted file mode 100644 index 3fc29de..0000000 --- a/src/me/shib/java/lib/jtelebot/types/User.java +++ /dev/null @@ -1,39 +0,0 @@ -package me.shib.java.lib.jtelebot.types; - -public class User { - - private long id; - private String first_name; - private String last_name; - private String username; - - protected User(long id, String first_name, String last_name, String username) { - this.id = id; - this.first_name = first_name; - this.last_name = last_name; - this.username = username; - } - - public long getId() { - return id; - } - - public String getFirst_name() { - return first_name; - } - - public String getLast_name() { - return last_name; - } - - public String getUsername() { - return username; - } - - @Override - public String toString() { - return "User [id=" + id + ", first_name=" + first_name + ", last_name=" + last_name + ", username=" + username - + "]"; - } - -} diff --git a/src/me/shib/java/lib/jtelebot/types/UserProfilePhotos.java b/src/me/shib/java/lib/jtelebot/types/UserProfilePhotos.java deleted file mode 100644 index f3aa2db..0000000 --- a/src/me/shib/java/lib/jtelebot/types/UserProfilePhotos.java +++ /dev/null @@ -1,23 +0,0 @@ -package me.shib.java.lib.jtelebot.types; - -import java.util.Arrays; - -public class UserProfilePhotos { - - private int total_count; - private PhotoSize[][] photos; - - public int getTotal_count() { - return total_count; - } - - public PhotoSize[][] getPhotos() { - return photos; - } - - @Override - public String toString() { - return "UserProfilePhotos [total_count=" + total_count + ", photos=" + Arrays.toString(photos) + "]"; - } - -} diff --git a/src/me/shib/java/lib/jtelebot/types/Video.java b/src/me/shib/java/lib/jtelebot/types/Video.java deleted file mode 100644 index dd66aab..0000000 --- a/src/me/shib/java/lib/jtelebot/types/Video.java +++ /dev/null @@ -1,53 +0,0 @@ -package me.shib.java.lib.jtelebot.types; - -public class Video { - - private String file_id; - private int width; - private int height; - private int duration; - private PhotoSize thumb; - private String mime_type; - private int file_size; - private String caption; - - public String getFile_id() { - return file_id; - } - - public int getWidth() { - return width; - } - - public int getHeight() { - return height; - } - - public int getDuration() { - return duration; - } - - public PhotoSize getThumb() { - return thumb; - } - - public String getMime_type() { - return mime_type; - } - - public int getFile_size() { - return file_size; - } - - public String getCaption() { - return caption; - } - - @Override - public String toString() { - return "Video [file_id=" + file_id + ", width=" + width + ", height=" + height + ", duration=" + duration - + ", thumb=" + thumb + ", mime_type=" + mime_type + ", file_size=" + file_size + ", caption=" + caption - + "]"; - } - -} diff --git a/src/me/shib/java/lib/jtelebot/types/Voice.java b/src/me/shib/java/lib/jtelebot/types/Voice.java deleted file mode 100644 index 359f7f5..0000000 --- a/src/me/shib/java/lib/jtelebot/types/Voice.java +++ /dev/null @@ -1,32 +0,0 @@ -package me.shib.java.lib.jtelebot.types; - -public class Voice { - - private String file_id; - private int duration; - private String mime_type; - private long file_size; - - public String getFile_id() { - return file_id; - } - - public int getDuration() { - return duration; - } - - public String getMime_type() { - return mime_type; - } - - public long getFile_size() { - return file_size; - } - - @Override - public String toString() { - return "Voice [file_id=" + file_id + ", duration=" + duration + ", mime_type=" + mime_type + ", file_size=" - + file_size + "]"; - } - -}