slib/adrsbk: Fix groupJoinedAdrsbk() to return true when tHeader.From…

… == self
networkimprov · Nov 15, 2020 · 4c2e266 · 4c2e266
1 parent cc300a1
commit 4c2e266
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/slib/adrsbk.go b/slib/adrsbk.go
@@ -443,7 +443,7 @@ func resolveSentAdrsbk(iSvc string, iDate string, iCc []tCcEl, iTid string) {
    }
 }
 
-func groupJoinedAdrsbk(iSvc string, iHead *Header) {
+func groupJoinedAdrsbk(iSvc string, iHead *Header) bool {
    aSvc := _loadAdrsbk(iSvc)
    aSvc.Lock(); defer aSvc.Unlock()
    if iHead.From == GetConfigService(iSvc).Uid {
@@ -453,11 +453,13 @@ func groupJoinedAdrsbk(iSvc string, iHead *Header) {
          aSvc.aliasIdx[aEl.Gid] = aEl.Gid
          _storeAdrsbk(iSvc, []tAdrsbkEl{aEl})
       }
+      return true
    } else {
       aEl := tAdrsbkEl{Type:eAbMsgJoin, Date:iHead.Posted, Gid:iHead.Gid, Alias:iHead.Alias}
       if _respondLog(aSvc.inviteToIdx[aEl.Alias + "\x00" + aEl.Gid], &aEl) {
          _storeAdrsbk(iSvc, []tAdrsbkEl{aEl})
       }
+      return false
    }
 }
 

diff --git a/slib/service.go b/slib/service.go
@@ -599,8 +599,11 @@ func HandleTmtpService(iSvc string, iHead *Header, iR io.Reader) (
       aToAll = []string{"/v"}
    case "member":
       if iHead.Act == "join" {
-         groupJoinedAdrsbk(iSvc, iHead)
-         aFn, aResult = fAll, []string{"pt"}
+         if groupJoinedAdrsbk(iSvc, iHead) {
+            aFn, aResult = fAll, []string{"pf", "gl"}
+         } else {
+            aFn, aResult = fAll, []string{"pt"}
+         }
       }
    case "delivery":
       aGot := "thread"
@@ -681,7 +684,7 @@ func HandleTmtpService(iSvc string, iHead *Header, iR io.Reader) (
          if iHead.Error != "" {
             aFn, aResult = fAll, []string{"pf", "_e", iHead.Error}
          } else {
-            aFn, aResult = fAll, []string{"pf", "gl"}
+            aFn, aResult = fAll, []string{"pf"}
          }
          dropQueue(iSvc, aQid)
       case eSrecThread: