Changeset 3757 for trunk/auto-reply

Timestamp:

06/06/04 21:32:13 (4 years ago)

Author:

emostar

Message:

Patch by Philip Nelson <phatfil AT optusnet.com.au> to make this plugin work with multiple protocols.

Location:

trunk/auto-reply/src

Files:

• autoreply.cpp (modified) (6 diffs)
• autoreply.h (modified) (1 diff)

trunk/auto-reply/src/autoreply.cpp

@@ -190 +190 @@
   {
     case SIGNAL_UPDATExUSER:
-      if (s->SubSignal() == USER_EVENTS && s->Uin() != gUserManager.OwnerUin() && s->Argument() > 0)
-        ProcessUserEvent(s->Uin(), s->Argument());
+      if (s->SubSignal() == USER_EVENTS && gUserManager.FindOwner(s->Id(), s->PPID()) == NULL && s->Argument() > 0)
+        ProcessUserEvent(s->Id(), s->PPID(), s->Argument());
       break;
     // We should never get any other signal
@@ -224 +224 @@
 
 
-void CLicqAutoReply::ProcessUserEvent(unsigned long nUin, unsigned long nId)
-{
-  ICQUser *u = gUserManager.FetchUser(nUin, LOCK_R);
+void CLicqAutoReply::ProcessUserEvent(const char *szId, unsigned long nPPID, unsigned long nId)
+{
+  ICQUser *u = gUserManager.FetchUser(szId, nPPID, LOCK_R);
   if (u == NULL)
   {
-    gLog.Warn("%sInvalid uin received from daemon (%ld).\n", L_AUTOREPxSTR, nUin);
+    gLog.Warn("%sInvalid user id received from daemon (%s).\n", L_AUTOREPxSTR, szId);
     return;
   }
@@ -242 +242 @@
   else
   {
-    bool r = AutoReplyEvent(nUin, e);
+    bool r = AutoReplyEvent(szId, nPPID, e);
     if (m_bDelete && r)
     {
-      u = gUserManager.FetchUser(nUin, LOCK_W);
+      u = gUserManager.FetchUser(szId, nPPID, LOCK_W);
       u->EventClearId(nId);
       gUserManager.DropUser(u);
@@ -253 +253 @@
 
 
-bool CLicqAutoReply::AutoReplyEvent(unsigned long nUin, CUserEvent *event)
+bool CLicqAutoReply::AutoReplyEvent(const char *szId, unsigned long nPPID, CUserEvent *event)
 {
   char *szCommand;
@@ -259 +259 @@
   char *tmp;
   sprintf(buf, "%s ", m_szProgram);
-  ICQUser *u = gUserManager.FetchUser(nUin, LOCK_R);
+  ICQUser *u = gUserManager.FetchUser(szId, nPPID, LOCK_R);
   tmp = u->usprintf(m_szArguments);
   gUserManager.DropUser(u);
@@ -299 +299 @@
   char *szText = new char[4096 + 256];
   sprintf(szText, "%s", m_szMessage);
-  unsigned long tag = licqDaemon->icqSendMessage(nUin, szText, !m_bSendThroughServer,
+  unsigned long tag = licqDaemon->ProtoSendMessage(szId, nPPID, szText, !m_bSendThroughServer,
      ICQ_TCPxMSG_URGENT);
   delete []szText;
   delete [] szCommand;
 
-  u = gUserManager.FetchUser(nUin, LOCK_R);
+  u = gUserManager.FetchUser(szId, nPPID, LOCK_R);
   if (u == NULL) return false;
 
   if (tag == 0)
   {
-    gLog.Warn("%sSending message to %s (%ld) failed.\n", L_AUTOREPxSTR,
-     u->GetAlias(), nUin);
+    gLog.Warn("%sSending message to %s (%s) failed.\n", L_AUTOREPxSTR,
+     u->GetAlias(), szId);
   }
   else
   {
-    gLog.Info("%sSent autoreply to %s (%ld).\n", L_AUTOREPxSTR, u->GetAlias(),
-     nUin);
+    gLog.Info("%sSent autoreply to %s (%s).\n", L_AUTOREPxSTR, u->GetAlias(),
+     szId);
   }
 

trunk/auto-reply/src/autoreply.h

@@ -38 +38 @@
   void ProcessEvent(ICQEvent *);
 
-  void ProcessUserEvent(unsigned long, unsigned long);
-  bool AutoReplyEvent(unsigned long, CUserEvent *);
+  void ProcessUserEvent(const char *, unsigned long, unsigned long);
+  bool AutoReplyEvent(const char *, unsigned long, CUserEvent *);
 
   bool POpen(const char *cmd);