Changeset 6277

Timestamp:

06/13/08 03:16:28 (7 months ago)

Author:

flynd

Message:

Added more general user group editing function to user manager so allow simpler group membership code in plugins.

Location:

trunk/licq

Files:

• include/licq_icqd.h (modified) (1 diff)
• include/licq_user.h (modified) (1 diff)
• src/icqd-srv.cpp (modified) (3 diffs)
• src/user.cpp (modified) (1 diff)

trunk/licq/include/licq_icqd.h

@@ -481 +481 @@
 
   // Visible/Invisible/Ignore list functions
+  /**
+   * Set visible list status for a contact
+   *
+   * @param id User id
+   * @param ppid User protocol id
+   * @param visible True to add user to visible list or false to remove
+   */
+  void ProtoSetInVisibleList(const char* id, unsigned long ppid, bool visible);
+
+  /**
+   * Set invisible list status for a contact
+   *
+   * @param id User id
+   * @param ppid User protocol id
+   * @param invisible True to add user to invisible list or false to remove
+   */
+  void ProtoSetInInvisibleList(const char* id, unsigned long ppid, bool invisible);
+
+  /**
+   * Set invisible list status for a contact
+   *
+   * @param id User id
+   * @param ppid User protocol id
+   * @param ignore True to add user to ignore list or false to remove
+   */
+  void ProtoSetInIgnoreList(const char* id, unsigned long ppid, bool ignore);
+
   void ProtoToggleInvisibleList(const char *_szId, unsigned long _nPPID);
   void ProtoToggleVisibleList(const char *_szId, unsigned long _nPPID);

trunk/licq/include/licq_user.h

@@ -1128 +1128 @@
   unsigned short GenerateSID();
 
+  /**
+   * Set user group membership and (optionally) update server
+   *
+   * @param id User id
+   * @param ppid User protocol id
+   * @param groupType Group type
+   * @param groupId Group id
+   * @param inGroup True to add user to group or false to remove
+   * @param updateServer True if server list should be updated
+   */
+  void SetUserInGroup(const char* id, unsigned long ppid, GroupType groupType,
+      unsigned short groupId, bool inGroup, bool updateServer = true);
+
+  // Deprecated group manipulation functions
   void AddUserToGroup(unsigned long _nUin, unsigned short _nGroup);
   void RemoveUserFromGroup(unsigned long _nUin, unsigned short _nGroup);
-  void AddUserToGroup(const char *, unsigned long, unsigned short);
-  void RemoveUserFromGroup(const char *, unsigned long, unsigned short);
+
+  /**
+   * Add user to a group and update server group
+   *
+   * @param id User id
+   * @param ppid User protocol id
+   * @param groupId Group id
+   */
+  void AddUserToGroup(const char* id, unsigned long ppid, unsigned short groupId)
+  { SetUserInGroup(id, ppid, GROUPS_USER, groupId, true, true); }
+
+  /**
+   * Remove user from a group
+   *
+   * @param id User id
+   * @param ppid User protocol id
+   * @param groupId Group id
+   */
+  void RemoveUserFromGroup(const char* id, unsigned long ppid, unsigned short groupId)
+  { SetUserInGroup(id, ppid, GROUPS_USER, groupId, false); }
+
   void SaveAllUsers();
 

trunk/licq/src/icqd-srv.cpp

@@ -1320 +1320 @@
   bool b = u->VisibleList();
   gUserManager.DropUser(u);
