Implements #23

darmiel · Nov 30, 2020 · 922da85 · 922da85
1 parent ccebc2c
commit 922da85
Show file tree

Hide file tree

Showing 6 changed files with 139 additions and 166 deletions.
diff --git a/...ram-crawler-core/src/main/java/io/d2a/schwurbelwatch/mods/updaters/ChatsUpdateModule.java b/...ram-crawler-core/src/main/java/io/d2a/schwurbelwatch/mods/updaters/ChatsUpdateModule.java
@@ -54,25 +54,18 @@ public void onEnable() {
     }
   }
 
-  private void addOrUpdateChat(@Nullable final Chat chat, @Nullable final ApiChat apiChat) {
-    if (chat != null) {
-      // Logger.debug(chat);
-    }
-    //Logger.debug(apiChat);
-
-    SwApi.callDatabaseResult(SwApi.CHAT_SERVICE.addChat(apiChat));
-  }
-
   @Subscribe
   public void onUpdateNewChat(final TdApi.UpdateNewChat event) {
     final Chat chat = event.chat;
     final ApiChat build = ApiChat.builder()
         .chatId(chat.id)
         .title(chat.title)
         .type(ChatType.getType(chat.type))
-        .lastUpdated(System.currentTimeMillis())
         .build();
-    addOrUpdateChat(chat, build);
+
+    // uppdate new chat
+    // -> chatId
+    SwApi.callDatabaseResult(SwApi.CHAT_SERVICE.addChat(build));
   }
 
   @Subscribe
@@ -81,7 +74,10 @@ public void onChatTitleUpdate(final UpdateChatTitle event) {
         .chatId(event.chatId)
         .title(event.title)
         .build();
-    addOrUpdateChat(null, build);
+
+    // uppdate chat title
+    // -> chatId
+    SwApi.callDatabaseResult(SwApi.CHAT_SERVICE.addChat(build));
   }
 
   @Subscribe
@@ -111,7 +107,7 @@ public void onNewMessage(final UpdateNewMessage event) {
   }
 
   @RequiredArgsConstructor
-  public class ChatInfoResultHandler implements ResultHandler {
+  public static class ChatInfoResultHandler implements ResultHandler {
 
     private final Client client;
 
@@ -148,10 +144,11 @@ public void onResult(final Object object) {
             .groupId(groupId)
             .title(chat.title)
             .type(ChatType.getType(chat.type))
-            .lastUpdated(System.currentTimeMillis())
             .build();
 
-        addOrUpdateChat(null, build);
+        // uppdate chat title
+        // -> chatId
+        SwApi.callDatabaseResult(SwApi.CHAT_SERVICE.addChat(build));
         return;
       }
 
@@ -184,7 +181,9 @@ public void onResult(final Object object) {
       }
 
       if (apiChat != null) {
-        addOrUpdateChat(null, apiChat);
+        // uppdate chat title
+        // -> chatId
+        SwApi.callDatabaseResult(SwApi.CHAT_SERVICE.addChat(apiChat));
       }
     }
   }

diff --git a/...rawler/telegram-crawler-core/src/main/java/io/d2a/schwurbelwatch/tgcrawler/api/SwApi.java b/...rawler/telegram-crawler-core/src/main/java/io/d2a/schwurbelwatch/tgcrawler/api/SwApi.java
@@ -27,7 +27,7 @@ public class SwApi {
 
   public static final Gson GSON = new GsonBuilder()
       .setPrettyPrinting()
-      .serializeNulls()
+      // .serializeNulls()
       .create();
 
   private static final Retrofit retrofit = new Retrofit.Builder()

diff --git a/...-crawler-core/src/main/java/io/d2a/schwurbelwatch/tgcrawler/api/routes/chats/ApiChat.java b/...-crawler-core/src/main/java/io/d2a/schwurbelwatch/tgcrawler/api/routes/chats/ApiChat.java
@@ -29,7 +29,7 @@ public class ApiChat {
   public final Byte isScam;
 
   @SerializedName("last_updated")
-  public final long lastUpdated;
+  public final Long lastUpdated;
 
   public final Byte monitor;
 

diff --git a/...wler-core/src/main/java/io/d2a/schwurbelwatch/tgcrawler/api/routes/chats/ChatService.java b/...wler-core/src/main/java/io/d2a/schwurbelwatch/tgcrawler/api/routes/chats/ChatService.java
@@ -15,8 +15,11 @@ public interface ChatService {
   @GET("chats")
   Call<List<ApiChat>> getChats(@Query("offset") long offset);
 
-  @POST("chats")
-  Call<DatabaseResult> addChat(@Body ApiChat chat);
+  @POST("chats/chatId")
+  Call<DatabaseResult> addChatByChatId(@Body ApiChat chat);
+
+  @POST("chats/groupId")
+  Call<DatabaseResult> addChatByGroupId(@Body ApiChat chat);
 
   @GET("chats/:id")
   Call<ApiChat> getChat(@Path("id") long chatId);
@@ -27,4 +30,14 @@ public interface ChatService {
   @POST("chats/:id/count/:count")
   Call<DatabaseResult> updateMemberCount(@Path("id") long chatId, @Path("count") int count);
 
+  default Call<DatabaseResult> addChat(ApiChat chat) {
+    if (chat.chatId != null) {
+      return addChatByChatId(chat);
+    } else if (chat.groupId != null) {
+      return addChatByGroupId(chat);
+    } else {
+      return null;
+    }
+  }
+
 }