1 files changed, 13 insertions, 147 deletions

diff --git a/src/gnunet_chat_context.c b/src/gnunet_chat_context.c
index 27e8f35..54c63f7 100644
--- a/src/gnunet_chat_context.c
+++ b/src/gnunet_chat_context.c
@@ -22,171 +22,37 @@
  * @file gnunet_chat_context.c
  */
 
-#include "gnunet_chat_lib.h"
 #include "gnunet_chat_context.h"
-#include "gnunet_chat_handle.h"
 
 struct GNUNET_CHAT_Context*
-context_create (struct GNUNET_CHAT_Handle *handle,
-                enum GNUNET_CHAT_ContextType type,
-                const struct GNUNET_HashCode *key)
+context_create_from_room (struct GNUNET_CHAT_Handle *handle,
+                          struct GNUNET_MESSENGER_Room *room)
 {
-  struct GNUNET_MESSENGER_Handle *messenger = handle->handles.messenger;
-
-  struct GNUNET_HashCode _room_key;
-  const struct GNUNET_HashCode *room_key;
-
-  if (key)
-    room_key = key;
-  else
-  {
-    GNUNET_CRYPTO_random_block(
-        GNUNET_CRYPTO_QUALITY_WEAK,
-        &_room_key,
-        sizeof(_room_key)
-    );
-
-    room_key = &_room_key;
-  }
-
-  struct GNUNET_MESSENGER_Room *room = GNUNET_MESSENGER_open_room(
-      messenger, room_key
-  );
-
-  if (!room)
-    return NULL;
-
   struct GNUNET_CHAT_Context* context = GNUNET_new(struct GNUNET_CHAT_Context);
 
   context->handle = handle;
-  context->room = room;
 
-  context->type = type;
-  GNUNET_memcpy(&(context->key), room_key, sizeof(_room_key));
+  context->type = GNUNET_CHAT_CONTEXT_TYPE_UNKNOWN;
   context->nick = NULL;
 
+  context->messages = GNUNET_CONTAINER_multihashmap_create(8, GNUNET_NO);
+  context->invites = GNUNET_CONTAINER_multihashmap_create(8, GNUNET_NO);
+  context->files = GNUNET_CONTAINER_multihashmap_create(8, GNUNET_NO);
+
+  context->room = room;
+
   return context;
 }
 
 void
 context_destroy (struct GNUNET_CHAT_Context* context)
 {
-  GNUNET_free(context);
-}
-
-enum GNUNET_CHAT_ContextType
-context_get_type (struct GNUNET_CHAT_Context* context)
-{
-  return context->type;
-}
+  GNUNET_CONTAINER_multihashmap_destroy(context->messages);
+  GNUNET_CONTAINER_multihashmap_destroy(context->invites);
+  GNUNET_CONTAINER_multihashmap_destroy(context->files);
 
-const struct GNUNET_HashCode*
-context_get_key (struct GNUNET_CHAT_Context* context)
-{
-  return &(context->key);
-}
-
-const char*
-context_get_nick (struct GNUNET_CHAT_Context* context)
-{
-  return context->nick;
-}
-
-void
-context_set_nick (struct GNUNET_CHAT_Context* context,
-                  const char *nick)
-{
   if (context->nick)
     GNUNET_free(context->nick);
 
-  context->nick = nick? GNUNET_strdup(nick) : NULL;
-}
-
-void
-GNUNET_CHAT_context_send_text (struct GNUNET_CHAT_Context *context,
-                               const char *text)
-{
-  if (!context)
-    return;
-
-  struct GNUNET_MESSENGER_Message message;
-  message.header.kind = GNUNET_MESSENGER_KIND_TEXT;
-  message.body.text.text = text;
-
-  GNUNET_MESSENGER_send_message(context->room, &message, NULL);
-}
-
-void
-GNUNET_CHAT_context_send_file (struct GNUNET_CHAT_Context *context,
-                               const char *path)
-{
-  //TODO: generate key, hash file, encrypt file, upload file, share uri & info
-}
-
-void
-GNUNET_CHAT_context_send_uri (struct GNUNET_CHAT_Context *context,
-                              const char *uri)
-{
-  if (!context)
-    return;
-
-  struct GNUNET_MESSENGER_Message message;
-  message.header.kind = GNUNET_MESSENGER_KIND_FILE;
-
-  memset(&(message.body.file.key), 0, sizeof(message.body.file.key));
-
-  message.body.file.hash; // TODO: download & hash
-  GNUNET_memcpy(message.body.file.name, "", 1); // TODO: cut from uri or get from download?
-  message.body.file.uri = uri;
-
-  GNUNET_MESSENGER_send_message(context->room, &message, NULL);
-}
-
-void
-GNUNET_CHAT_context_share_file (struct GNUNET_CHAT_Context *context,
-                                const struct GNUNET_CHAT_File *file)
-{
-  //TODO: send copied message basically
-}
-
-void
-GNUNET_CHAT_context_delete_message (struct GNUNET_CHAT_Context *context,
-                                    const struct GNUNET_HashCode *hash,
-                                    struct GNUNET_TIME_Relative delay)
-{
-  if (!context)
-    return;
-
-  struct GNUNET_MESSENGER_Message message;
-  message.header.kind = GNUNET_MESSENGER_KIND_TEXT;
-  GNUNET_memcpy(&(message.body.delete.hash), hash, sizeof(*hash));
-  message.body.delete.delay = GNUNET_TIME_relative_hton(delay);
-
-  GNUNET_MESSENGER_send_message(context->room, &message, NULL);
-}
-
-int
-GNUNET_CHAT_context_get_message (struct GNUNET_CHAT_Context *context,
-                                 const struct GNUNET_HashCode *hash,
-                                 GNUNET_CHAT_ContextMessageCallback callback,
-                                 void *cls)
-{
-  if (!context)
-    return GNUNET_SYSERR;
-
-  struct GNUNET_MESSENGER_Message *message = GNUNET_MESSENGER_get_message(
-      context->room, hash
-  );
-
-  //TODO: convert messenger-message to chat-message
-
-  return GNUNET_OK;
-}
-
-int
-GNUNET_CHAT_context_iterate_messages (struct GNUNET_CHAT_Context *context,
-                                      GNUNET_CHAT_ContextMessageCallback callback,
-                                      void *cls)
-{
-  return GNUNET_SYSERR;
+  GNUNET_free(context);
 }