-
-  if (b)
+  ProtoSetInVisibleList(_szId, _nPPID, !b);
+}
+
+void CICQDaemon::ProtoSetInVisibleList(const char* _szId, unsigned long _nPPID, bool visible)
+{
+  if (!visible)
     if (_nPPID == LICQ_PPID)
       icqRemoveFromVisibleList(_szId, _nPPID);
@@ -1349 +1353 @@
   bool b = u->InvisibleList();
   gUserManager.DropUser(u);
-
-  if (b)
+  ProtoSetInInvisibleList(_szId, _nPPID, !b);
+}
+
+void CICQDaemon::ProtoSetInInvisibleList(const char* _szId, unsigned long _nPPID, bool invisible)
+{
+  if (!invisible)
     if (_nPPID == LICQ_PPID)
       icqRemoveFromInvisibleList(_szId, _nPPID);
@@ -1378 +1386 @@
   bool b = u->IgnoreList();
   gUserManager.DropUser(u);
-
+  ProtoSetInIgnoreList(_szId, _nPPID, b);
+}
+
+void CICQDaemon::ProtoSetInIgnoreList(const char* _szId, unsigned long _nPPID, bool b)
+{
   if (_nPPID == LICQ_PPID)
   {

trunk/licq/src/user.cpp

@@ -1602 +1602 @@
 }
 
-/*---------------------------------------------------------------------------
- * CUserManager::AddUserToGroup
- *-------------------------------------------------------------------------*/
-void CUserManager::AddUserToGroup(const char *szId, unsigned long nPPID,
-  unsigned short _nGroup)
-{
-  //TODO: For other protocols
-  ICQUser *u = FetchUser(szId, nPPID, LOCK_W);
-  if (u == NULL) return;
-  u->AddToGroup(GROUPS_USER, _nGroup);
-  int nGSID = u->GetGSID();
-  DropUser(u);
-  if (gLicqDaemon && nPPID == LICQ_PPID)
-    gLicqDaemon->icqChangeGroup(szId, nPPID, _nGroup,
-      nGSID, ICQ_ROSTxNORMAL, ICQ_ROSTxNORMAL);
+void CUserManager::SetUserInGroup(const char* id, unsigned long ppid,
+    GroupType groupType, unsigned short groupId, bool inGroup, bool updateServer)
+{
+  ICQUser* u = gUserManager.FetchUser(id, ppid, LOCK_W);
+  if (u == NULL)
+    return;
+
+  int gsid = u->GetGSID();
+
+  if (!inGroup && u->GetSID() != 0 && GetGroupFromID(gsid) == groupId)
+  {
+    // Don't remove user from local group if member of the same server group
+    gUserManager.DropUser(u);
+    return;
+  }
+
+  // Update user object
+  u->SetInGroup(groupType, groupId, inGroup);
+  gUserManager.DropUser(u);
+
+  // Notify server
+  if (updateServer && gLicqDaemon != NULL)
+  {
+    if (groupType == GROUPS_SYSTEM)
+    {
+      if (groupId == GROUP_VISIBLE_LIST)
+        gLicqDaemon->ProtoSetInVisibleList(id, ppid, inGroup);
+
+      else if (groupId == GROUP_INVISIBLE_LIST)
+        gLicqDaemon->ProtoSetInInvisibleList(id, ppid, inGroup);
+
+      else if (groupId == GROUP_IGNORE_LIST)
+        gLicqDaemon->ProtoSetInIgnoreList(id, ppid, inGroup);
+    }
+    else
+    {
+      // Server group currently only supported for ICQ protocol
+      // Group can only be changed, not removed
+      if (ppid == LICQ_PPID && inGroup)
+        gLicqDaemon->icqChangeGroup(id, ppid, groupId, gsid,
+            ICQ_ROSTxNORMAL, ICQ_ROSTxNORMAL);
+    }
+  }
 }
 
 void CUserManager::AddUserToGroup(unsigned long _nUin, unsigned short _nGroup)
 {
-  ICQUser *u = FetchUser(_nUin, LOCK_W);
-  if (u == NULL) return;
-  u->AddToGroup(GROUPS_USER, _nGroup);
-  int nGSID = u->GetGSID();
-  DropUser(u);
-  if (gLicqDaemon)
-    gLicqDaemon->icqChangeGroup(_nUin, _nGroup, nGSID, ICQ_ROSTxNORMAL,
-      ICQ_ROSTxNORMAL);
-}
-
-
-/*---------------------------------------------------------------------------
- * CUserManager::RemoveUserFromGroup
- *-------------------------------------------------------------------------*/
-void CUserManager::RemoveUserFromGroup(const char *szId, unsigned long nPPID,
-  unsigned short _nGroup)
-{
-  ICQUser *u = FetchUser(szId, nPPID, LOCK_W);
-  if (u == NULL) return;
-  u->RemoveFromGroup(GROUPS_USER, _nGroup);
-  DropUser(u);
-}
-
+  char id[13];
+  snprintf(id, 12, "%lu", _nUin);
+  id[12] = '\0';
+  AddUserToGroup(id, LICQ_PPID, _nGroup);
+}
 
 void CUserManager::RemoveUserFromGroup(unsigned long _nUin, unsigned short _nGroup)
 {
-  ICQUser *u = FetchUser(_nUin, LOCK_W);
-  if (u == NULL) return;
-  u->RemoveFromGroup(GROUPS_USER, _nGroup);
-  DropUser(u);
-}
-
+  char id[13];
+  snprintf(id, 12, "%lu", _nUin);
+  id[12] = '\0';
+  RemoveUserFromGroup(id, LICQ_PPID, _nGroup);
+}
 
 void CUserManager::SetDefaultUserEncoding(const char* defaultEncoding)