11import { CustomWriter } from "./CustomWriter" ;
22import { DiscordSnowflakeToken } from "../Tokens" ;
33import { escapeHtml } from "../util" ;
4- import { GuildChannel , Message } from "discord.js" ;
4+ import { Message } from "discord.js" ;
55import { Env } from "../env" ;
66
77function wrapMentionSpan ( content : string , colorInt ?: number ) {
@@ -28,11 +28,11 @@ export const snowflake_user: CustomWriter<DiscordSnowflakeToken> = function snow
2828 const id = token . snowflake ;
2929
3030 let userViewName : string ;
31- if ( msg . channel . type === 'dm' || msg . channel . type === 'group' ) {
31+ if ( msg . channel . type === 'dm' ) {
3232 let user = msg . client . users . resolve ( id ) ;
3333 userViewName = user != null ? `@${ user . username } ` : token . content ;
3434 } else {
35- const member = ( msg . channel as GuildChannel ) . guild . members . resolve ( id ) ;
35+ const member = msg . channel . guild . members . resolve ( id ) ;
3636 if ( member ) {
3737 if ( member . nickname ) userViewName = `@${ member . nickname } ` ;
3838 else userViewName = `@${ member . user . username } ` ;
@@ -57,7 +57,7 @@ export const snowflake_role: CustomWriter<DiscordSnowflakeToken> = function snow
5757 const id = token . snowflake ;
5858 let userViewName : string ;
5959 let color : number | undefined = undefined ;
60- if ( msg . channel . type === 'dm' || msg . channel . type === 'group' ) {
60+ if ( msg . channel . type === 'dm' ) {
6161 userViewName = token . content ;
6262 } else {
6363 const role = msg . guild . roles . resolve ( id ) ;
@@ -74,7 +74,7 @@ export const snowflake_role: CustomWriter<DiscordSnowflakeToken> = function snow
7474export const snowflake_emoji : CustomWriter < DiscordSnowflakeToken > = function snowflake_emoji ( writer , token , env ) : void {
7575 const msg = getMsg ( env ) ;
7676 const id = token . snowflake ;
77- if ( msg . channel . type === 'dm' || msg . channel . type === 'group' ) token . content ;
77+ if ( msg . channel . type === 'dm' ) token . content ;
7878 const emoji = msg . guild . emojis . resolve ( id ) ;
7979
8080 writer . append ( emoji ? `<img alt=":${ emoji . name } :" src="${ emoji . url } " class="emoji">` : escapeHtml ( token . content ) ) ;
0 commit comments