Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add MessageEvent object and callback handler for it #223

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions sdk/src/main/java/com/vk/api/sdk/callback/CallbackApi.java
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ public class CallbackApi {
private static final String CALLBACK_EVENT_MESSAGE_ALLOW = "message_allow";
private static final String CALLBACK_EVENT_MESSAGE_DENY = "message_deny";
private static final String CALLBACK_EVENT_MESSAGE_EDIT = "message_edit";
private static final String CALLBACK_EVENT_MESSAGE_EVENT = "message_event";
private static final String CALLBACK_EVENT_PHOTO_NEW = "photo_new";
private static final String CALLBACK_EVENT_PHOTO_COMMENT_NEW = "photo_comment_new";
private static final String CALLBACK_EVENT_PHOTO_COMMENT_EDIT = "photo_comment_edit";
Expand Down Expand Up @@ -81,6 +82,8 @@ public class CallbackApi {
}.getType());
types.put(CALLBACK_EVENT_MESSAGE_DENY, new TypeToken<CallbackMessage<MessageDeny>>() {
}.getType());
types.put(CALLBACK_EVENT_MESSAGE_EVENT, new TypeToken<CallbackMessage<MessageEvent>>() {
}.getType());

types.put(CALLBACK_EVENT_PHOTO_NEW, new TypeToken<CallbackMessage<Photo>>() {
}.getType());
Expand Down Expand Up @@ -201,6 +204,13 @@ public void messageDeny(Integer groupId, String secret, MessageDeny message) {
messageDeny(groupId, message);
}

public void messageEvent(Integer groupId, MessageEvent message) {
}

public void messageEvent(Integer groupId, String secret, MessageEvent message) {
messageEvent(groupId, message);
}

public void photoNew(Integer groupId, Photo message) {
}

Expand Down Expand Up @@ -482,6 +492,10 @@ public boolean parse(JsonObject json) {
messageDeny(message.getGroupId(), message.getSecret(), (MessageDeny) message.getObject());
break;

case CALLBACK_EVENT_MESSAGE_EVENT:
messageEvent(message.getGroupId(), message.getSecret(), (MessageEvent) message.getObject());
break;

case CALLBACK_EVENT_PHOTO_NEW:
photoNew(message.getGroupId(), message.getSecret(), (Photo) message.getObject());
break;
Expand Down
107 changes: 107 additions & 0 deletions sdk/src/main/java/com/vk/api/sdk/objects/callback/MessageEvent.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
package com.vk.api.sdk.objects.callback;

import com.google.gson.Gson;
import com.google.gson.JsonObject;
import com.google.gson.annotations.SerializedName;
import com.vk.api.sdk.objects.Validable;

import java.util.Objects;

/**
* MessageEvent object
*/
public class MessageEvent implements Validable {
@SerializedName("user_id")
private Integer userId;

@SerializedName("peer_id")
private Integer peerId;

@SerializedName("event_id")
private String eventId;

@SerializedName("payload")
private JsonObject payload;

@SerializedName("conversation_message_id")
private Integer conversationMessageId;

public Integer getUserId() {
return userId;
}

public MessageEvent setUserId(Integer userId) {
this.userId = userId;
return this;
}

public Integer getPeerId() {
return peerId;
}

public MessageEvent setPeerId(Integer peerId) {
this.peerId = peerId;
return this;
}

public String getEventId() {
return eventId;
}

public MessageEvent setEventId(String eventId) {
this.eventId = eventId;
return this;
}

public JsonObject getPayload() {
return payload;
}

public MessageEvent setPayload(JsonObject payload) {
this.payload = payload;
return this;
}

public Integer getConversationMessageId() {
return conversationMessageId;
}

public MessageEvent setConversationMessageId(Integer conversationMessageId) {
this.conversationMessageId = conversationMessageId;
return this;
}

@Override
public int hashCode() {
return Objects.hash(userId, peerId, eventId, payload, conversationMessageId);
}

@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
MessageEvent messageEvent = (MessageEvent) o;
return Objects.equals(userId, messageEvent.userId) &&
Objects.equals(peerId, messageEvent.peerId) &&
Objects.equals(eventId, messageEvent.eventId) &&
Objects.equals(payload, messageEvent.payload) &&
Objects.equals(conversationMessageId, messageEvent.conversationMessageId);
}

@Override
public String toString() {
final Gson gson = new Gson();
return gson.toJson(this);
}

public String toPrettyString() {
final StringBuilder sb = new StringBuilder("MessageEvent{");
sb.append("userId=").append(userId);
sb.append(", peerId='").append(peerId).append("'");
sb.append(", eventId='").append(eventId).append("'");
sb.append(", payload='").append(payload).append("'");
sb.append(", conversationMessageId='").append(conversationMessageId).append("'");
sb.append('}');
return sb.toString();
}
}