Merge branch 'trunk' into syber911911-feature-branch

Author: syber911911

.github/workflows/delete-comments.yml

@@ -17,7 +17,7 @@ jobs:
         with:
           script: |
             const comment = context.payload.comment.body;
-            const triggerStrings = ['www.mediafire.com', 'Download'];
+            const triggerStrings = ['www.mediafire.com'];
             return triggerStrings.some(triggerString => comment.includes(triggerString));
 
       - name: Delete comment if it contains any of the specific strings
@@ -26,20 +26,19 @@ jobs:
         with:
           script: |
             const commentId = context.payload.comment.id;
-            await github.issues.deleteComment({
+            await github.rest.issues.deleteComment({
               owner: context.repo.owner,
               repo: context.repo.repo,
               comment_id: commentId
             });
 
-      - name: Block user if comment contains any of the specific strings
+      - name: Block user from the org if their comment contained any of the banned strings
         if: steps.check_comment.outputs.result == 'true'
         uses: actions/github-script@v7
         with:
           script: |
-            const userId = context.payload.comment.user.id;
-            await github.users.block({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              user_id: userId
+            const username = context.payload.comment.user.login
+            await github.rest.orgs.blockUser({
+              org: context.repo.owner,
+              username: username
             });

AUTHORS

@@ -23,6 +23,7 @@ Ahmed Ashour <[email protected]>
 AJ <[email protected]>
 Ajay Kemparaj <[email protected]>
 Akhil Lb <[email protected]>
+Ákos Lukács <[email protected]>
 Akuli <[email protected]>
 Al Sutton <[email protected]>
 Alan Baird <[email protected]>
@@ -71,6 +72,7 @@ Andrei Solntsev <[email protected]>
 Andrey Botalov <[email protected]>
 Andrii Rohovets <[email protected]>
 Andy Duncan <[email protected]>
+Angie Jones <[email protected]>
 anonymous_sdet <[email protected]>
 Anthony Sottile <[email protected]>
 Anton Usmansky <[email protected]>
@@ -135,6 +137,7 @@ Carlos Ortega <[email protected]>
 Carlos Villela
 Carson McDonald <[email protected]>
 ce86f3bb9faf71e <[email protected]>
+Cédric Boutillier <[email protected]>
 Cervac Petru <[email protected]>
 cezarelnazli <[email protected]>
 ch-saeki <[email protected]>
@@ -146,6 +149,7 @@ Chirag Jayswal <[email protected]>
 chris <[email protected]>
 Chris Block <[email protected]>
 Chris Gamache <[email protected]>
+Chris Gossett <[email protected]>
 Chris Martin <[email protected]>
 Chris Mohr <[email protected]>
 Chris Stringer <[email protected]>
@@ -170,7 +174,6 @@ Coty Rosenblath <[email protected]>
 Craig Nishina <[email protected]>
 CsolG <[email protected]>
 customcommander <[email protected]>
-Cédric Boutillier <[email protected]>
 Dakkaron <[email protected]>
 Damien Allison <[email protected]>
 Damir <[email protected]>
@@ -222,6 +225,7 @@ Diego Fernández Santos <[email protected]>
 Diego Molina <[email protected]>
 Dima Kovalenko <[email protected]>
 Dima Veselov <[email protected]>
+Diogo Teles Sant'Anna <[email protected]>
 Dmitriy Sintsov <[email protected]>
 Dmitry Dubenets <[email protected]>
 Dmitry Tokarev <[email protected]>
@@ -263,6 +267,7 @@ Eric Plaster <[email protected]>
 Erik Beans <[email protected]>
 Erik E. Beerepoot <[email protected]>
 Erik Kuefler <[email protected]>
+Étienne Barrié <[email protected]>
 Evan Sangaline <[email protected]>
 Evgeniy Roldukhin <[email protected]>
 EwaMarek <[email protected]>
@@ -274,10 +279,10 @@ Florian LOPES <[email protected]>
 Florian Mutter <[email protected]>
 Florian Zipperle <[email protected]>
 Francis Bergin <[email protected]>
-Franz Liedke <[email protected]>
 François Freitag <[email protected]>
 François JACQUES <[email protected]>
 François Reynaud <[email protected]>
+Franz Liedke <[email protected]>
 Frederik Carlier <[email protected]>
 Fredrik Wollsén <[email protected]>
 freynaud <[email protected]>
@@ -420,6 +425,7 @@ Jim van Musscher <[email protected]>
 jkbzh <[email protected]>
 jkohls <[email protected]>
 jmuramatsu <[email protected]>
+João Luca Ripardo <[email protected]>
 Joaquín Romero <[email protected]>
 jochenberger <[email protected]>
 Joe Bandenburg <[email protected]>
@@ -451,12 +457,12 @@ Jonathan Lipps <[email protected]>
 Jonathon Kereliuk <[email protected]>
 Jongkuen Hong <[email protected]>
 Jordan Mace <[email protected]>
+Jörg Sautter <[email protected]>
 josephg <[email protected]>
 Josh Goldberg <[email protected]>
 Joshua Bruning <[email protected]>
 Joshua Fehler <[email protected]>
 Joshua Grant <[email protected]>
-João Luca Ripardo <[email protected]>
 JT Archie <[email protected]>
 jugglinmike <[email protected]>
 Julian Didier <[email protected]>
@@ -471,7 +477,6 @@ Justin Tulloss <[email protected]>
 Justine Tunney <[email protected]>
 [email protected] <[email protected]>
 jwoolley <[email protected]>
-Jörg Sautter <[email protected]>
 Kamen Litchev <[email protected]>
 Karl Kuehn <[email protected]>
 Karl-Philipp Richter <[email protected]>
@@ -525,10 +530,10 @@ Lucas Diniz <[email protected]>
 Lucas Tierney <[email protected]>
 Luis Correia <[email protected]>
 Luis Pflamminger <[email protected]>
+Lukáš Linhart <[email protected]>
 Luke Hill <[email protected]>
 Luke Inman-Semerau <[email protected]>
 lukec <[email protected]>
-Lukáš Linhart <[email protected]>
 Lyudmil Latinov <[email protected]>
 Machinexa2 <[email protected]>
 Maciej Pakulski <[email protected]>
@@ -607,6 +612,7 @@ ming <[email protected]>
 Mirko Nasato
 mitchloudenbeck <[email protected]>
 Miten Chauhan <[email protected]>
+mk868 <[email protected]>
 mkvetko <[email protected]>
 MMK-IBSEN <[email protected]>
 Mohab Mohie <[email protected]>
@@ -621,6 +627,7 @@ mpurland <[email protected]>
 mtrea <[email protected]>
 Mubariz Hajimuradov <[email protected]>
 Muhammad Hammad <[email protected]>
+MustafaAgamy <[email protected]>
 Muthu Kannan
 MWschutte <[email protected]>
 myslak71 <[email protected]>
@@ -629,6 +636,7 @@ Nathan Isom <[email protected]>
 native-api <[email protected]>
 Naveen <[email protected]>
 Naveen Singh <[email protected]>
+Navin Chandra <[email protected]>
 Neil Carvalho <[email protected]>
 Nelson Sproul <[email protected]>
 Nick Crews <[email protected]>
@@ -671,6 +679,7 @@ Patrick Lightbody <[email protected]>
 Paul G Webster <[email protected]>
 Paul Hammant <[email protected]>
 Pavel Lobashov <[email protected]>
+Pavel Sobolev <[email protected]>
 Perryn Fowler <[email protected]>
 Pete Johns <[email protected]>
 Peter Hedenskog <[email protected]>
@@ -774,6 +783,7 @@ Shishu Raj Pandey <[email protected]>
 Shreyan Avigyan <[email protected]>
 Shubham Singh <[email protected]>
 Shuhai Shen <[email protected]>
+Simon Benzer <[email protected]>
 Simon K <[email protected]>
 Simon Perepelitsa <[email protected]>
 Simon Stewart <[email protected]>
@@ -805,9 +815,9 @@ take0x <[email protected]>
 Takeshi Kishi <[email protected]>
 Takuho NAKANO <[email protected]>
 Takuma Chiba <[email protected]>
+Tamás Buka <[email protected]>
 Tamas Utasi <[email protected]>
 Tamsil Sajid Amani <[email protected]>
-Tamás Buka <[email protected]>
 Tatsuya Hoshino <[email protected]>
 Terence Haddock
 thecr8tr <[email protected]>
@@ -850,6 +860,7 @@ Ulf Adams <[email protected]>
 Ulrich Buchgraber <[email protected]>
 User253489 <[email protected]>
 V24 <[email protected]>
+Václav Votípka <[email protected]>
 Valery Yatsynovich <[email protected]>
 Varun Menon <[email protected]>
 varunsurapaneni <[email protected]>
@@ -874,7 +885,6 @@ Vladimir Támara Patiño <[email protected]>
 VladimirPodolyan <[email protected]>
 Vladislav Velichko <[email protected]>
 Vyvyan Codd
-Václav Votípka <[email protected]>
 Werner Robitza <[email protected]>
 wiggin15 <[email protected]>
 wildloop <[email protected]>
@@ -896,6 +906,4 @@ Zhuo Peng <[email protected]>
 Ziyu <[email protected]>
 Zoltar - Knower of All
 zsong <[email protected]>
-Ákos Lukács <[email protected]>
-Étienne Barrié <[email protected]>
 保木本将之 <[email protected]>