fix: sync latest channel and contact fixes

internal/store/memory/channel_dialogs.go

@@ -2,6 +2,7 @@ package memory
 
 import (
 	"context"
+	"errors"
 	"sort"
 	"telesrv/internal/domain"
 )
@@ -119,8 +120,23 @@ func (s *ChannelStore) GetChannelDialogs(_ context.Context, viewerUserID int64,
 			continue
 		}
 		seen[channelID] = struct{}{}
-		channel, member, _, err := s.channelForViewerLocked(viewerUserID, channelID)
+		channel, member, err := s.channelAndMemberLocked(viewerUserID, channelID)
 		if err != nil {
+			if !errors.Is(err, domain.ErrChannelPrivate) && !errors.Is(err, domain.ErrChannelInvalid) {
+				continue
+			}
+			var ok bool
+			channel, ok = s.channels[channelID]
+			if !ok || channel.Deleted || !channel.Monoforum || channel.LinkedMonoforumID == 0 {
+				continue
+			}
+			parentMember, ok := s.members[channel.LinkedMonoforumID][viewerUserID]
+			if !ok || parentMember.Status != domain.ChannelMemberActive || !isChannelAdmin(parentMember) {
+				continue
+			}
+			member = syntheticMonoforumAdminMember(channel, parentMember)
+		}
+		if member.Status != domain.ChannelMemberActive {
 			continue
 		}
 		dialog := channelDialogToDialog(s.dialogForMemberLocked(viewerUserID, channel, member), channel.Pts, member.Status)

internal/store/memory/channel_updates.go

@@ -27,6 +27,16 @@ func (s *ChannelStore) ListChannelDifference(_ context.Context, req domain.Chann
 	if preview {
 		dialog = previewChannelDialog(req.UserID, channel, member)
 	}
+	if preview && member.Status != domain.ChannelMemberActive {
+		return domain.ChannelDifference{
+			Channel: channel,
+			Self:    member,
+			Pts:     channel.Pts,
+			Final:   true,
+			Timeout: 30,
+			Dialog:  dialog,
+		}, nil
+	}
 	if channel.Pts-req.Pts > limit {
 		messages := make([]domain.ChannelMessage, 0, domain.MaxChannelDifferenceTooLongMessages)
 		for i := len(s.messages[req.ChannelID]) - 1; i >= 0 && len(messages) < domain.MaxChannelDifferenceTooLongMessages; i-- {

internal/store/postgres/channel_difference_integration_test.go

@@ -115,7 +115,7 @@ func TestChannelStoreDifferenceStartsAtMemberAvailableMinPts(t *testing.T) {
 	}
 }
 
-func TestChannelStorePublicPreviewDifferenceAllowsNonMember(t *testing.T) {
+func TestChannelStorePublicPreviewDifferenceSkipsNonMemberMessages(t *testing.T) {
 	pool := testPool(t)
 	ctx := context.Background()
 	suffix := randomSuffix(t)
@@ -183,8 +183,8 @@ func TestChannelStorePublicPreviewDifferenceAllowsNonMember(t *testing.T) {
 	if err != nil {
 		t.Fatalf("list public preview difference: %v", err)
 	}
-	if !diff.Final || diff.Pts != sent.Event.Pts || len(diff.NewMessages) != 1 || diff.NewMessages[0].Body != "public preview difference" {
-		t.Fatalf("preview diff = %+v, want one public preview message at current pts", diff)
+	if !diff.Final || diff.Pts != sent.Event.Pts || len(diff.Events) != 0 || len(diff.NewMessages) != 0 || len(diff.OtherUpdates) != 0 {
+		t.Fatalf("preview diff = %+v, want empty public preview difference at current pts", diff)
 	}
 	if diff.Dialog.UnreadCount != 0 || diff.Dialog.ReadInboxMaxID < sent.Message.ID {
 		t.Fatalf("preview diff dialog = %+v, want read-only public preview dialog", diff.Dialog)

internal/store/postgres/channel_updates.go

@@ -27,6 +27,16 @@ func (s *ChannelStore) ListChannelDifference(ctx context.Context, req domain.Cha
 	if limit <= 0 || limit > domain.MaxChannelDifferenceLimit {
 		limit = domain.MaxChannelDifferenceLimit
 	}
+	if preview && member.Status != domain.ChannelMemberActive {
+		return domain.ChannelDifference{
+			Channel: channel,
+			Self:    member,
+			Pts:     channel.Pts,
+			Final:   true,
+			Timeout: 30,
+			Dialog:  previewChannelDialog(req.UserID, channel, member),
+		}, nil
+	}
 	if channel.Pts-req.Pts > limit {
 		args := []any{req.ChannelID}
 		where := "channel_id = $1 AND NOT deleted"