tox 0.0.1 → 0.0.2

data/ext/tox/extconf.rb

@@ -44,34 +44,78 @@ have_func 'nanosleep' and
 have_macro 'TOX_VERSION_IS_API_COMPATIBLE', 'tox/tox.h' and
 have_macro 'TOX_VERSION_IS_ABI_COMPATIBLE', 'tox/tox.h' and
 
-have_type 'TOX_ERR_NEW',           'tox/tox.h' and
-have_type 'TOX_ERR_BOOTSTRAP',     'tox/tox.h' and
-have_type 'TOX_ERR_SET_INFO',      'tox/tox.h' and
-have_type 'TOX_MESSAGE_TYPE',      'tox/tox.h' and
-have_type 'tox_friend_request_cb', 'tox/tox.h' and
-have_type 'tox_friend_message_cb', 'tox/tox.h' and
+have_type 'TOX_ERR_NEW',                   'tox/tox.h' and
+have_type 'TOX_ERR_BOOTSTRAP',             'tox/tox.h' and
+have_type 'TOX_ERR_SET_INFO',              'tox/tox.h' and
+have_type 'TOX_ERR_FRIEND_GET_PUBLIC_KEY', 'tox/tox.h' and
+have_type 'TOX_ERR_FRIEND_QUERY',          'tox/tox.h' and
+have_type 'TOX_ERR_FRIEND_SEND_MESSAGE',   'tox/tox.h' and
+have_type 'TOX_MESSAGE_TYPE',              'tox/tox.h' and
+have_type 'TOX_USER_STATUS',               'tox/tox.h' and
+have_type 'tox_friend_request_cb',         'tox/tox.h' and
+have_type 'tox_friend_message_cb',         'tox/tox.h' and
+have_type 'tox_friend_name_cb',            'tox/tox.h' and
+have_type 'tox_friend_status_message_cb',  'tox/tox.h' and
+have_type 'tox_friend_status_cb',          'tox/tox.h' and
 
 have_struct_member 'struct Tox_Options', 'savedata_type',   'tox/tox.h' and
 have_struct_member 'struct Tox_Options', 'savedata_length', 'tox/tox.h' and
 have_struct_member 'struct Tox_Options', 'savedata_data',   'tox/tox.h' and
 
