RSSClient: don't save empty messages.

[citadel.git] / citadel / modules / rssclient / serv_rssclient.c

diff --git a/citadel/modules/rssclient/serv_rssclient.c b/citadel/modules/rssclient/serv_rssclient.c
index b2a069fd6a2ecabe0ccc172e84a9dcc86d0145f8..fffe6d8e1f81201642bae63af3c8da55212a1cd9 100644 (file)
--- a/citadel/modules/rssclient/serv_rssclient.c
+++ b/citadel/modules/rssclient/serv_rssclient.c
@@ -274,11 +274,22 @@ void AppendLink(StrBuf *Message,
 }
 
 
-void rss_format_item(networker_save_message *SaveMsg)
+int rss_format_item(AsyncIO *IO, networker_save_message *SaveMsg)
 {
        StrBuf *Message;
        int msglen = 0;
 
+       if (StrLength(SaveMsg->description) + 
+           StrLength(SaveMsg->link) + 
+           StrLength(SaveMsg->linkTitle) + 
+           StrLength(SaveMsg->reLink) +
+           StrLength(SaveMsg->reLinkTitle) +
+           StrLength(SaveMsg->title) == 0)
+       {
+               EVRSSCM_syslog(LOG_INFO, "Refusing to save empty message.");
+               return 0;
+       }
+
        if (SaveMsg->author_or_creator != NULL) {
 
                char *From;
@@ -375,8 +386,8 @@ void rss_format_item(networker_save_message *SaveMsg)
        AppendLink(Message, SaveMsg->reLink, SaveMsg->reLinkTitle, "Reply to this");
        StrBufAppendBufPlain(Message, HKEY("</body></html>\n"), 0);
 
-
        SaveMsg->Message = Message;
+       return 1;
 }
 
 eNextState RSSSaveMessage(AsyncIO *IO)
@@ -385,16 +396,17 @@ eNextState RSSSaveMessage(AsyncIO *IO)
        const char *Key;
        rss_aggregator *RSSAggr = (rss_aggregator *) IO->Data;
 
-       rss_format_item(RSSAggr->ThisMsg);
-
-       RSSAggr->ThisMsg->Msg.cm_fields['M'] =
-               SmashStrBuf(&RSSAggr->ThisMsg->Message);
-
-       CtdlSubmitMsg(&RSSAggr->ThisMsg->Msg, &RSSAggr->recp, NULL, 0);
-
-       /* write the uidl to the use table so we don't store this item again */
+       if (rss_format_item(IO, RSSAggr->ThisMsg))
+       {
+               RSSAggr->ThisMsg->Msg.cm_fields['M'] =
+                       SmashStrBuf(&RSSAggr->ThisMsg->Message);
 
-       CheckIfAlreadySeen("RSS Item Insert", RSSAggr->ThisMsg->MsgGUID, IO->Now, 0, eWrite, IO->ID, CCID);
+               CtdlSubmitMsg(&RSSAggr->ThisMsg->Msg, &RSSAggr->recp, NULL, 0);
+               
+               /* write the uidl to the use table so we don't store this item again */
+               
+               CheckIfAlreadySeen("RSS Item Insert", RSSAggr->ThisMsg->MsgGUID, IO->Now, 0, eWrite, CCID, IO->ID);
+       }
 
        if (GetNextHashPos(RSSAggr->Messages,
                           RSSAggr->Pos,
@@ -418,9 +430,9 @@ eNextState RSS_FetchNetworkUsetableEntry(AsyncIO *IO)
        if (CheckIfAlreadySeen("RSS Item Seen",
                               Ctx->ThisMsg->MsgGUID,
                               IO->Now,
-                              IO->Now - USETABLE_ANTIEXPIRE,
+                              IO->Now - USETABLE_ANTIEXPIRE_HIRES,
                               eCheckUpdate,
-                              IO->ID, CCID)
+                              CCID, IO->ID)
            != 0)
        {
                /* Item has already been seen */
@@ -464,7 +476,7 @@ void UpdateLastKnownGood(pRSSConfig *pCfg, time_t now)
                        if (RSSCfg == pCfg->pCfg)
                                break;
 
-                       RSSCfg = RSSCfg->Next;
+                       RSSCfg = RSSCfg->next;
                }
                if (RSSCfg != NULL)
                {
@@ -539,8 +551,10 @@ eNextState RSSAggregator_AnalyseReply(AsyncIO *IO)
                if (it != NULL)
                {
                        void *vptr;
-                       GetNextHashPos(Ctx->OtherQRnumbers, it, &len, &Key, &vptr);
-                       pCfg = vptr;
+                       if (GetNextHashPos(Ctx->OtherQRnumbers, it, &len, &Key, &vptr))
+                               pCfg = vptr;
+                       else
+                               pCfg = NULL;
                }
                else 
                        pCfg = NULL;
@@ -573,7 +587,7 @@ eNextState RSSAggregator_AnalyseReply(AsyncIO *IO)
                               IO->Now,
                               IO->Now - USETABLE_ANTIEXPIRE,
                               eCheckUpdate,
-                              IO->ID, CCID)
+                              CCID, IO->ID)
            != 0)
        {
                FreeStrBuf(&guid);
@@ -589,7 +603,7 @@ eNextState RSSAggregator_AnalyseReply(AsyncIO *IO)
 
 eNextState RSSAggregator_FinishHttp(AsyncIO *IO)
 {
-       return QueueDBOperation(IO, RSSAggregator_AnalyseReply);
+       return CurlQueueDBOperation(IO, RSSAggregator_AnalyseReply);
 }
 
 /*
@@ -695,7 +709,7 @@ void rssclient_scan_room(struct ctdlroom *qrbuf, void *data, OneRoomNetCfg *OneR
 
                        pthread_mutex_unlock(&RSSQueueMutex);
 
-                       RSSCfg = RSSCfg->Next;
+                       RSSCfg = RSSCfg->next;
                        continue;
                }
                pthread_mutex_unlock(&RSSQueueMutex);
@@ -722,7 +736,7 @@ void rssclient_scan_room(struct ctdlroom *qrbuf, void *data, OneRoomNetCfg *OneR
                    DeleteRssCfg);
 
                pthread_mutex_unlock(&RSSQueueMutex);
-               RSSCfg = RSSCfg->Next;
+               RSSCfg = RSSCfg->next;
        }
 }
 
@@ -830,7 +844,7 @@ void rssclient_veto_scan_room(struct ctdlroom *qrbuf, void *data, OneRoomNetCfg
                        StrBufAppendBuf(Info->ErrMsg, RSSCfg->Url, 0);
                        StrBufAppendBufPlain(Info->ErrMsg, HKEY(">\n"), 0);
                }
-               RSSCfg = RSSCfg->Next;
+               RSSCfg = RSSCfg->next;
        }
 }
 
@@ -862,7 +876,7 @@ void ParseRSSClientCfgLine(const CfgLineType *ThisOne, StrBuf *Line, const char
        RSSCfg->last_known_good = StrBufExtractNext_long(Line, &LinePos, '|');
 
 
-       RSSCfg->Next = (RSSCfgLine *)OneRNCFG->NetConfigs[ThisOne->C];
+       RSSCfg->next = (RSSCfgLine *)OneRNCFG->NetConfigs[ThisOne->C];
        OneRNCFG->NetConfigs[ThisOne->C] = (RoomNetCfgLine*) RSSCfg;
 }
 
@@ -878,7 +892,7 @@ void SerializeRSSClientCfgLine(const CfgLineType *ThisOne, StrBuf *OutputBuffer,
 
 void DeleteRSSClientCfgLine(const CfgLineType *ThisOne, RoomNetCfgLine **data)
 {
-       RSSCfgLine *RSSCfg = (RSSCfgLine*) data;
+       RSSCfgLine *RSSCfg = (RSSCfgLine*) *data;
 
        FreeStrBuf(&RSSCfg->Url);
        free(*data);