Merge remote-tracking branch 'origin/typings' into typings

bsian03 · Aug 20, 2020 · c412e35 · c412e35
2 parents c7d979f + 711000e
commit c412e35
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/index.d.ts b/index.d.ts
@@ -304,7 +304,8 @@ declare namespace Eris {
     icon?: string;
     name: string;
   }
-  interface EmojiOptions extends EmojiBase {
+  interface EmojiOptions extends Exclude<EmojiBase, "icon"> {
+    image: string;
     roles?: string[];
   }
   interface PartialEmoji {
@@ -558,6 +559,7 @@ declare namespace Eris {
     expireGracePeriod: string;
   }
   interface PruneMemberOptions extends GetPruneOptions {
+    computePruneCount?: boolean;
     reason?: string;
   }
   interface VoiceRegion {
@@ -1797,7 +1799,7 @@ declare namespace Eris {
 
   export class Message<T extends Textable = TextableChannel> extends Base {
     activity?: MessageActivity;
-    application: MessageApplication;
+    application?: MessageApplication;
     attachments: Attachment[];
     author: User;
     channel: T;
@@ -1815,7 +1817,7 @@ declare namespace Eris {
     member: Member | null;
     mentionEveryone: boolean;
     mentions: User[];
-    messageReference: MessageReference;
+    messageReference: MessageReference | null;
     pinned: boolean;
     prefix?: string;
     reactions: { [s: string]: any; count: number; me: boolean };