-have_const 'TOX_SAVEDATA_TYPE_NONE',      'tox/tox.h' and
-have_const 'TOX_SAVEDATA_TYPE_TOX_SAVE',  'tox/tox.h' and
-have_const 'TOX_ERR_NEW_OK',              'tox/tox.h' and
-have_const 'TOX_ERR_NEW_MALLOC',          'tox/tox.h' and
-have_const 'TOX_ERR_NEW_LOAD_BAD_FORMAT', 'tox/tox.h' and
-have_const 'TOX_ADDRESS_SIZE',            'tox/tox.h' and
-have_const 'TOX_PUBLIC_KEY_SIZE',         'tox/tox.h' and
-have_const 'TOX_ERR_BOOTSTRAP_OK',        'tox/tox.h' and
-have_const 'TOX_ERR_SET_INFO_OK',         'tox/tox.h' and
-have_const 'TOX_MESSAGE_TYPE_NORMAL',     'tox/tox.h' and
+have_const 'TOX_VERSION_MAJOR',                              'tox/tox.h' and
+have_const 'TOX_VERSION_MINOR',                              'tox/tox.h' and
+have_const 'TOX_VERSION_PATCH',                              'tox/tox.h' and
+have_const 'TOX_HASH_LENGTH',                                'tox/tox.h' and
+have_const 'TOX_SAVEDATA_TYPE_NONE',                         'tox/tox.h' and
+have_const 'TOX_SAVEDATA_TYPE_TOX_SAVE',                     'tox/tox.h' and
+have_const 'TOX_ERR_NEW_OK',                                 'tox/tox.h' and
+have_const 'TOX_ERR_NEW_NULL',                               'tox/tox.h' and
+have_const 'TOX_ERR_NEW_MALLOC',                             'tox/tox.h' and
+have_const 'TOX_ERR_NEW_PORT_ALLOC',                         'tox/tox.h' and
+have_const 'TOX_ERR_NEW_PROXY_BAD_TYPE',                     'tox/tox.h' and
+have_const 'TOX_ERR_NEW_PROXY_BAD_HOST',                     'tox/tox.h' and
+have_const 'TOX_ERR_NEW_PROXY_BAD_PORT',                     'tox/tox.h' and
+have_const 'TOX_ERR_NEW_PROXY_NOT_FOUND',                    'tox/tox.h' and
+have_const 'TOX_ERR_NEW_LOAD_ENCRYPTED',                     'tox/tox.h' and
+have_const 'TOX_ERR_NEW_LOAD_BAD_FORMAT',                    'tox/tox.h' and
+have_const 'TOX_ADDRESS_SIZE',                               'tox/tox.h' and
+have_const 'TOX_PUBLIC_KEY_SIZE',                            'tox/tox.h' and
+have_const 'TOX_ERR_BOOTSTRAP_OK',                           'tox/tox.h' and
+have_const 'TOX_ERR_BOOTSTRAP_NULL',                         'tox/tox.h' and
+have_const 'TOX_ERR_BOOTSTRAP_BAD_HOST',                     'tox/tox.h' and
+have_const 'TOX_ERR_BOOTSTRAP_BAD_PORT',                     'tox/tox.h' and
+have_const 'TOX_ERR_SET_INFO_OK',                            'tox/tox.h' and
+have_const 'TOX_ERR_SET_INFO_NULL',                          'tox/tox.h' and
+have_const 'TOX_ERR_SET_INFO_TOO_LONG',                      'tox/tox.h' and
+have_const 'TOX_MESSAGE_TYPE_NORMAL',                        'tox/tox.h' and
+have_const 'TOX_MESSAGE_TYPE_ACTION',                        'tox/tox.h' and
+have_const 'TOX_ERR_FRIEND_GET_PUBLIC_KEY_OK',               'tox/tox.h' and
+have_const 'TOX_ERR_FRIEND_GET_PUBLIC_KEY_FRIEND_NOT_FOUND', 'tox/tox.h' and
+have_const 'TOX_ERR_FRIEND_QUERY_OK',                        'tox/tox.h' and
+have_const 'TOX_ERR_FRIEND_QUERY_NULL',                      'tox/tox.h' and
+have_const 'TOX_ERR_FRIEND_QUERY_FRIEND_NOT_FOUND',          'tox/tox.h' and
+have_const 'TOX_USER_STATUS_NONE',                           'tox/tox.h' and
+have_const 'TOX_USER_STATUS_AWAY',                           'tox/tox.h' and
+have_const 'TOX_USER_STATUS_BUSY',                           'tox/tox.h' and
+have_const 'TOX_ERR_FRIEND_SEND_MESSAGE_OK',                 'tox/tox.h' and
+have_const 'TOX_ERR_FRIEND_SEND_MESSAGE_NULL',               'tox/tox.h' and
+have_const 'TOX_ERR_FRIEND_SEND_MESSAGE_FRIEND_NOT_FOUND',   'tox/tox.h' and
+have_const 'TOX_ERR_FRIEND_SEND_MESSAGE_FRIEND_NOT_CONNECTED', 'tox/tox.h' and
+have_const 'TOX_ERR_FRIEND_SEND_MESSAGE_SENDQ',                'tox/tox.h' and
+have_const 'TOX_ERR_FRIEND_SEND_MESSAGE_TOO_LONG',             'tox/tox.h' and
+have_const 'TOX_ERR_FRIEND_SEND_MESSAGE_EMPTY',                'tox/tox.h' and
 
+have_func 'tox_version_major',                'tox/tox.h' and
+have_func 'tox_version_minor',                'tox/tox.h' and
+have_func 'tox_version_patch',                'tox/tox.h' and
 have_func 'tox_version_is_compatible',        'tox/tox.h' and
