Changeset 292:2f743d4eb625

Timestamp:

07/07/2008 07:18:24 PM (4 years ago)

Author:

Dmitry Nezhevenko <dion@…>

Branch:

default

Message:

Update webstatus implementation

Files:

• misc/webstatus.c (modified) (3 diffs)
• sql/mysql.sql (modified) (1 diff)
• sql/pgsql.sql (modified) (1 diff)
• src/plugins/webstatus/webstatusplugin.cpp (modified) (5 diffs)
• src/plugins/webstatus/webstatusthread.cpp (modified) (5 diffs)

misc/webstatus.c

@@ -64 +64 @@
                 res=read(fd,buf+bsize,sizeof(buf)-bsize-1);
                 if (res<=0)
-                        reportForbidden("Failed to read from gluxi socket");
-                for (i=bsize; i<bsize+res; i++)
+                {
+                        responseFinished=1;
+                        break;
+                }
+                /*for (i=bsize; i<bsize+res; i++)
                         if (buf[i]==13 || buf[i]==10)
                         {
@@ -72 +75 @@
                                 break;
                         }
+                */
+                buf[bsize+res]=0;
                 bsize+=res;
                 if (responseFinished)
@@ -80 +85 @@
         if (!responseFinished)
                 reportForbidden("Failed to read response from gluxi socket");
-        if (strlen(buf)==0)
+        if (strlen(buf)<3)
                 reportForbidden("Unable to find URL");
 
-        printf("Content-type: text/html\r\n");
-        printf("Location: %s\r\n",buf);
-        printf("\r\n");
+        char* bufReal=buf+2;
+        buf[1]=0;
+
+        if (buf[0]=='1')
+        {
+                printf("Content-type: text/html; charset=utf-8\r\n");
+                printf("Location: %s\r\n",bufReal);
+                printf("\r\n");
+        }
+        else if (buf[0]=='0')
+        {
+                printf("%s",bufReal);
+        }
 }
-

sql/mysql.sql

@@ -110 +110 @@
   `hash` varchar(50) collate utf8_unicode_ci NOT NULL,
   `status` varchar(15) collate utf8_unicode_ci default NULL,
+  `display` varchar(300) collate utf8_unicode_ci default NULL,
   `available` varchar(100) collate utf8_unicode_ci default NULL,
   `away` varchar(100) collate utf8_unicode_ci default NULL,

sql/pgsql.sql

@@ -63 +63 @@
   hash varchar(50) NOT NULL,
   status varchar(15) default NULL,
+  display varchar(300) default NULL,
   available varchar(100) default NULL,
   away varchar(100) default NULL,

src/plugins/webstatus/webstatusplugin.cpp

@@ -16 +16 @@
                 : BasePlugin(parent)
 {
-        commands << "INVITE" << "INFO" << "AVAILABLE" << "AWAY" 
+        commands << "INVITE" << "INFO" << "AVAILABLE" << "AWAY"
                 << "CHAT" << "DND" << "UNAVAILABLE" << "XA";
 
@@ -30 +30 @@
         thread->stop();
         thread->terminate();
-        thread->wait(1);
+        thread->wait(10000);
         delete thread;
         thread=0;
@@ -45 +45 @@
                 if (!isFromBotOwner(s,true))
                         return true;
-                        
+
                 if (arg.isEmpty())
                 {
@@ -61 +61 @@
                 }
                 gloox::Stanza* st;
-                st=gloox::Stanza::createSubscriptionStanza(arg.toStdString(), 
+                st=gloox::Stanza::createSubscriptionStanza(arg.toStdString(),
                         "GluxiBot WebStatus service", gloox::StanzaS10nSubscribe);
                 bot()->client()->send(st);
@@ -147 +147 @@
         qDebug() << "Got presence from " << from;
         QString status=getPresence(s->presence());
+        QString display;
+        gloox::Tag* showTag=s->findChild("status");
+        if (showTag)
+                display=QString::fromStdString(showTag->cdata());
+
         if (status.isEmpty())
                 return;
-        query.prepare("UPDATE webstatus SET status=? WHERE jid=?");
+        display.replace ("\n"," ");
+        query.prepare("UPDATE webstatus SET status=?, display=? WHERE jid=?");
         query.addBindValue(status);
+        query.addBindValue(display);
         query.addBindValue(from);
         query.exec();

src/plugins/webstatus/webstatusthread.cpp

@@ -19 +19 @@
 {
         socketName=DataStorage::instance()->getString("webstatus/socket");
+        if (socketName.isEmpty())
+                return;
         shouldWork=1;
         db=QSqlDatabase::cloneDatabase(QSqlDatabase::database(),"webStatus");
@@ -63 +65 @@
                 int fd_client=accept(fd_srv, NULL, 0);
                 if (fd_client<0) continue;
-                
+
                 bsize=0;
 
@@ -102 +104 @@
                 buf[bsize]=0;
                 QString request(buf);
-                
+
                 QString answer;
 
-                if (request.indexOf('\"')<0 && request.indexOf('\'')<0 
+                if (request.indexOf('\"')<0 && request.indexOf('\'')<0
                         && request.startsWith("id=") && request.indexOf('&')<0)
                 {
                         request.remove(0,3); // Delete id=
-                        qDebug() << request;
+                        int ps=request.indexOf('_');
+                        QString requestType;
+                        if (ps>0)
+                        {
+                                requestType=request.section('_', -1, -1);
+                                request=request.section('_', 0, -2);
+                        }
+                        qDebug() << "request: " << request << " type: " << requestType;
+
                         QSqlQuery query(db);
                         query.prepare("SELECT LOWER(status) FROM webstatus WHERE hash=?");
@@ -117 +127 @@
                                 QString status=query.value(0).toString();
                                 qDebug() << "st=" << status;
-                                query.prepare(QString("SELECT %1 FROM webstatus WHERE hash=?").arg(status));
+                                query.prepare(QString("SELECT %1, status, display FROM webstatus WHERE hash=?").arg(status));
                                 query.addBindValue(request);
                                 if (query.exec() && query.next())
-                                        answer=query.value(0).toString();
+                                {
+                                        QString url=query.value(0).toString();
+                                        QString status=query.value(1).toString();
+                                        QString display=query.value(2).toString();
+                                        if (requestType=="all")
+                                        {
+                                                answer=QString("0:")+url+"\n"+status+"\n"+display;
+                                        }
+                                        else if (requestType=="text")
+                                        {
+                                                answer=QString("0:")+status;
+                                                if (!display.isEmpty())
+                                                        answer+=QString(" (%1)").arg(display);
+                                        }
+                                        else
+                                        {
+                                                answer="1:"+url;
+                                        }
+
+                                }
                         }
                         else
@@ -126 +155 @@
                 }
                 answer+='\n';
-                qDebug() << answer;
+                qDebug() << "Response: "+answer;
                 write(fd_client,answer.toLocal8Bit().data(), answer.toLocal8Bit().size());
                 close(fd_client);