Changeset 6247 for branches/newosd/src/iface.cpp

Timestamp:

06/09/08 09:04:59 (7 months ago)

Author:

eugene

Message:

Simplified filtering logic and cleaned up the code a bit.

Files:

• branches/newosd/src/iface.cpp (modified) (5 diffs)

branches/newosd/src/iface.cpp

@@ -71 +71 @@
 
         case USER_EVENTS:
-          if (sig->Argument() < 0)
-          {
-            msg.clear();
-            break;
-          }
-
           if (sig->Argument() == 0)
           {
@@ -83 +77 @@
           }
 
+          control = false;
+
+          if (conf->notifyOnly)
           {
-            control = false;
-            if (conf->notifyOnly)
+            msg = "Message from ";
+            msg += u->GetAlias();
+            if (conf->markSecure && u->Secure())
+              msg += " [secured]";
+            msg += ".";
+          }
+          else
+          {
+            CUserEvent* ue = u->EventPeekId(sig->Argument());
+            if (ue == NULL)
             {
-              msg = "Message from ";
-              msg += u->GetAlias();
-              if (conf->markSecure && u->Secure())
-                msg += " [secured]";
-              msg += ".";
+              msg.clear();
+              break;
             }
-            else
-            {
-              CUserEvent* ue = u->EventPeekId(sig->Argument());
-              if (ue == NULL)
-              {
-                msg.clear();
-                break;
-              }
-              if (conf->markSecure && u->Secure())
-                msg += " (S)";
-              msg += ": ";
-              char* trans = gTranslator.ToUnicode(const_cast<char*>(ue->Text()),
-                  u->UserEncoding());
-              msg += trans;
-              delete[] trans;
-            }
+            if (conf->markSecure && u->Secure())
+              msg += " (S)";
+            msg += ": ";
+            char* trans = gTranslator.ToUnicode(const_cast<char*>(ue->Text()),
+                u->UserEncoding());
+            msg += trans;
+            delete[] trans;
           }
           break;
-
-        default:
-          msg.clear();
-          break;
       }
 
       gUserManager.DropUser(u);
+      break;
     }
-      break;
 
     case SIGNAL_LOGON:
     case SIGNAL_LOGOFF:
       ppidTimers[sig->PPID()] = time(NULL) + conf->quietTimeout;
-      break;
-
-    default:
       break;
   }
@@ -164 +150 @@
 bool Iface::filterSignal(CICQSignal* sig)
 {
-  if (!(sig->SubSignal() == USER_EVENTS && sig->Argument() > 0) &&
-      ppidTimers[sig->PPID()] > time(NULL))
-    return true;
+  switch (sig->SubSignal())
+  {
+    case USER_STATUS:
+    case USER_EVENTS:
+      break;
+
+    default:
+      return true;
+  }
+
+  bool isMessage = (sig->SubSignal() == USER_EVENTS && sig->Argument() > 0);
+
+  if (!isMessage && (ppidTimers[sig->PPID()] > time(NULL)))
+    return true;
+
+  ICQOwner* o = gUserManager.FetchOwner(sig->PPID(), LOCK_R);
+  if (o == NULL)
+    return true;
+
+  bool isOwner = (strcmp(o->IdString(), sig->Id()) == 0);
+  unsigned short ourStatus = o->Status();
+
+  gUserManager.DropOwner(sig->PPID());
+
+  // TODO status check
+
+  if (isOwner)
+  {
+    if (isMessage && conf->showMessage != GROUP_TYPE_NONE)
+      return false;
+
+    return true;
+  }
 
   ICQUser* u = gUserManager.FetchUser(sig->Id(), sig->PPID(), LOCK_R);
@@ -172 +188 @@
     return true;
 
-  bool ret = u->IgnoreList();
+  bool ign = u->IgnoreList();
   bool on = u->OnlineNotify();
 
   gUserManager.DropUser(u);
 
-  if (ret)
-    return true;
-
-  ICQOwner* o = gUserManager.FetchOwner(sig->PPID(), LOCK_R);
-  if (o == NULL)
-    return true;
+  if (ign)
+    return true;
+
+#define GROUP_DISABLED(type) \
+  (conf->type == GROUP_TYPE_NONE || \
+  (conf->type == GROUP_TYPE_ONLINE_NOTIFY && !on))
 
   if (sig->SubSignal() == USER_STATUS)
   {
-    if (sig->Argument() == 0)
-    {
-      if (conf->statusChange == GROUP_TYPE_NONE ||
-          (conf->statusChange == GROUP_TYPE_ONLINE_NOTIFY && !on))
-        ret = true;
-    }
-    else
-      if (conf->logonLogoff == GROUP_TYPE_NONE ||
-          (conf->logonLogoff == GROUP_TYPE_ONLINE_NOTIFY && !on))
-        ret = true;
+    if (sig->Argument() == 0 && GROUP_DISABLED(statusChange))
+      return true;
+
+    if (GROUP_DISABLED(logonLogoff))
+      return true;
   }
 
@@ -201 +212 @@
   {
     if (sig->Argument() < 0)
-      ret = true;
-    else
-      if (sig->Argument() == 0)
-      {
-        if (conf->autoResponse == GROUP_TYPE_NONE ||
-            (conf->autoResponse == GROUP_TYPE_ONLINE_NOTIFY && !on))
-          ret = true;
-      }
-      else
-      {
-        if (conf->showMessage == GROUP_TYPE_NONE ||
-            (conf->showMessage == GROUP_TYPE_ONLINE_NOTIFY && !on &&
-             strcmp(sig->Id(), o->IdString()) != 0))
-          ret = true;
-      }
-  }
-
-  if (ret)
-  {
-    gUserManager.DropOwner(o->PPID());
-    return true;
-  }
-
-  do
-  {
-    // TODO status check
-
-    // Don't let owner messages (e.g. auth-reqs) be filtered
-    if (sig->SubSignal() == USER_EVENTS &&
-        sig->Argument() > 0)
-      break;
-
-    if (strcmp(sig->Id(), o->IdString()) == 0)
-    {
-      ret = true;
-      break;
-    }
-  } while (false);
-
-  gUserManager.DropOwner(o->PPID());
-
-  return ret;
+      return true;
+
+    if (sig->Argument() == 0 && GROUP_DISABLED(autoResponse))
+      return true;
+
+    if (GROUP_DISABLED(showMessage))
+      return true;
+  }
+#undef GROUP_DISABLED
+
+  return false;
 }