@@ -54,7 +54,10 @@ const GetGithubChanges = (
54
54
55
55
const getGitHubDiff = async ( url : string ) => {
56
56
const res = await axios . get < string > ( url + ".diff" ) ;
57
- if ( res ) return res . data ;
57
+ if ( res ) return res . data
58
+ . replaceAll ( / ( @ @ - \d + , \d + .+ \d + , \d + @ @ ) [ ^ \n ] / g, "$1\n" )
59
+ . replaceAll ( / d i f f .+ \n i n d e x .+ \n / g, "" )
60
+ . replaceAll ( "```" , "```" ) ;
58
61
} ;
59
62
60
63
const FIELD_REGEX = / ^ (?: A d d | M o d | D e l ) \[ ( .+ ) \] / g;
@@ -64,6 +67,16 @@ const SERVER_EMOJI_MAP = {
64
67
"2" : "2️⃣" ,
65
68
"3" : "3️⃣" ,
66
69
} ;
70
+
71
+ const REPO_SERVER_MAP = new Map ( [
72
+ [ "Lumiens-Map-Vote" , [ 3 ] ] ,
73
+ [ "MTA-Gamemode" , [ 3 ] ] ,
74
+ [ "terrortown_modding" , [ 3 ] ] ,
75
+ [ "ttt_player_tumbler" , [ 3 ] ] ,
76
+ [ "ttt_ragmod" , [ 3 ] ] ,
77
+ [ "TTT2" , [ 3 ] ] ,
78
+ ] ) ;
79
+
67
80
const isRemoteMergeCommit = ( message : string ) =>
68
81
message . startsWith ( "Merge remote-tracking" ) || message . startsWith ( "Merge pull request" ) ;
69
82
const isMergeCommit = ( message : string ) =>
@@ -225,23 +238,11 @@ export default async (bot: DiscordBot): Promise<void> => {
225
238
}
226
239
} ) ;
227
240
228
- const REPO_SERVER_MAP : [ repo : string , servers : number [ ] ] [ ] = [
229
- // maybe move this to a config?
230
- [ "Lumiens-Map-Vote" , [ 3 ] ] ,
231
- [ "MTA-Gamemode" , [ 3 ] ] ,
232
- [ "terrortown_modding" , [ 3 ] ] ,
233
- [ "ttt_player_tumbler" , [ 3 ] ] ,
234
- [ "ttt_ragmod" , [ 3 ] ] ,
235
- [ "TTT2" , [ 3 ] ] ,
236
- ] ;
237
-
238
241
GitHub . on ( "push" , async event => {
239
242
if ( ! webhook ) return ;
240
243
const payload = event . payload ;
241
244
const repo = payload . repository ;
242
- const serverOverride = REPO_SERVER_MAP . filter ( r => r [ 1 ] . length > 0 ) . find (
243
- r => r [ 0 ] === repo . name
244
- ) ?. [ 1 ] ;
245
+ const serverOverride = REPO_SERVER_MAP . get ( repo . name ) ;
245
246
const commits = payload . commits ;
246
247
const branch = payload . ref . split ( "/" ) [ 2 ] ;
247
248
@@ -308,11 +309,6 @@ export default async (bot: DiscordBot): Promise<void> => {
308
309
}
309
310
310
311
let diff = isMergeCommit ( commit . message ) ? undefined : await getGitHubDiff ( commit . url ) ;
311
- if ( diff ) {
312
- diff = diff . replaceAll ( / ( @ @ - \d + , \d + .+ \d + , \d + @ @ ) [ ^ \n ] / g, "$1\n" ) ;
313
- diff = diff . replaceAll ( / d i f f .+ \n i n d e x .+ \n / g, "" ) ;
314
- diff = diff . replaceAll ( "```" , "```" ) ;
315
- }
316
312
317
313
embeds . push ( {
318
314
title :
0 commit comments