+have_func 'tox_hash',                         'tox/tox.h' and
 have_func 'tox_new',                          'tox/tox.h' and
 have_func 'tox_options_default',              'tox/tox.h' and
 have_func 'tox_get_savedata_size',            'tox/tox.h' and
 have_func 'tox_get_savedata',                 'tox/tox.h' and
 have_func 'tox_self_get_address',             'tox/tox.h' and
+have_func 'tox_self_get_public_key',          'tox/tox.h' and
 have_func 'tox_kill',                         'tox/tox.h' and
 have_func 'tox_bootstrap',                    'tox/tox.h' and
 have_func 'tox_iteration_interval',           'tox/tox.h' and
@@ -86,5 +130,18 @@ have_func 'tox_self_set_name',                'tox/tox.h' and
 have_func 'tox_self_get_status_message_size', 'tox/tox.h' and
 have_func 'tox_self_get_status_message',      'tox/tox.h' and
 have_func 'tox_self_set_status_message',      'tox/tox.h' and
+have_func 'tox_self_get_status',              'tox/tox.h' and
+have_func 'tox_self_set_status',              'tox/tox.h' and
+have_func 'tox_self_get_friend_list_size',    'tox/tox.h' and
+have_func 'tox_self_get_friend_list',         'tox/tox.h' and
+have_func 'tox_friend_exists',                'tox/tox.h' and
+have_func 'tox_friend_get_public_key',        'tox/tox.h' and
+have_func 'tox_friend_get_name_size',         'tox/tox.h' and
+have_func 'tox_friend_get_name',              'tox/tox.h' and
+have_func 'tox_friend_get_status_message',    'tox/tox.h' and
+have_func 'tox_friend_get_status',            'tox/tox.h' and
+have_func 'tox_callback_friend_name',         'tox/tox.h' and
+have_func 'tox_callback_friend_status_message', 'tox/tox.h' and
+have_func 'tox_callback_friend_status',         'tox/tox.h' and
 
 create_makefile 'tox/tox' or exit 1

data/ext/tox/friend.c

@@ -16,16 +16,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "friend.h"
 #include "tox.h"
-#include "client.h"
-
-// Instance
-VALUE mTox_cFriend;
 
 // Public methods
 
+static VALUE mTox_cFriend_exist_QUESTION(VALUE self);
+static VALUE mTox_cFriend_public_key(VALUE self);
 static VALUE mTox_cFriend_send_message(VALUE self, VALUE text);
+static VALUE mTox_cFriend_name(VALUE self);
+static VALUE mTox_cFriend_status(VALUE self);
+static VALUE mTox_cFriend_status_message(VALUE self);
 
 /*************************************************************
  * Initialization
@@ -33,18 +33,87 @@ static VALUE mTox_cFriend_send_message(VALUE self, VALUE text);
 
 void mTox_cFriend_INIT()
 {
-  // Instance
-  mTox_cFriend = rb_define_class_under(mTox, "Friend", rb_cObject);
-
   // Public methods
 
-  rb_define_method(mTox_cFriend, "send_message", mTox_cFriend_send_message, 1);
+  rb_define_method(mTox_cFriend, "exist?",         mTox_cFriend_exist_QUESTION, 0);
+  rb_define_method(mTox_cFriend, "exists?",        mTox_cFriend_exist_QUESTION, 0);
+  rb_define_method(mTox_cFriend, "public_key",     mTox_cFriend_public_key,     0);
+  rb_define_method(mTox_cFriend, "send_message",   mTox_cFriend_send_message,   1);
+  rb_define_method(mTox_cFriend, "name",           mTox_cFriend_name,           0);
+  rb_define_method(mTox_cFriend, "status",         mTox_cFriend_status,         0);
+  rb_define_method(mTox_cFriend, "status_message", mTox_cFriend_status_message, 0);
 }
 
 /*************************************************************
  * Public methods
  *************************************************************/
 
