Changeset 1692

Timestamp:

03/10/10 16:49:06 (6 months ago)

Author:

swalsh

Message:

Implement most of autojoin, actually making it work still to come, probably should test this too

Location:

trunk

Files:

• include/dbm.h (modified) (1 diff)
• include/nickname.h (modified) (1 diff)
• languages/nickserv.en.lang (modified) (2 diffs)
• modules/nickserv.c (modified) (4 diffs)
• modules/pgsql.c (modified) (1 diff)
• sql/nickserv-pgsql.sql (modified) (1 diff)
• src/nickname.c (modified) (1 diff)

trunk/include/dbm.h

@@ -204 +204 @@
   GET_GROUPS,
   GET_GROUP_CHAN_INFO,
+  GET_AJOINS,
+  INSERT_AJOIN,
+  DELETE_AJOIN,
   QUERY_COUNT
 };

trunk/include/nickname.h

@@ -113 +113 @@
 void nickname_list_admins_free(dlink_list *);
 
+int nickname_ajoin_add(int, int);
+int nickname_ajoin_list(int, dlink_list *);
+int nickname_ajoin_del(int, int);
+void nickname_ajoinlist_free(dlink_list *);
+
 Nickname *nickname_new();
 inline void nickname_free(Nickname *);

trunk/languages/nickserv.en.lang

@@ -153 +153 @@
             CERT DEL 994EB294C15F4EE647FB5A426C11444E697B1814
         
+NS_HELP_AJOIN_SHORT
+        %s: Maintains the nickname auto join list.
+NS_HELP_AJOIN_LONG
+        Usage: AJOIN ADD #channel
+               AJOIN DEL #channel
+               AJOIN LIST
+        
+        Maintains the nickname auto join list. Channels in this list will be
+        automatically joined by your client every time you identify with services.
+        Channels must be registered with channel services to be able to be added to
+        the list.
+        
+        Examples:
+            AJOIN ADD #test
+            AJOIN DEL #test
+            AJOIN LIST
+        
+        The following are valid options to this command:
+NS_HELP_AJOIN_ADD_SHORT
+        %s
+NS_HELP_AJOIN_ADD_LONG
+        Usage: AJOIN ADD #channel
+        
+        Add a channel to the auto join list. The channel must be registered with
+        channel services but does not necessarily need to currently exist on the
+        network.
+        
+        Examples:
+            AJOIN ADD #test
+NS_HELP_AJOIN_LIST_SHORT
+        %s
+NS_HELP_AJOIN_LIST_LONG
+        Usage: AJOIN LIST
+        
+        List entries in your auto join list.
+        
+        Example:
+            AJOIN LIST
+NS_HELP_AJOIN_DEL_SHORT
+        %s
+NS_HELP_AJOIN_DEL_LONG
+        Usage: AJOIN DEL #channel
+        
+        Delete an entry from your auto join list.
+        
+        Examples:
+            AJOIN DEL #test
 NS_HELP_SET_SHORT
         %s: Set nickname properties.
@@ -504 +551 @@
         again.  If this is not the first time you have seen this message please
         contact network support.
+NS_AJOIN_INVALID_CHAN
+        Channel name %s is invalid. Channel names must begin with '#'.
+NS_AJOIN_CHAN_NOT_REG
+        Channel %s is not registered with channel services. Unable to add
+        auto join entries for channels that are not registered.
+NS_AJOIN_ADD
+        AJOIN entry %s has been added.
+NS_AJOIN_ADDFAIL
+        AJOIN entry %s failed to be added. This may have been an internal error,
+        please try again shortly. If this is not the first time you have seen this
+        message please contact network support.
+NS_AJOIN_START
+        AJOIN list:
+NS_AJOIN_ENTRY
+        %d      %s
+NS_AJOIN_LIST_NONE
+        Your AJOIN list is empty and contains no entry.
+NS_AJOIN_DEL
+        AJOIN entry %s deleted.
+NS_AJOIN_DEL_NONE
+        %s was not found on the AJOIN list.
+NS_AJOIN_DEL_ERROR
+        An error occured attempting to delete the AJOIN entry.  Please try again.
+        If this is not the first time you have seen this message please contact
+        network support.
 NS_CERT_ADD
         CERT list entry %s added to nickname %s.

