in progress

Author: szuperaz

package-lock.json

@@ -118,7 +118,7 @@
     "pretty-bytes": "^6.1.1",
     "rxjs": "~7.4.0",
     "starwars-names": "^1.6.0",
-    "stream-chat": "^8.44.0",
+    "stream-chat": "9.0.0-rc.3",
     "ts-node": "^10.9.2",
     "tslib": "^2.3.0",
     "uuid": "^9.0.1",

package.json

@@ -0,0 +1,14 @@
+import 'stream-chat';
+
+declare module 'stream-chat' {
+  interface CustomUserData {
+    image?: string;
+  }
+
+  interface CustomAttachmentData {
+    /**
+     * @deprecated Please use `image_url` instead
+     */
+    img_url?: string;
+  }
+}

projects/stream-chat-angular/src/lib/@types/stream-chat-common-custom-data.d.ts

@@ -13,35 +13,33 @@ import {
 @Injectable({
   providedIn: 'root',
 })
-export class AttachmentConfigurationService<
-  T extends DefaultStreamChatGenerics = DefaultStreamChatGenerics
-> {
+export class AttachmentConfigurationService {
   /**
    * A custom handler can be provided to override the default image attachment (images uploaded from files) configuration. By default the SDK uses fixed image height (a size that's known before image is loaded), if you override that with dynamic image height (for example: height: 100%) the scrolling logic inside the message list can break.
    */
   customImageAttachmentConfigurationHandler?: (
-    a: Attachment<T>,
+    a: Attachment,
     type: 'gallery' | 'single' | 'carousel',
     containerElement: HTMLElement
   ) => ImageAttachmentConfiguration;
   /**
    * A custom handler can be provided to override the default video attachment (videos uploaded from files) configuration. By default the SDK uses fixed height (a size that's known before video is loaded), if you override that with dynamic height (for example: height: 100%) the scrolling logic inside the message list can break.
    */
   customVideoAttachmentConfigurationHandler?: (
-    a: Attachment<T>,
+    a: Attachment,
     containerElement: HTMLElement
   ) => VideoAttachmentConfiguration;
   /**
    * A custom handler can be provided to override the default giphy attachment (GIFs sent with the /giphy command) configuration. By default the SDK uses fixed height (a size that's known before the GIF is loaded), if you override that with dynamic height (for example: height: 100%) the scrolling logic inside the message list can break.
    */
   customGiphyAttachmentConfigurationHandler?: (
-    a: Attachment<T>
+    a: Attachment
   ) => AttachmentConfigration;
   /**
    * A custom handler can be provided to override the default scraped image attachment (images found in links inside messages) configuration. By default the SDK uses fixed height (a size that's known before image is loaded), if you override that with dynamic height (for example: height: 100%) the scrolling logic inside the message list can break.
    */
   customScrapedImageAttachmentConfigurationHandler?: (
-    a: Attachment<T>
+    a: Attachment
   ) => AttachmentConfigration;
   /**
    * You can turn on/off thumbnail generation for video attachments
@@ -55,7 +53,7 @@ export class AttachmentConfigurationService<
    * @param element The default resizing logics reads the height/max-height and max-width propperties of this element and reduces file size based on the given values. File size reduction is done by Stream's CDN.
    */
   getImageAttachmentConfiguration(
-    attachment: Attachment<T>,
+    attachment: Attachment,
     location: 'gallery' | 'single' | 'carousel',
     element: HTMLElement
   ): ImageAttachmentConfiguration {
@@ -121,7 +119,7 @@ export class AttachmentConfigurationService<
    * @param element The default resizing logics reads the height/max-height and max-width propperties of this element and reduces file size based on the given values. File size reduction is done by Stream's CDN.
    */
   getVideoAttachmentConfiguration(
-    attachment: Attachment<T>,
+    attachment: Attachment,
     element: HTMLElement
   ): VideoAttachmentConfiguration {
     if (this.customVideoAttachmentConfigurationHandler) {
@@ -178,7 +176,7 @@ export class AttachmentConfigurationService<
    * @param attachment The attachment to configure
    */
   getGiphyAttachmentConfiguration(
-    attachment: Attachment<T>
+    attachment: Attachment
   ): AttachmentConfigration {
     if (this.customGiphyAttachmentConfigurationHandler) {
       return this.customGiphyAttachmentConfigurationHandler(attachment);
@@ -198,7 +196,7 @@ export class AttachmentConfigurationService<
    * @param attachment The attachment to configure
    */
   getScrapedImageAttachmentConfiguration(
-    attachment: Attachment<T>
+    attachment: Attachment
   ): AttachmentConfigration {
     if (this.customScrapedImageAttachmentConfigurationHandler) {
       return this.customScrapedImageAttachmentConfigurationHandler(attachment);

projects/stream-chat-angular/src/lib/attachment-configuration.service.ts

@@ -380,7 +380,7 @@ describe('AttachmentListComponent', () => {
           frames: '6',
         },
       },
-    } as any as Attachment<DefaultStreamChatGenerics>;
+    } as any as Attachment;
     component.attachments = [attachment];
     component.ngOnChanges({ attachments: {} as SimpleChange });
     fixture.detectChanges();
@@ -435,7 +435,7 @@ describe('AttachmentListComponent', () => {
           frames: '6',
         },
       },
-    } as any as Attachment<DefaultStreamChatGenerics>;
+    } as any as Attachment;
     component.messageId = 'message-id';
     component.attachments = [attachment];
     component.parentMessageId = 'parent-id';

projects/stream-chat-angular/src/lib/attachment-list/attachment-list.component.spec.ts

@@ -49,17 +49,17 @@ export class AttachmentListComponent implements OnChanges, OnInit, OnDestroy {
   /**
    * The attachments to display
    */
-  @Input() attachments: Attachment<DefaultStreamChatGenerics>[] = [];
+  @Input() attachments: Attachment[] = [];
   /**
    * Emits the state of the image carousel window
    */
   @Output() readonly imageModalStateChange = new EventEmitter<
     'opened' | 'closed'
   >();
   @HostBinding() class = 'str-chat__attachment-list-angular-host';
-  orderedAttachments: Attachment<DefaultStreamChatGenerics>[] = [];
-  customAttachments: Attachment<DefaultStreamChatGenerics>[] = [];
-  imagesToView: Attachment<DefaultStreamChatGenerics>[] = [];
+  orderedAttachments: Attachment[] = [];
+  customAttachments: Attachment[] = [];
+  imagesToView: Attachment[] = [];
   imagesToViewCurrentIndex = 0;
   customAttachmentsTemplate?: TemplateRef<CustomAttachmentListContext>;
   @ViewChild('modalContent', { static: true })
@@ -169,13 +169,13 @@ export class AttachmentListComponent implements OnChanges, OnInit, OnDestroy {
     return attachment.type === 'voiceRecording';
   }
 
-  hasFileSize(attachment: Attachment<DefaultStreamChatGenerics>) {
+  hasFileSize(attachment: Attachment) {
     return (
       attachment.file_size && Number.isFinite(Number(attachment.file_size))
     );
   }
 
-  getFileSize(attachment: Attachment<DefaultStreamChatGenerics>) {
+  getFileSize(attachment: Attachment) {
     return prettybytes(Number(attachment.file_size!));
   }
 
@@ -226,9 +226,7 @@ export class AttachmentListComponent implements OnChanges, OnInit, OnDestroy {
     return item.image_url || item.img_url || item.thumb_url;
   }
 
-  getAttachmentContext(
-    attachment: Attachment<DefaultStreamChatGenerics>
-  ): AttachmentContext {
+  getAttachmentContext(attachment: Attachment): AttachmentContext {
     return { attachment };
   }
 

projects/stream-chat-angular/src/lib/attachment-list/attachment-list.component.ts

@@ -10,7 +10,7 @@ import { ChatClientService } from './chat-client.service';
 import { MessageService } from './message.service';
 
 describe('AttachmentService', () => {
-  let service: AttachmentService<DefaultStreamChatGenerics>;
+  let service: AttachmentService;
   let uploadAttachmentsSpy: jasmine.Spy;
   let deleteAttachmentSpy: jasmine.Spy;
   let readAsDataURLSpy: jasmine.Spy;

projects/stream-chat-angular/src/lib/attachment.service.spec.ts

@@ -12,11 +12,7 @@ import { AppSettings, Attachment } from 'stream-chat';
 import { ChannelService } from './channel.service';
 import { isImageAttachment } from './is-image-attachment';
 import { NotificationService } from './notification.service';
-import {
-  AttachmentUpload,
-  AudioRecording,
-  DefaultStreamChatGenerics,
-} from './types';
+import { AttachmentUpload, AudioRecording } from './types';
 import { ChatClientService } from './chat-client.service';
 import { MessageService } from './message.service';
 
@@ -28,9 +24,7 @@ import { MessageService } from './message.service';
 @Injectable({
   providedIn: 'root',
 })
-export class AttachmentService<
-  T extends DefaultStreamChatGenerics = DefaultStreamChatGenerics
-> {
+export class AttachmentService {
   /**
    * Emits the number of uploads in progress.
    *
@@ -48,7 +42,7 @@ export class AttachmentService<
    *
    * By default the SDK components won't display these, but you can provide your own `customAttachmentPreviewListTemplate$` and `customAttachmentListTemplate$` for the [`CustomTemplatesService`](/chat/docs/sdk/angular/services/CustomTemplatesService/).
    */
-  customAttachments$ = new BehaviorSubject<Attachment<T>[]>([]);
+  customAttachments$ = new BehaviorSubject<Attachment[]>([]);
   /**
    * The current number of attachments
    */
@@ -213,7 +207,8 @@ export class AttachmentService<
    * Note: If you just want to use your own CDN for file uploads, you don't necessary need this method, you can just specify you own upload function in the [`ChannelService`](/chat/docs/sdk/angular/services/ChannelService/)
    * @param attachment
    */
-  addAttachment(attachment: Attachment<T>) {
+  addAttachment(attachment: Attachment) {
+    // @ts-expect-error this is an internal field
     attachment.isCustomAttachment = true;
     this.createFromAttachments([attachment]);
   }
@@ -303,10 +298,10 @@ export class AttachmentService<
    * Maps attachments received from the Stream API to uploads. This is useful when editing a message.
    * @param attachments Attachemnts received with the message
    */
-  createFromAttachments(attachments: Attachment<T>[]) {
+  createFromAttachments(attachments: Attachment[]) {
     const attachmentUploads: AttachmentUpload[] = [];
-    const builtInAttachments: Attachment<T>[] = [];
-    const customAttachments: Attachment<T>[] = [];
+    const builtInAttachments: Attachment[] = [];
+    const customAttachments: Attachment[] = [];
     attachments.forEach((attachment) => {
       if (this.messageService.isCustomAttachment(attachment)) {
         customAttachments.push(attachment);

projects/stream-chat-angular/src/lib/attachment.service.ts

@@ -47,7 +47,7 @@ describe('AvatarPlaceholderComponent', () => {
     expect(avatar.user).toBe(user);
 
     component.type = 'channel';
-    const channel = { id: 'channel-id' } as Channel<DefaultStreamChatGenerics>;
+    const channel = { id: 'channel-id' } as Channel;
     component.channel = channel;
     component.ngOnChanges();
     fixture.detectChanges();

projects/stream-chat-angular/src/lib/avatar-placeholder/avatar-placeholder.component.spec.ts

@@ -32,11 +32,11 @@ export class AvatarPlaceholderComponent implements OnChanges {
   /**
    * The channel the avatar belongs to (if avatar of a channel is displayed)
    */
-  @Input() channel?: Channel<DefaultStreamChatGenerics>;
+  @Input() channel?: Channel;
   /**
    * The user the avatar belongs to (if avatar of a user is displayed)
    */
-  @Input() user?: User<DefaultStreamChatGenerics>;
+  @Input() user?: User;
   /**
    * The type of the avatar: channel if channel avatar is displayed, user if user avatar is displayed
    */