updates from master

frontend/openchat-agent/src/services/community/mappers.ts

@@ -32,7 +32,6 @@ import type {
     UpdatedEvent,
     UpdateUserGroupResponse,
     UserFailedError,
-    UserFailedGateCheck,
     UserGroupDetails,
 } from "openchat-shared";
 import { CommonResponses, UnsupportedValueError } from "openchat-shared";
@@ -54,7 +53,6 @@ import type {
     ApiOptionalCommunityPermissions,
     ApiAddMembersToChannelFailed,
     ApiAddMembersToChannelPartialSuccess,
-    ApiUserFailedGateCheck,
     ApiUserFailedError,
     ApiMessageMatch,
     ApiCommunityCanisterCommunitySummaryUpdates,
@@ -83,7 +81,6 @@ import {
     communityChannelSummary,
     communityPermissions,
     communitySummary,
-    gateCheckFailedReason,
     groupPermissions,
     groupSubtype,
     memberRole,
@@ -136,6 +133,9 @@ export function addMembersToChannelResponse(
     if ("InternalError" in candid) {
         return CommonResponses.internalError();
     }
+    if ("CommunityPublic" in candid) {
+        return CommonResponses.communityPublic();
+    }
     throw new UnsupportedValueError(
         "Unexpected ApiAddMembersToChannelResponse type received",
         candid,
@@ -147,7 +147,6 @@ function addToChannelFailed(candid: ApiAddMembersToChannelFailed): AddMembersToC
         kind: "add_to_channel_failed",
         usersLimitReached: candid.users_limit_reached.map((u) => u.toString()),
         usersAlreadyInChannel: candid.users_already_in_channel.map((u) => u.toString()),
-        usersFailedGateCheck: candid.users_failed_gate_check.map(userFailedGateCheck),
         usersFailedWithError: candid.users_failed_with_error.map(userFailedWithError),
     };
 }
@@ -159,21 +158,13 @@ function userFailedWithError(candid: ApiUserFailedError): UserFailedError {
     };
 }
 
-function userFailedGateCheck(candid: ApiUserFailedGateCheck): UserFailedGateCheck {
-    return {
-        userId: candid.user_id.toString(),
-        reason: gateCheckFailedReason(candid.reason),
-    };
-}
-
 function addToChannelPartialSuccess(
     candid: ApiAddMembersToChannelPartialSuccess,
 ): AddMembersToChannelResponse {
     return {
         kind: "add_to_channel_partial_success",
         usersLimitReached: candid.users_limit_reached.map((u) => u.toString()),
         usersAlreadyInChannel: candid.users_already_in_channel.map((u) => u.toString()),
-        usersFailedGateCheck: candid.users_failed_gate_check.map(userFailedGateCheck),
         usersFailedWithError: candid.users_failed_with_error.map(userFailedWithError),
         usersAdded: candid.users_added.map((u) => u.toString()),
     };

frontend/openchat-agent/src/services/user/mappers.ts

@@ -393,6 +393,9 @@ export function achievementType(candid: ApiAchievement): Achievement {
     if ("Streak7" in candid) {
         return "streak_7";
     }
+    if ("Streak365" in candid) {
+        return "streak_365";
+    }
     if ("UpgradedToGoldDiamond" in candid) {
         return "upgrade_to_gold_diamond";
     }

frontend/openchat-agent/src/services/userIndex/userIndex.client.ts

@@ -146,12 +146,12 @@ export class UserIndexClient extends CandidService {
         const allUsers = users.userGroups.flatMap((g) => g.users);
 
         const fromCache = await getCachedUsers(allUsers);
-        const deletedUserIds = await getCachedDeletedUserIds();
+        const cachedDeletedUserIds = await getCachedDeletedUserIds();
         const suspendedUsersSyncedTo = await getSuspendedUsersSyncedUpTo();
 
         // We throw away all of the updatedSince values passed in and instead use the values from the cache, this
         // ensures the cache is always correct and doesn't miss any updates
-        const args = this.buildGetUsersArgs(allUsers, fromCache, allowStale, deletedUserIds);
+        const args = this.buildGetUsersArgs(allUsers, fromCache, allowStale, cachedDeletedUserIds);
 
         const requestedFromServer = new Set<string>([...args.userGroups.flatMap((g) => g.users)]);
 
@@ -217,7 +217,7 @@ export class UserIndexClient extends CandidService {
         users: string[],
         fromCache: UserSummary[],
         allowStale: boolean,
-        deletedUserIds: Set<string>,
+        cachedDeletedUserIds: Set<string>,
     ): UsersArgs {
         const fromCacheGrouped = groupBy(fromCache, (u) => u.updated);
         const fromCacheSet = new Set<string>(fromCache.map((u) => u.userId));
@@ -227,7 +227,9 @@ export class UserIndexClient extends CandidService {
         };
 
         // Add the users not found in the cache and ask for all updates
-        const notFoundInCache = users.filter((u) => !fromCacheSet.has(u) && !deletedUserIds.has(u));
+        const notFoundInCache = users.filter(
+            (u) => !fromCacheSet.has(u) && !cachedDeletedUserIds.has(u),
+        );
         if (notFoundInCache.length > 0) {
             args.userGroups.push({
                 users: notFoundInCache,
@@ -239,7 +241,9 @@ export class UserIndexClient extends CandidService {
             // Add the users found in the cache but only ask for updates since the date they were last updated in the cache
             for (const [updatedSince, users] of fromCacheGrouped) {
                 args.userGroups.push({
-                    users: users.filter((u) => !deletedUserIds.has(u.userId)).map((u) => u.userId),
+                    users: users
+                        .filter((u) => !cachedDeletedUserIds.has(u.userId))
+                        .map((u) => u.userId),
                     updatedSince,
                 });
             }

frontend/openchat-shared/src/domain/chit.ts

@@ -57,6 +57,7 @@ export const achievements = [
     "streak_7",
     "streak_14",
     "streak_30",
+    "streak_365",
     "sent_reminder",
     "proved_unique_personhood",
     "pinned_message",

frontend/openchat-shared/src/domain/community/index.ts

@@ -27,6 +27,7 @@ import type {
 import type {
     ChatNotFound,
     CommunityFrozen,
+    CommunityPublic,
     Failure,
     InternalError,
     NotAuthorised,
@@ -104,14 +105,12 @@ export interface UserFailedError {
 export type AddMembersToChannelFailed = {
     kind: "add_to_channel_failed";
     usersLimitReached: string[];
-    usersFailedGateCheck: UserFailedGateCheck[];
     usersAlreadyInChannel: string[];
     usersFailedWithError: UserFailedError[];
 };
 export interface AddMembersToChannelPartialSuccess {
     kind: "add_to_channel_partial_success";
     usersLimitReached: string[];
-    usersFailedGateCheck: UserFailedGateCheck[];
     usersAlreadyInChannel: string[];
     usersFailedWithError: UserFailedError[];
     usersAdded: string[];
@@ -128,7 +127,8 @@ export type AddMembersToChannelResponse =
     | UserSuspended
     | CommunityFrozen
     | InternalError
-    | Offline;
+    | Offline
+    | CommunityPublic;
 
 export type BlockCommunityUserResponse = Success | Failure | Offline;
 

frontend/openchat-shared/src/domain/response.ts

@@ -10,6 +10,7 @@ export type UserNotInCommunity = { kind: "user_not_in_community" };
 export type CommunityFrozen = { kind: "community_frozen" };
 export type ChatFrozen = { kind: "chat_frozen" };
 export type CommunityNotPublic = { kind: "community_not_public" };
+export type CommunityPublic = { kind: "community_public" };
 export type MessageNotFound = {
     kind: "message_not_found";
 };
@@ -77,6 +78,7 @@ export const CommonResponses = {
     offline: (): Offline => ({ kind: "offline" }) as Offline,
     blocked: (): Blocked => ({ kind: "blocked" }) as Blocked,
     userNotFound: (): UserNotFound => ({ kind: "unknown_user" }),
+    communityPublic: (): CommunityPublic => ({ kind: "community_public" }),
 };
 
 export type Blocked = {