trunk/modules/nickserv.c

@@ -105 +105 @@
 static void m_cert_del(struct Service *, struct Client *, int, char *[]);
 
+static void m_ajoin_add(struct Service *, struct Client *, int, char *[]);
+static void m_ajoin_list(struct Service *, struct Client *, int, char *[]);
+static void m_ajoin_del(struct Service *, struct Client *, int, char *[]);
+
 static int m_set_flag(struct Service *, struct Client *, char *, char *,
     unsigned char (*)(Nickname *), int (*)(Nickname *, unsigned char));
@@ -188 +192 @@
 };
 
+static struct ServiceMessage ajoin_sub[] = {
+  { NULL, "ADD", 0, 0, 2, 0, IDENTIFIED_FLAG, NS_HELP_AJOIN_ADD_SHORT, 
+    NS_HELP_AJOIN_ADD_LONG, m_ajoin_add },
+  { NULL, "LIST", 0, 0, 0, 0, IDENTIFIED_FLAG, NS_HELP_AJOIN_LIST_SHORT, 
+    NS_HELP_AJOIN_LIST_LONG, m_ajoin_list },
+  { NULL, "DEL", 0, 1, 1, 0, IDENTIFIED_FLAG, NS_HELP_AJOIN_DEL_SHORT, 
+    NS_HELP_AJOIN_DEL_LONG, m_ajoin_del },
+  { NULL, NULL, 0, 0, 0, 0, 0, 0, 0, NULL }
+};
+
+static struct ServiceMessage ajoin_msgtab = {
+  cert_sub, "AJOIN", 0, 1, 1, 0, IDENTIFIED_FLAG, NS_HELP_AJOIN_SHORT, 
+  NS_HELP_AJOIN_LONG, NULL
+};
+
 static struct ServiceMessage access_sub[] = {
   { NULL, "ADD", 0, 1, 1, 0, IDENTIFIED_FLAG, NS_HELP_ACCESS_ADD_SHORT, 
@@ -284 +303 @@
   mod_add_servcmd(&nickserv->msg_tree, &access_msgtab);
   mod_add_servcmd(&nickserv->msg_tree, &cert_msgtab);
+  mod_add_servcmd(&nickserv->msg_tree, &ajoin_msgtab);
   mod_add_servcmd(&nickserv->msg_tree, &ghost_msgtab);
   mod_add_servcmd(&nickserv->msg_tree, &link_msgtab);
@@ -1128 +1148 @@
 
 static void
+m_ajoin_add(struct Service *service, struct Client *client, int parc, 
+    char *parv[])
+{
+  Nickname *nick = client->nickname;
+  DBChannel *chan;
+
+  if(*parv[1] != '#')
+  {
+    reply_user(service, service, client, NS_AJOIN_INVALID_CHAN, parv[1]);
+    return;
+  }
+
+  chan = dbchannel_find(parv[1]);
+  if(chan == NULL)
+  {
+    reply_user(service, service, client, NS_AJOIN_CHAN_NOT_REG, parv[1]);
+    return;
+  }
+
+  if(nickname_ajoin_add(nickname_get_id(nick), dbchannel_get_id(chan)))
+    reply_user(service, service, client, NS_AJOIN_ADD, parv[1]);
+  else
+    reply_user(service, service, client, NS_AJOIN_ADDFAIL, parv[1]);
+
+  db_channel_free(chan);
+}
+
+static void
+m_ajoin_list(struct Service *service, struct Client *client, int parc, 
+    char *parv[])
+{
+  Nickname *nick;
+  dlink_list list = { 0 };
+  dlink_node *ptr;
+  int i = 1;
+
+  nick = client->nickname;
+
+  nickname_ajoin_list(nick->id, &list);
+
+  if(dlink_list_length(&list) == 0)
+    reply_user(service, service, client, NS_AJOIN_LIST_NONE);
+  else
+    reply_user(service, service, client, NS_AJOIN_START);
+
+  DLINK_FOREACH(ptr, list.head)
+  {
+    char *ajoin;
+    ajoin = ptr->data;
+    reply_user(service, service, client, NS_AJOIN_ENTRY, i++, ajoin);
+  }
+
+  nickname_ajoinlist_free(&list);
+}
+
+static void
+m_ajoin_del(struct Service *service, struct Client *client, int parc, 
+    char *parv[])
+{
+  Nickname *nick = client->nickname;
+  DBChannel *chan;
+  int ret;
+
+  chan = dbchannel_find(parv[1]);
+  if(chan == NULL)
+  {
+    reply_user(service, service, client, NS_AJOIN_CHAN_NOT_REG, parv[1]);
+    return;
+  }
+
+  ret = nickname_ajoin_delete(nick->id, chan->id);
+
+  if(ret > 0)
+    reply_user(service, service, client, NS_AJOIN_DEL, parv[1]);
+  else if(ret == 0)
+    reply_user(service, service, client, NS_AJOIN_DEL_NONE, parv[1]);
+  else
+    reply_user(service, service, client, NS_AJOIN_DEL_ERROR);
+}
+
+static void
 m_regain(struct Service *service, struct Client *client, int parc, char *parv[])
 {

trunk/modules/pgsql.c

@@ -321 +321 @@
     "channel.id=channel_access.channel_id AND channel_access.group_id=$1 "
     "ORDER BY lower(channel.channel)", QUERY },
+  { GET_AJOINS, "SELECT channel.channel FROM account_autojoin "
+    "JOIN channel ON channel.id=account_autojoin.id WHERE account_autojoin.account_id=$1",
+    QUERY },
+  { INSERT_AJOIN, "INSERT INTO account_autojoin (account_id, channel_id) VALUES "
+    "($1, $2)", EXECUTE },
+  { DELETE_AJOIN, "DELETE FROM account_autojoin WHERE account_id=$1 AND channel_id=$2",
+    EXECUTE },
 };
 

trunk/sql/nickserv-pgsql.sql

@@ -70 +70 @@
 CREATE TABLE account_autojoin (
   id                  SERIAL PRIMARY KEY,
+  account_id          INTEGER REFERENCES account(id) ON DELETE CASCADE NOT NULL,
   channel_id          INTEGER REFERENCES channel(id) ON DELETE CASCADE NOT NULL
 );

trunk/src/nickname.c

@@ -739 +739 @@
 
 int
+nickname_ajoin_add(int account_id, int channel_id)
+{
+  int ret = db_execute_nonquery(INSERT_AJOIN, "ii", account_id, channel_id);
+
+  if(ret == -1)
+    return FALSE;
+
+  return TRUE;
+}
+
+int
+nickname_ajoin_delete(int account_id, int channel_id)
+{
+  return db_execute_nonquery(DELETE_AJOIN, "ii", account_id, channel_id);
+}
+
+int
+nickname_ajoin_list(int account_id, dlink_list *list)
+{
+  result_set_t *results;
+  int error, i;
+
+  results = db_execute(GET_AJOINS, &error, "i", account_id);
+  if(results == NULL && error != 0)
+  {
+    ilog(L_CRIT, "nickname_ajoin_list: database error %d", error);
+    return -1;
+  }
+  else if(results == NULL)
+    return -1;
+
+  for(i = 0; i < results->row_count; i++)
+  {
+    row_t *row = &results->rows[i];
+    char *entry = row->cols[0];
+
+    dlinkAdd(entry, make_dlink_node(), list);
+  }
+
+  db_free_result(results);
+
+  return dlink_list_length(list);
+}
+
+void
+nickname_ajoinlist_free(dlink_list *list)
+{
+  dlink_node *ptr, *next;
+  char *entry;
+
+  ilog(L_DEBUG, "Freeing nickname ajoin list %p of length %lu", list,
+      dlink_list_length(list));
+
+  DLINK_FOREACH_SAFE(ptr, next, list->head)
+  {
+    entry = (char*)ptr->data;
+    MyFree(entry);
+    dlinkDelete(ptr, list);
+    free_dlink_node(ptr);
+  }
+}
+
+int
 nickname_cert_list(Nickname *nick, dlink_list *list)
 {