@@ -70,7 +70,7 @@ public static function logEvent(
7070 }
7171
7272 protected static function dispatchDiscordWebhook ($ event_id ) {
73- $ c = Common::$ config ->bnetdocs -> discord ->forward_event_log ;
73+ $ c = Common::$ config ->discord ->forward_event_log ;
7474 if (!$ c ->enabled ) return ;
7575
7676 $ event = new Event ($ event_id );
@@ -94,50 +94,52 @@ protected static function dispatchDiscordWebhook($event_id) {
9494 $ embed ->setAuthor ($ author );
9595 }
9696
97- $ data = json_decode ($ event ->getMetadata (), true );
98- if (is_scalar ($ data )) {
97+ if (!$ c ->exclude_meta_data ) {
98+ $ data = json_decode ($ event ->getMetadata (), true );
99+ if (is_scalar ($ data )) {
100+
101+ if (is_string ($ data )) {
102+ $ f_value = substr ($ data , 0 , DiscordEmbedField::MAX_VALUE - 3 );
103+ if (strlen ($ data ) > DiscordEmbedField::MAX_VALUE - 3 )
104+ $ f_value .= '... ' ;
105+ } else {
106+ $ f_value = $ data ;
107+ }
108+
109+ $ field = new DiscordEmbedField ('Meta Data ' , $ f_value , true );
110+ $ embed ->addField ($ field );
99111
100- if (is_string ($ data )) {
101- $ f_value = substr ($ data , 0 , DiscordEmbedField::MAX_VALUE - 3 );
102- if (strlen ($ data ) > DiscordEmbedField::MAX_VALUE - 3 )
103- $ f_value .= '... ' ;
104112 } else {
105- $ f_value = $ data ;
106- }
107113
108- $ field = new DiscordEmbedField ('Meta Data ' , $ f_value , true );
109- $ embed ->addField ($ field );
114+ foreach ($ data as $ key => $ value ) {
110115
111- } else {
116+ $ f_key = substr ($ key , 0 , DiscordEmbedField::MAX_NAME - 3 );
117+ if (strlen ($ key ) > DiscordEmbedField::MAX_NAME - 3 )
118+ $ f_key .= '... ' ;
112119
113- foreach ( $ data as $ key => $ value ) {
120+ if ( is_scalar ( $ value) ) {
114121
115- $ f_key = substr ($ key , 0 , DiscordEmbedField::MAX_NAME - 3 );
116- if (strlen ($ key ) > DiscordEmbedField::MAX_NAME - 3 )
117- $ f_key .= '... ' ;
122+ if (is_string ($ value )) {
123+ $ f_value = substr ($ value , 0 , DiscordEmbedField::MAX_VALUE - 3 );
124+ if (strlen ($ value ) > DiscordEmbedField::MAX_VALUE - 3 )
125+ $ f_value .= '... ' ;
126+ } else {
127+ $ f_value = $ value ;
128+ }
118129
119- if ( is_scalar ( $ value )) {
130+ $ field = new DiscordEmbedField ( $ f_key , $ f_value , true );
120131
121- if (is_string ($ value )) {
122- $ f_value = substr ($ value , 0 , DiscordEmbedField::MAX_VALUE - 3 );
123- if (strlen ($ value ) > DiscordEmbedField::MAX_VALUE - 3 )
124- $ f_value .= '... ' ;
125132 } else {
126- $ f_value = $ value ;
127- }
128-
129- $ field = new DiscordEmbedField ($ f_key , $ f_value , true );
130133
131- } else {
134+ $ field = new DiscordEmbedField ( $ f_key , gettype ( $ value ), true );
132135
133- $ field = new DiscordEmbedField ($ f_key , gettype ($ value ), true );
136+ }
137+ $ embed ->addField ($ field );
134138
139+ if ($ embed ->fieldCount () >= DiscordEmbed::MAX_FIELDS ) break ;
135140 }
136- $ embed ->addField ($ field );
137141
138- if ($ embed ->fieldCount () >= DiscordEmbed::MAX_FIELDS ) break ;
139142 }
140-
141143 }
142144
143145 $ webhook ->addEmbed ($ embed );
0 commit comments