@atproto/ozone 0.1.171 → 0.1.173

package/src/lexicon/types/chat/bsky/convo/defs.ts

@@ -85,6 +85,25 @@ export function validateMessageView<V>(v: V) {
   return validate<MessageView & V>(v, id, hashMessageView)
 }
 
+export interface SystemMessageReferredUser {
+  $type?: 'chat.bsky.convo.defs#systemMessageReferredUser'
+  did: string
+}
+
+const hashSystemMessageReferredUser = 'systemMessageReferredUser'
+
+export function isSystemMessageReferredUser<V>(v: V) {
+  return is$typed(v, id, hashSystemMessageReferredUser)
+}
+
+export function validateSystemMessageReferredUser<V>(v: V) {
+  return validate<SystemMessageReferredUser & V>(
+    v,
+    id,
+    hashSystemMessageReferredUser,
+  )
+}
+
 /** [NOTE: This is under active development and should be considered unstable while this note is here]. */
 export interface SystemMessageView {
   $type?: 'chat.bsky.convo.defs#systemMessageView'
@@ -120,9 +139,9 @@ export function validateSystemMessageView<V>(v: V) {
 /** [NOTE: This is under active development and should be considered unstable while this note is here]. System message indicating a user was added to the group convo. */
 export interface SystemMessageDataAddMember {
   $type?: 'chat.bsky.convo.defs#systemMessageDataAddMember'
-  member: ChatBskyActorDefs.ProfileViewBasic
+  member: SystemMessageReferredUser
   role: ChatBskyActorDefs.MemberRole
-  addedBy: ChatBskyActorDefs.ProfileViewBasic
+  addedBy: SystemMessageReferredUser
 }
 
 const hashSystemMessageDataAddMember = 'systemMessageDataAddMember'
@@ -142,8 +161,8 @@ export function validateSystemMessageDataAddMember<V>(v: V) {
 /** [NOTE: This is under active development and should be considered unstable while this note is here]. System message indicating a user was removed from the group convo. */
 export interface SystemMessageDataRemoveMember {
   $type?: 'chat.bsky.convo.defs#systemMessageDataRemoveMember'
-  member: ChatBskyActorDefs.ProfileViewBasic
-  removedBy: ChatBskyActorDefs.ProfileViewBasic
+  member: SystemMessageReferredUser
+  removedBy: SystemMessageReferredUser
 }
 
 const hashSystemMessageDataRemoveMember = 'systemMessageDataRemoveMember'
@@ -163,9 +182,9 @@ export function validateSystemMessageDataRemoveMember<V>(v: V) {
 /** [NOTE: This is under active development and should be considered unstable while this note is here]. System message indicating a user joined the group convo via join link. */
 export interface SystemMessageDataMemberJoin {
   $type?: 'chat.bsky.convo.defs#systemMessageDataMemberJoin'
-  member: ChatBskyActorDefs.ProfileViewBasic
+  member: SystemMessageReferredUser
   role: ChatBskyActorDefs.MemberRole
-  approvedBy?: ChatBskyActorDefs.ProfileViewBasic
+  approvedBy?: SystemMessageReferredUser
 }
 
 const hashSystemMessageDataMemberJoin = 'systemMessageDataMemberJoin'
@@ -185,7 +204,7 @@ export function validateSystemMessageDataMemberJoin<V>(v: V) {
 /** [NOTE: This is under active development and should be considered unstable while this note is here]. System message indicating a user voluntarily left the group convo. */
 export interface SystemMessageDataMemberLeave {
   $type?: 'chat.bsky.convo.defs#systemMessageDataMemberLeave'
-  member: ChatBskyActorDefs.ProfileViewBasic
+  member: SystemMessageReferredUser
 }
 
 const hashSystemMessageDataMemberLeave = 'systemMessageDataMemberLeave'
@@ -205,7 +224,7 @@ export function validateSystemMessageDataMemberLeave<V>(v: V) {
 /** [NOTE: This is under active development and should be considered unstable while this note is here]. System message indicating the group convo was locked. */
 export interface SystemMessageDataLockConvo {
   $type?: 'chat.bsky.convo.defs#systemMessageDataLockConvo'
-  lockedBy: ChatBskyActorDefs.ProfileViewBasic
+  lockedBy: SystemMessageReferredUser
 }
 
 const hashSystemMessageDataLockConvo = 'systemMessageDataLockConvo'
@@ -225,7 +244,7 @@ export function validateSystemMessageDataLockConvo<V>(v: V) {
 /** [NOTE: This is under active development and should be considered unstable while this note is here]. System message indicating the group convo was unlocked. */
 export interface SystemMessageDataUnlockConvo {
   $type?: 'chat.bsky.convo.defs#systemMessageDataUnlockConvo'
-  unlockedBy: ChatBskyActorDefs.ProfileViewBasic
+  unlockedBy: SystemMessageReferredUser
 }
 
 const hashSystemMessageDataUnlockConvo = 'systemMessageDataUnlockConvo'
@@ -245,7 +264,7 @@ export function validateSystemMessageDataUnlockConvo<V>(v: V) {
 /** [NOTE: This is under active development and should be considered unstable while this note is here]. System message indicating the group convo was locked permanently. */
 export interface SystemMessageDataLockConvoPermanently {
   $type?: 'chat.bsky.convo.defs#systemMessageDataLockConvoPermanently'
-  lockedBy: ChatBskyActorDefs.ProfileViewBasic
+  lockedBy: SystemMessageReferredUser
 }
 
 const hashSystemMessageDataLockConvoPermanently =
@@ -447,6 +466,7 @@ export interface ConvoView {
   $type?: 'chat.bsky.convo.defs#convoView'
   id: string
   rev: string
+  /** Members of this conversation. For direct convos, it will be an immutable list of the 2 members. For group convos, it will a list of important members (the first few members, the viewer, the member who invited the viewer, the member who sent the last message, the member who sent the last reaction), but will not contain the full list of members. Use chat.bsky.convo.getConvoMembers to list all members. */
   members: ChatBskyActorDefs.ProfileViewBasic[]
   lastMessage?:
     | $Typed<MessageView>
@@ -490,6 +510,9 @@ export interface GroupConvo {
   $type?: 'chat.bsky.convo.defs#groupConvo'
   /** The display name of the group conversation. */
   name: string
+  /** The total number of members in the group conversation. */
+  memberCount: number
+  createdAt: string
   joinLink?: ChatBskyGroupDefs.JoinLinkView
   lockStatus: ConvoLockStatus
 }
@@ -595,6 +618,8 @@ export interface LogCreateMessage {
   rev: string
   convoId: string
   message: $Typed<MessageView> | $Typed<DeletedMessageView> | { $type: string }
+  /** Profiles referred to in the message view. This isn't required for compatibility, because it was added later, but should generally be present. */
+  relatedProfiles?: ChatBskyActorDefs.ProfileViewBasic[]
 }
 
 const hashLogCreateMessage = 'logCreateMessage'
@@ -654,6 +679,8 @@ export interface LogAddReaction {
   convoId: string
   message: $Typed<MessageView> | $Typed<DeletedMessageView> | { $type: string }
   reaction: ReactionView
+  /** Profiles referred in the message and reaction views. This isn't required for compatibility, because it was added later, but should generally be present. */
+  relatedProfiles?: ChatBskyActorDefs.ProfileViewBasic[]
 }
 
 const hashLogAddReaction = 'logAddReaction'
@@ -673,6 +700,8 @@ export interface LogRemoveReaction {
   convoId: string
   message: $Typed<MessageView> | $Typed<DeletedMessageView> | { $type: string }
   reaction: ReactionView
+  /** Profiles referred in the message and reaction views. This isn't required for compatibility, because it was added later, but should generally be present. */
+  relatedProfiles?: ChatBskyActorDefs.ProfileViewBasic[]
 }
 
 const hashLogRemoveReaction = 'logRemoveReaction'
@@ -712,7 +741,9 @@ export interface LogAddMember {
   $type?: 'chat.bsky.convo.defs#logAddMember'
   rev: string
   convoId: string
-  message: SystemMessageDataAddMember
+  message: SystemMessageView
+  /** Profiles referred in the system message. */
+  relatedProfiles: ChatBskyActorDefs.ProfileViewBasic[]
 }
 
 const hashLogAddMember = 'logAddMember'
@@ -730,7 +761,9 @@ export interface LogRemoveMember {
   $type?: 'chat.bsky.convo.defs#logRemoveMember'
   rev: string
   convoId: string
-  message: SystemMessageDataRemoveMember
+  message: SystemMessageView
+  /** Profiles referred in the system message. */
+  relatedProfiles: ChatBskyActorDefs.ProfileViewBasic[]
 }
 
 const hashLogRemoveMember = 'logRemoveMember'
@@ -748,7 +781,9 @@ export interface LogMemberJoin {
   $type?: 'chat.bsky.convo.defs#logMemberJoin'
   rev: string
   convoId: string
-  message: SystemMessageDataMemberJoin
+  message: SystemMessageView
+  /** Profiles referred in the system message. */
+  relatedProfiles: ChatBskyActorDefs.ProfileViewBasic[]
 }
 
 const hashLogMemberJoin = 'logMemberJoin'
@@ -766,7 +801,9 @@ export interface LogMemberLeave {
   $type?: 'chat.bsky.convo.defs#logMemberLeave'
   rev: string
   convoId: string
-  message: SystemMessageDataMemberLeave
+  message: SystemMessageView
+  /** Profiles referred in the system message. */
+  relatedProfiles: ChatBskyActorDefs.ProfileViewBasic[]
 }
 
 const hashLogMemberLeave = 'logMemberLeave'
@@ -784,7 +821,9 @@ export interface LogLockConvo {
   $type?: 'chat.bsky.convo.defs#logLockConvo'
   rev: string
   convoId: string
-  message: SystemMessageDataLockConvo
+  message: SystemMessageView
+  /** Profiles referred in the system message. */
+  relatedProfiles: ChatBskyActorDefs.ProfileViewBasic[]
 }
 
 const hashLogLockConvo = 'logLockConvo'
@@ -802,7 +841,9 @@ export interface LogUnlockConvo {
   $type?: 'chat.bsky.convo.defs#logUnlockConvo'
   rev: string
   convoId: string
-  message: SystemMessageDataUnlockConvo
+  message: SystemMessageView
+  /** Profiles referred in the system message. */
+  relatedProfiles: ChatBskyActorDefs.ProfileViewBasic[]
 }
 
 const hashLogUnlockConvo = 'logUnlockConvo'
@@ -820,7 +861,9 @@ export interface LogLockConvoPermanently {
   $type?: 'chat.bsky.convo.defs#logLockConvoPermanently'
   rev: string
   convoId: string
-  message: SystemMessageDataLockConvoPermanently
+  message: SystemMessageView
+  /** Profiles referred in the system message. */
+  relatedProfiles: ChatBskyActorDefs.ProfileViewBasic[]
 }
 
 const hashLogLockConvoPermanently = 'logLockConvoPermanently'
@@ -842,7 +885,7 @@ export interface LogEditGroup {
   $type?: 'chat.bsky.convo.defs#logEditGroup'
   rev: string
   convoId: string
-  message: SystemMessageDataEditGroup
+  message: SystemMessageView
 }
 
 const hashLogEditGroup = 'logEditGroup'
@@ -860,7 +903,7 @@ export interface LogCreateJoinLink {
   $type?: 'chat.bsky.convo.defs#logCreateJoinLink'
   rev: string
   convoId: string
-  message: SystemMessageDataCreateJoinLink
+  message: SystemMessageView
 }
 
 const hashLogCreateJoinLink = 'logCreateJoinLink'
@@ -878,7 +921,7 @@ export interface LogEditJoinLink {
   $type?: 'chat.bsky.convo.defs#logEditJoinLink'
   rev: string
   convoId: string
-  message: SystemMessageDataEditJoinLink
+  message: SystemMessageView
 }
 
 const hashLogEditJoinLink = 'logEditJoinLink'
@@ -896,7 +939,7 @@ export interface LogEnableJoinLink {
   $type?: 'chat.bsky.convo.defs#logEnableJoinLink'
   rev: string
   convoId: string
-  message: SystemMessageDataEnableJoinLink
+  message: SystemMessageView
 }
 
 const hashLogEnableJoinLink = 'logEnableJoinLink'
@@ -914,7 +957,7 @@ export interface LogDisableJoinLink {
   $type?: 'chat.bsky.convo.defs#logDisableJoinLink'
   rev: string
   convoId: string
-  message: SystemMessageDataDisableJoinLink
+  message: SystemMessageView
 }
 
 const hashLogDisableJoinLink = 'logDisableJoinLink'

package/src/lexicon/types/chat/bsky/convo/getConvoMembers.ts

@@ -0,0 +1,44 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import { type ValidationResult, BlobRef } from '@atproto/lexicon'
+import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import {
+  type $Typed,
+  is$typed as _is$typed,
+  type OmitKey,
+} from '../../../../util'
+import type * as ChatBskyActorDefs from '../actor/defs.js'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'chat.bsky.convo.getConvoMembers'
+
+export type QueryParams = {
+  convoId: string
+  limit: number
+  cursor?: string
+}
+export type InputSchema = undefined
+
+export interface OutputSchema {
+  cursor?: string
+  members: ChatBskyActorDefs.ProfileViewBasic[]
+}
+
+export type HandlerInput = void
+
+export interface HandlerSuccess {
+  encoding: 'application/json'
+  body: OutputSchema
+  headers?: { [key: string]: string }
+}
+
+export interface HandlerError {
+  status: number
+  message?: string
+  error?: 'InvalidConvo'
+}
+
+export type HandlerOutput = HandlerError | HandlerSuccess

package/src/lexicon/types/chat/bsky/convo/getMessages.ts

@@ -10,6 +10,7 @@ import {
   type OmitKey,
 } from '../../../../util'
 import type * as ChatBskyConvoDefs from './defs.js'
+import type * as ChatBskyActorDefs from '../actor/defs.js'
 
 const is$typed = _is$typed,
   validate = _validate
@@ -30,6 +31,8 @@ export interface OutputSchema {
     | $Typed<ChatBskyConvoDefs.SystemMessageView>
     | { $type: string }
   )[]
+  /** Set of all members who authored or reacted to the returned messages. Members referred to by system messages are also included. */
+  relatedProfiles?: ChatBskyActorDefs.ProfileViewBasic[]
 }
 
 export type HandlerInput = void

package/src/lexicon/types/chat/bsky/group/addMembers.ts

@@ -10,6 +10,7 @@ import {
   type OmitKey,
 } from '../../../../util'
 import type * as ChatBskyConvoDefs from '../convo/defs.js'
+import type * as ChatBskyActorDefs from '../actor/defs.js'
 
 const is$typed = _is$typed,
   validate = _validate
@@ -24,6 +25,7 @@ export interface InputSchema {
 
 export interface OutputSchema {
   convo: ChatBskyConvoDefs.ConvoView
+  addedMembers?: ChatBskyActorDefs.ProfileViewBasic[]
 }
 
 export interface HandlerInput {

package/src/lexicon/types/tools/ozone/moderation/defs.ts

@@ -701,6 +701,8 @@ export interface ModEventTag {
   remove: string[]
   /** Additional comment about added/removed tags. */
   comment?: string
+  /** Indicates how long the tags being added should remain before automatically being removed. Only applies to tags being added. */
+  durationInHours?: number
 }
 
 const hashModEventTag = 'modEventTag'

package/src/mod-service/expiring-tags.ts

@@ -0,0 +1,98 @@
+import { Selectable } from 'kysely'
+import { Database } from '../db'
+import { ExpiringTag } from '../db/schema/expiring_tag'
+
+export type ExpiringTagRow = Selectable<ExpiringTag>
+
+export type ExpiringTagGroup = {
+  did: string
+  recordPath: string
+  createdBy: string
+  tags: string[]
+  ids: number[]
+}
+
+export async function insertExpiringTags(
+  db: Database,
+  params: {
+    eventId: number
+    did: string
+    recordPath: string
+    tags: string[]
+    expiresAt: string
+    createdBy: string
+  },
+): Promise<void> {
+  await db.db
+    .insertInto('expiring_tag')
+    .values(
+      params.tags.map((tag) => ({
+        eventId: params.eventId,
+        did: params.did,
+        recordPath: params.recordPath,
+        tag,
+        expiresAt: params.expiresAt,
+        createdBy: params.createdBy,
+      })),
+    )
+    .execute()
+}
+
+export async function removeExpiringTags(
+  db: Database,
+  params: {
+    did: string
+    recordPath: string
+    tags: string[]
+  },
+): Promise<void> {
+  await db.db
+    .deleteFrom('expiring_tag')
+    .where('did', '=', params.did)
+    .where('recordPath', '=', params.recordPath)
+    .where('tag', 'in', params.tags)
+    .execute()
+}
+
+export async function deleteExpiringTagsByIds(
+  db: Database,
+  ids: number[],
+): Promise<void> {
+  await db.db.deleteFrom('expiring_tag').where('id', 'in', ids).execute()
+}
+
+export async function getExpiredTags(
+  db: Database,
+): Promise<ExpiringTagGroup[]> {
+  const now = new Date().toISOString()
+  const rows = await db.db
+    .selectFrom('expiring_tag')
+    .where('expiresAt', '<', now)
+    .selectAll()
+    .execute()
+
+  if (!rows.length) return []
+
+  // Group by (did, recordPath, createdBy) so each reversal event has the correct author
+  const grouped = new Map<string, ExpiringTagGroup>()
+  for (const row of rows) {
+    const key = `${row.did}|${row.recordPath}|${row.createdBy}`
+    let group = grouped.get(key)
+    if (!group) {
+      group = {
+        did: row.did,
+        recordPath: row.recordPath,
+        createdBy: row.createdBy,
+        tags: [],
+        ids: [],
+      }
+      grouped.set(key, group)
+    }
+    if (!group.tags.includes(row.tag)) {
+      group.tags.push(row.tag)
+    }
+    group.ids.push(row.id)
+  }
+
+  return [...grouped.values()]
+}

package/src/mod-service/index.ts

@@ -46,6 +46,7 @@ import {
 import { QueryParams as QueryStatusParams } from '../lexicon/types/tools/ozone/moderation/queryStatuses'
 import { httpLogger as log } from '../logger'
 import { LABELER_HEADER_NAME, ParsedLabelers } from '../util'
+import { insertExpiringTags, removeExpiringTags } from './expiring-tags'
 import {
   adjustModerationSubjectStatus,
   getStatusIdentifierFromSubject,
@@ -666,6 +667,31 @@ export class ModerationService {
       subject.blobCids,
     )
 
+    // Manage expiring tag rows for temporary tags
+    if (isModEventTag(event)) {
+      if (event.durationInHours && event.add.length > 0) {
+        const expiresAt = addHoursToDate(
+          event.durationInHours,
+          createdAt,
+        ).toISOString()
+        await insertExpiringTags(this.db, {
+          eventId: modEvent.id,
+          did: subjectInfo.subjectDid,
+          recordPath: subjectInfo.subjectUri ?? '',
+          tags: event.add,
+          expiresAt,
+          createdBy,
+        })
+      }
+      if (event.remove.length > 0) {
+        await removeExpiringTags(this.db, {
+          did: subjectInfo.subjectDid,
+          recordPath: subjectInfo.subjectUri ?? '',
+          tags: event.remove,
+        })
+      }
+    }
+
     if (isAgeAssurancePurgeEvent(event)) {
       await this.purgeAgeAssuranceEvents(subjectInfo.subjectDid)
     }