+// Tox::Friend#exist?
+// Tox::Friend#exists?
+VALUE mTox_cFriend_exist_QUESTION(const VALUE self)
+{
+  const VALUE client = rb_iv_get(self, "@client");
+  const VALUE number = rb_iv_get(self, "@number");
+
+  mTox_cClient_CDATA *client_cdata;
+
+  Data_Get_Struct(client, mTox_cClient_CDATA, client_cdata);
+
+  const bool result = tox_friend_exists(client_cdata->tox, NUM2LONG(number));
+
+  if (result) {
+    return Qtrue;
+  }
+  else {
+    return Qfalse;
+  }
+}
+
+// Tox::Friend#public_key
+VALUE mTox_cFriend_public_key(const VALUE self)
+{
+  const VALUE client = rb_iv_get(self, "@client");
+  const VALUE number = rb_iv_get(self, "@number");
+
+  mTox_cClient_CDATA *client_cdata;
+
+  Data_Get_Struct(client, mTox_cClient_CDATA, client_cdata);
+
+  uint8_t public_key[TOX_PUBLIC_KEY_SIZE];
+
+  TOX_ERR_FRIEND_GET_PUBLIC_KEY error;
+
+  const bool result = tox_friend_get_public_key(
+    client_cdata->tox,
+    NUM2LONG(number),
+    public_key,
+    &error
+  );
+
+  switch (error) {
+    case TOX_ERR_FRIEND_GET_PUBLIC_KEY_OK:
+      break;
+    case TOX_ERR_FRIEND_GET_PUBLIC_KEY_FRIEND_NOT_FOUND:
+      rb_raise(
+        mTox_cFriend_eNotFoundError,
+        "tox_friend_get_public_key() failed with TOX_ERR_FRIEND_GET_PUBLIC_KEY_FRIEND_NOT_FOUND"
+      );
+    default:
+      rb_raise(mTox_eUnknownSecurityError, "tox_friend_get_public_key() failed");
+  }
+
+  if (result != true) {
+    rb_raise(mTox_eUnknownSecurityError, "tox_friend_get_public_key() failed");
+  }
+
+  return rb_funcall(
+    mTox_cPublicKey,
+    rb_intern("new"),
+    1,
+    rb_str_new(public_key, TOX_PUBLIC_KEY_SIZE)
+  );
+}
+
 // Tox::Friend#send_message
 VALUE mTox_cFriend_send_message(const VALUE self, const VALUE text)
 {
@@ -59,23 +128,240 @@ VALUE mTox_cFriend_send_message(const VALUE self, const VALUE text)
 
   TOX_ERR_FRIEND_ADD error;
 
-  const result = tox_friend_send_message(
+  const VALUE result = LONG2FIX(tox_friend_send_message(
     client_cdata->tox,
     NUM2LONG(number),
     TOX_MESSAGE_TYPE_NORMAL,
     (uint8_t*)RSTRING_PTR(text),
     RSTRING_LEN(text),
     &error
-  );
+  ));
 
   switch (error) {
     case TOX_ERR_FRIEND_SEND_MESSAGE_OK:
       break;
+    case TOX_ERR_FRIEND_SEND_MESSAGE_NULL:
+      rb_raise(
+        mTox_eNullError,
+        "tox_friend_send_message() failed with TOX_ERR_FRIEND_SEND_MESSAGE_NULL"
+      );
+    case TOX_ERR_FRIEND_SEND_MESSAGE_FRIEND_NOT_FOUND:
+      rb_raise(
+        mTox_cFriend_eNotFoundError,
+        "tox_friend_send_message() failed with TOX_ERR_FRIEND_SEND_MESSAGE_FRIEND_NOT_FOUND"
+      );
+    case TOX_ERR_FRIEND_SEND_MESSAGE_FRIEND_NOT_CONNECTED:
+      rb_raise(
+        mTox_cFriend_eNotConnectedError,
+        "tox_friend_send_message() failed with TOX_ERR_FRIEND_SEND_MESSAGE_FRIEND_NOT_CONNECTED"
+      );
     case TOX_ERR_FRIEND_SEND_MESSAGE_SENDQ:
-      rb_raise(rb_eNoMemError, "tox_friend_send_message() returned TOX_ERR_FRIEND_SEND_MESSAGE_SENDQ");
+      rb_raise(
+        mTox_mOutMessage_eSendQueueAllocError,
+        "tox_friend_send_message() failed with TOX_ERR_FRIEND_SEND_MESSAGE_SENDQ"
+      );
+    case TOX_ERR_FRIEND_SEND_MESSAGE_TOO_LONG:
+      rb_raise(
+        mTox_mOutMessage_eTooLongError,
+        "tox_friend_send_message() failed with TOX_ERR_FRIEND_SEND_MESSAGE_TOO_LONG"
+      );
+    case TOX_ERR_FRIEND_SEND_MESSAGE_EMPTY:
+      rb_raise(
+        mTox_mOutMessage_eEmptyError,
+        "tox_friend_send_message() failed with TOX_ERR_FRIEND_SEND_MESSAGE_EMPTY"
+      );
     default:
-      rb_raise(rb_eRuntimeError, "tox_friend_send_message() failed");
+      rb_raise(mTox_eUnknownError, "tox_friend_send_message() failed");
+  }
+
+  return rb_funcall(
+    mTox_cFriend_cOutMessage,
+    rb_intern("new"),
+    2,
+    self,
+    result
+  );
+}
+
+// Tox::Friend#name
+VALUE mTox_cFriend_name(const VALUE self)
+{
+  const VALUE client = rb_iv_get(self, "@client");
+  const VALUE number = rb_iv_get(self, "@number");
+
+  mTox_cClient_CDATA *client_cdata;
+
+  Data_Get_Struct(client, mTox_cClient_CDATA, client_cdata);
+
+  TOX_ERR_FRIEND_QUERY error;
+
+  const size_t name_size = tox_friend_get_name_size(
+    client_cdata->tox,
+    NUM2LONG(number),
+    &error
+  );
+
+  switch (error) {
+    case TOX_ERR_FRIEND_QUERY_OK:
+      break;
+    case TOX_ERR_FRIEND_QUERY_NULL:
+      rb_raise(
+        mTox_eNullError,
+        "tox_friend_get_name_size() failed with TOX_ERR_FRIEND_QUERY_NULL"
+      );
+    case TOX_ERR_FRIEND_QUERY_FRIEND_NOT_FOUND:
+      rb_raise(
+        mTox_cFriend_eNotFoundError,
+        "tox_friend_get_name_size() failed with TOX_ERR_FRIEND_QUERY_FRIEND_NOT_FOUND"
+      );
+    default:
+      rb_raise(mTox_eUnknownError, "tox_friend_get_name_size() failed");
+  }
+
+  char name[name_size];
+
+  const bool result = tox_friend_get_name(
+    client_cdata->tox,
+    NUM2LONG(number),
+    name,
+    &error
+  );
+
+  switch (error) {
+    case TOX_ERR_FRIEND_QUERY_OK:
+      break;
+    case TOX_ERR_FRIEND_QUERY_NULL:
+      rb_raise(
+        mTox_eNullError,
+        "tox_friend_get_name() failed with TOX_ERR_FRIEND_QUERY_NULL"
+      );
+    case TOX_ERR_FRIEND_QUERY_FRIEND_NOT_FOUND:
+      rb_raise(
+        mTox_cFriend_eNotFoundError,
+        "tox_friend_get_name() failed with TOX_ERR_FRIEND_QUERY_FRIEND_NOT_FOUND"
+      );
+    default:
+      rb_raise(mTox_eUnknownError, "tox_friend_get_name() failed");
+  }
+
+  if (result != true) {
+    rb_raise(mTox_eUnknownError, "tox_friend_get_name() failed");
+  }
+
+  return rb_str_new(name, name_size);
+}
+
+// Tox::Friend#status
+VALUE mTox_cFriend_status(const VALUE self)
+{
+  const VALUE client = rb_iv_get(self, "@client");
+  const VALUE number = rb_iv_get(self, "@number");
+
+  mTox_cClient_CDATA *client_cdata;
+
+  Data_Get_Struct(client, mTox_cClient_CDATA, client_cdata);
+
+  TOX_ERR_FRIEND_QUERY error;
+
+  const TOX_USER_STATUS result = tox_friend_get_status(
+    client_cdata->tox,
+    NUM2LONG(number),
+    &error
+  );
+
+  switch (error) {
+    case TOX_ERR_FRIEND_QUERY_OK:
+      break;
+    case TOX_ERR_FRIEND_QUERY_NULL:
+      rb_raise(
+        mTox_eNullError,
+        "tox_friend_get_status() failed with TOX_ERR_FRIEND_QUERY_NULL"
+      );
+    case TOX_ERR_FRIEND_QUERY_FRIEND_NOT_FOUND:
+      rb_raise(
+        mTox_cFriend_eNotFoundError,
+        "tox_friend_get_status() failed with TOX_ERR_FRIEND_QUERY_FRIEND_NOT_FOUND"
+      );
+    default:
+      rb_raise(mTox_eUnknownError, "tox_friend_get_name() failed");
+  }
+
+  switch (result) {
+    case TOX_USER_STATUS_NONE:
+      return mTox_mUserStatus_NONE;
+    case TOX_USER_STATUS_AWAY:
+      return mTox_mUserStatus_AWAY;
+    case TOX_USER_STATUS_BUSY:
+      return mTox_mUserStatus_BUSY;
+    default:
+      rb_raise(rb_eNotImpError, "Tox::Client#status has unknown value");
+  }
+}
+
+// Tox::Friend#status_message
+VALUE mTox_cFriend_status_message(const VALUE self)
+{
+  const VALUE client = rb_iv_get(self, "@client");
+  const VALUE number = rb_iv_get(self, "@number");
+
+  mTox_cClient_CDATA *client_cdata;
+
+  Data_Get_Struct(client, mTox_cClient_CDATA, client_cdata);
+
+  TOX_ERR_FRIEND_QUERY error;
+
+  const size_t status_message_size = tox_friend_get_status_message_size(
+    client_cdata->tox,
+    NUM2LONG(number),
+    &error
+  );
+
+  switch (error) {
+    case TOX_ERR_FRIEND_QUERY_OK:
+      break;
+    case TOX_ERR_FRIEND_QUERY_NULL:
+      rb_raise(
+        mTox_eNullError,
+        "tox_friend_get_status_message_size() failed with TOX_ERR_FRIEND_QUERY_NULL"
+      );
+    case TOX_ERR_FRIEND_QUERY_FRIEND_NOT_FOUND:
+      rb_raise(
+        mTox_cFriend_eNotFoundError,
+        "tox_friend_get_status_message_size() failed with TOX_ERR_FRIEND_QUERY_FRIEND_NOT_FOUND"
+      );
+    default:
+      rb_raise(mTox_eUnknownError, "tox_friend_get_status_message_size() failed");
+  }
+
+  char status_message[status_message_size];
+
+  const bool result = tox_friend_get_status_message(
+    client_cdata->tox,
+    NUM2LONG(number),
+    status_message,
+    &error
+  );
+
+  switch (error) {
+    case TOX_ERR_FRIEND_QUERY_OK:
+      break;
+    case TOX_ERR_FRIEND_QUERY_NULL:
+      rb_raise(
+        mTox_eNullError,
+        "tox_friend_get_status_message() failed with TOX_ERR_FRIEND_QUERY_NULL"
+      );
+    case TOX_ERR_FRIEND_QUERY_FRIEND_NOT_FOUND:
+      rb_raise(
+        mTox_cFriend_eNotFoundError,
+        "tox_friend_get_status_message() failed with TOX_ERR_FRIEND_QUERY_FRIEND_NOT_FOUND"
+      );
+    default:
+      rb_raise(mTox_eUnknownError, "tox_friend_get_status_message() failed");
+  }
+
+  if (result != true) {
+    rb_raise(mTox_eUnknownError, "tox_friend_get_status_message() failed");
   }
 
-  return LONG2FIX(result);
+  return rb_str_new(status_message, status_message_size);
 }